Commit 11654b37 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2021-09-16' of... 

Merge tag 'drm-intel-fixes-2021-09-16' of ssh://git.freedesktop.org/git/drm/drm-intel

 into drm-fixes

drm/i915 fixes for v5.15-rc2:
- Propagate DP link training error returns
- Use max link params for eDP 1.3 and earlier
- Build warning fixes
- Gem selftest fixes
- Ensure wakeref is held before hardware access

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/8735q4wsu7.fsf@intel.com
parents da4ce47e 7889367d

drivers/gpu/drm/i915/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ subdir-ccflags-y += $(call cc-disable-warning, missing-field-initializers) 
subdir-ccflags-y += $(call cc-disable-warning, unused-but-set-variable)

# clang warnings

subdir-ccflags-y += $(call cc-disable-warning, sign-compare)

subdir-ccflags-y += $(call cc-disable-warning, sometimes-uninitialized)

subdir-ccflags-y += $(call cc-disable-warning, initializer-overrides)

subdir-ccflags-y += $(call cc-disable-warning, frame-address)

subdir-ccflags-$(CONFIG_DRM_I915_WERROR) += -Werror

drivers/gpu/drm/i915/display/intel_dp.c

+4 −1
Original line number Diff line number Diff line
@@ -2445,11 +2445,14 @@ intel_edp_init_dpcd(struct intel_dp *intel_dp) 
	 */

	if (drm_dp_dpcd_read(&intel_dp->aux, DP_EDP_DPCD_REV,

			     intel_dp->edp_dpcd, sizeof(intel_dp->edp_dpcd)) ==

			     sizeof(intel_dp->edp_dpcd))

			     sizeof(intel_dp->edp_dpcd)) {

		drm_dbg_kms(&dev_priv->drm, "eDP DPCD: %*ph\n",

			    (int)sizeof(intel_dp->edp_dpcd),

			    intel_dp->edp_dpcd);



		intel_dp->use_max_params = intel_dp->edp_dpcd[0] < DP_EDP_14;

	}



	/*

	 * This has to be called after intel_dp->edp_dpcd is filled, PSR checks

	 * for SET_POWER_CAPABLE bit in intel_dp->edp_dpcd[1]

drivers/gpu/drm/i915/display/intel_dp_link_training.c

+1 −1
Original line number Diff line number Diff line
@@ -848,7 +848,7 @@ intel_dp_link_train_all_phys(struct intel_dp *intel_dp, 
	}



	if (ret)

		intel_dp_link_train_phy(intel_dp, crtc_state, DP_PHY_DPRX);

		ret = intel_dp_link_train_phy(intel_dp, crtc_state, DP_PHY_DPRX);



	if (intel_dp->set_idle_link_train)

		intel_dp->set_idle_link_train(intel_dp, crtc_state);

drivers/gpu/drm/i915/gem/i915_gem_context.c

+3 −3
Original line number Diff line number Diff line
@@ -986,6 +986,9 @@ void i915_gem_context_release(struct kref *ref) 
	trace_i915_context_free(ctx);

	GEM_BUG_ON(!i915_gem_context_is_closed(ctx));



	if (ctx->syncobj)

		drm_syncobj_put(ctx->syncobj);



	mutex_destroy(&ctx->engines_mutex);

	mutex_destroy(&ctx->lut_mutex);
@@ -1205,9 +1208,6 @@ static void context_close(struct i915_gem_context *ctx) 
	if (vm)

		i915_vm_close(vm);



	if (ctx->syncobj)

		drm_syncobj_put(ctx->syncobj);



	ctx->file_priv = ERR_PTR(-EBADF);



	/*

drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c

+4 −3
Original line number Diff line number Diff line
@@ -59,13 +59,13 @@ static int igt_dmabuf_import_self(void *arg) 
		err = PTR_ERR(import);

		goto out_dmabuf;

	}

	import_obj = to_intel_bo(import);



	if (import != &obj->base) {

		pr_err("i915_gem_prime_import created a new object!\n");

		err = -EINVAL;

		goto out_import;

	}

	import_obj = to_intel_bo(import);



	i915_gem_object_lock(import_obj, NULL);

	err = __i915_gem_object_get_pages(import_obj);
@@ -128,6 +128,8 @@ static int igt_dmabuf_import_same_driver_lmem(void *arg) 
		pr_err("i915_gem_prime_import failed with the wrong err=%ld\n",

		       PTR_ERR(import));

		err = PTR_ERR(import);

	} else {

		err = 0;

	}



	dma_buf_put(dmabuf);
@@ -176,6 +178,7 @@ static int igt_dmabuf_import_same_driver(struct drm_i915_private *i915, 
		err = PTR_ERR(import);

		goto out_dmabuf;

	}

	import_obj = to_intel_bo(import);



	if (import == &obj->base) {

		pr_err("i915_gem_prime_import reused gem object!\n");
@@ -183,8 +186,6 @@ static int igt_dmabuf_import_same_driver(struct drm_i915_private *i915, 
		goto out_import;

	}



	import_obj = to_intel_bo(import);



	i915_gem_object_lock(import_obj, NULL);

	err = __i915_gem_object_get_pages(import_obj);

	if (err) {