Merge tag 'drm-fixes-2019-03-29' of git://anongit.freedesktop.org/drm/drm (9df0ef6c) · Commits · 戴 / test

Pull drm fixes from Dave Airlie: "Weekly fixes roundup, nothing two serious, some usb device regressions are fixed, and i915 GVT has a bigger fix but otherwise not really much happening here. core: - fb bpp check regression fix - release/unplug fix - use after free fixes i915: - fix mmap range checks - fix gvt ppgtt mm LRU list access races - fix selftest error pointer check - fix a macro definition (pre-emptive for potential further backports) - fix one AML SKU ULX status amdgpu: - one variable refresh rate fix udl: - fix EDID reading tegra: - build/warning fixes meson: - cleanup path fixes - TMDS clock filter fix rockchip: - NV12 buffers and scalar fix" * tag 'drm-fixes-2019-03-29' of git://anongit.freedesktop.org/drm/drm: (22 commits) drm/i915/icl: Fix VEBOX mismatch BUG_ON() drm/i915/selftests: Fix an IS_ERR() vs NULL check drm/i915: Mark AML 0x87CA as ULX drm/meson: fix TMDS clock filtering for DMT monitors drm/meson: Uninstall IRQ handler drm/meson: Fix invalid pointer in meson_drv_unbind() drm/udl: Refactor edid retrieving in UDL driver (v2) drm: Fix drm_release() and device unplug drm/fb: avoid setting 0 depth. drm/tegra: vic: Fix implicit function declaration warning drm/tegra: hub: Fix dereference before check drm/i915/icl: Fix the TRANS_DDI_FUNC_CTL2 bitfield macro drm/amd/display: Only allow VRR when vrefresh is within supported range drm/rockchip: vop: reset scale mode when win is disabled drm/vkms: fix use-after-free when drm_gem_handle_create() fails drm/vgem: fix use-after-free when drm_gem_handle_create() fails drm/i915/gvt: Add mutual lock for ppgtt mm LRU list drm/i915/gvt: Only assign ppgtt root at dispatch time drm/i915/gvt: Don't submit request for error workload dispatch drm/i915/gvt: stop scheduling workload when vgpu is inactive ...

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -5429,9 +5429,11 @@ static void get_freesync_config_for_crtc(
		struct amdgpu_dm_connector *aconnector =
		to_amdgpu_dm_connector(new_con_state->base.connector);
		struct drm_display_mode *mode = &new_crtc_state->base.mode;
		int vrefresh = drm_mode_vrefresh(mode);

		new_crtc_state->vrr_supported = new_con_state->freesync_capable &&
		aconnector->min_vfreq <= drm_mode_vrefresh(mode);
		vrefresh >= aconnector->min_vfreq &&
		vrefresh <= aconnector->max_vfreq;

		if (new_crtc_state->vrr_supported) {
		new_crtc_state->stream->ignore_msa_timing_param = true;

drivers/gpu/drm/drm_drv.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -376,11 +376,7 @@ void drm_dev_unplug(struct drm_device *dev)
		synchronize_srcu(&drm_unplug_srcu);

		drm_dev_unregister(dev);

		mutex_lock(&drm_global_mutex);
		if (dev->open_count == 0)
		drm_dev_put(dev);
		mutex_unlock(&drm_global_mutex);
		}
		EXPORT_SYMBOL(drm_dev_unplug);

drivers/gpu/drm/drm_fb_helper.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1963,7 +1963,7 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
		best_depth = fmt->depth;
		}
		}
		if (sizes.surface_depth != best_depth) {
		if (sizes.surface_depth != best_depth && best_depth) {
		DRM_INFO("requested bpp %d, scaled depth down to %d",
		sizes.surface_bpp, best_depth);
		sizes.surface_depth = best_depth;

drivers/gpu/drm/drm_file.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -489,11 +489,9 @@ int drm_release(struct inode inode, struct file filp)

		drm_close_helper(filp);

		if (!--dev->open_count) {
		if (!--dev->open_count)
		drm_lastclose(dev);
		if (drm_dev_is_unplugged(dev))
		drm_put_dev(dev);
		}

		mutex_unlock(&drm_global_mutex);

		drm_minor_release(minor);

drivers/gpu/drm/i915/gvt/cmd_parser.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1441,7 +1441,7 @@ static inline int cmd_address_audit(struct parser_exec_state *s,
		}

		if (index_mode) {
		if (guest_gma >= I915_GTT_PAGE_SIZE / sizeof(u64)) {
		if (guest_gma >= I915_GTT_PAGE_SIZE) {
		ret = -EFAULT;
		goto err;
		}

Admin message