Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41d31b5f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2017-08-16' of... 

Merge tag 'drm-intel-fixes-2017-08-16' of git://anongit.freedesktop.org/git/drm-intel into drm-fixes

drm/i915 fixes for v4.13-rc6

"Chris' "drm/i915: Perform an invalidate prior to executing golden renderstate" and Daniel's
"drm/i915: Avoid the gpu reset vs. modeset deadlock" seem like the most important ones.

* tag 'drm-intel-fixes-2017-08-16' of git://anongit.freedesktop.org/git/drm-intel:
  drm/i915: Avoid the gpu reset vs. modeset deadlock
  drm/i915: Suppress switch_mm emission between the same aliasing_ppgtt
  drm/i915: Return correct EDP voltage swing table for 0.85V
  drm/i915/cnl: Add slice and subslice information to debugfs.
  drm/i915: Perform an invalidate prior to executing golden renderstate
  drm/i915: remove unused function declaration
parents ef954844 781cc76e

drivers/gpu/drm/i915/i915_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -4580,7 +4580,7 @@ static void gen9_sseu_device_status(struct drm_i915_private *dev_priv, 


		sseu->slice_mask |= BIT(s);



		if (IS_GEN9_BC(dev_priv))

		if (IS_GEN9_BC(dev_priv) || IS_CANNONLAKE(dev_priv))

			sseu->subslice_mask =

				INTEL_INFO(dev_priv)->sseu.subslice_mask;

drivers/gpu/drm/i915/i915_gem_context.c

+8 −7
Original line number Diff line number Diff line
@@ -688,19 +688,19 @@ static inline bool skip_rcs_switch(struct i915_hw_ppgtt *ppgtt, 
}



static bool

needs_pd_load_pre(struct i915_hw_ppgtt *ppgtt,

		  struct intel_engine_cs *engine,

		  struct i915_gem_context *to)

needs_pd_load_pre(struct i915_hw_ppgtt *ppgtt, struct intel_engine_cs *engine)

{

	struct i915_gem_context *from = engine->legacy_active_context;



	if (!ppgtt)

		return false;



	/* Always load the ppgtt on first use */

	if (!engine->legacy_active_context)

	if (!from)

		return true;



	/* Same context without new entries, skip */

	if (engine->legacy_active_context == to &&

	if ((!from->ppgtt || from->ppgtt == ppgtt) &&

	    !(intel_engine_flag(engine) & ppgtt->pd_dirty_rings))

		return false;
@@ -744,7 +744,7 @@ static int do_rcs_switch(struct drm_i915_gem_request *req) 
	if (skip_rcs_switch(ppgtt, engine, to))

		return 0;



	if (needs_pd_load_pre(ppgtt, engine, to)) {

	if (needs_pd_load_pre(ppgtt, engine)) {

		/* Older GENs and non render rings still want the load first,

		 * "PP_DCLV followed by PP_DIR_BASE register through Load

		 * Register Immediate commands in Ring Buffer before submitting
@@ -841,7 +841,7 @@ int i915_switch_context(struct drm_i915_gem_request *req) 
		struct i915_hw_ppgtt *ppgtt =

			to->ppgtt ?: req->i915->mm.aliasing_ppgtt;



		if (needs_pd_load_pre(ppgtt, engine, to)) {

		if (needs_pd_load_pre(ppgtt, engine)) {

			int ret;



			trace_switch_mm(engine, to);
@@ -852,6 +852,7 @@ int i915_switch_context(struct drm_i915_gem_request *req) 
			ppgtt->pd_dirty_rings &= ~intel_engine_flag(engine);

		}



		engine->legacy_active_context = to;

		return 0;

	}

drivers/gpu/drm/i915/i915_gem_render_state.c

+4 −0
Original line number Diff line number Diff line
@@ -242,6 +242,10 @@ int i915_gem_render_state_emit(struct drm_i915_gem_request *req) 
			goto err_unpin;

	}



	ret = req->engine->emit_flush(req, EMIT_INVALIDATE);

	if (ret)

		goto err_unpin;



	ret = req->engine->emit_bb_start(req,

					 so->batch_offset, so->batch_size,

					 I915_DISPATCH_SECURE);

drivers/gpu/drm/i915/intel_ddi.c

+1 −1
Original line number Diff line number Diff line
@@ -1762,7 +1762,7 @@ cnl_get_buf_trans_edp(struct drm_i915_private *dev_priv, 
	if (dev_priv->vbt.edp.low_vswing) {

		if (voltage == VOLTAGE_INFO_0_85V) {

			*n_entries = ARRAY_SIZE(cnl_ddi_translations_edp_0_85V);

			return cnl_ddi_translations_dp_0_85V;

			return cnl_ddi_translations_edp_0_85V;

		} else if (voltage == VOLTAGE_INFO_0_95V) {

			*n_entries = ARRAY_SIZE(cnl_ddi_translations_edp_0_95V);

			return cnl_ddi_translations_edp_0_95V;

drivers/gpu/drm/i915/intel_display.c

+7 −0
Original line number Diff line number Diff line
@@ -3485,6 +3485,13 @@ void intel_prepare_reset(struct drm_i915_private *dev_priv) 
	    !gpu_reset_clobbers_display(dev_priv))

		return;



	/* We have a modeset vs reset deadlock, defensively unbreak it.

	 *

	 * FIXME: We can do a _lot_ better, this is just a first iteration.

	 */

	i915_gem_set_wedged(dev_priv);

	DRM_DEBUG_DRIVER("Wedging GPU to avoid deadlocks with pending modeset updates\n");



	/*

	 * Need mode_config.mutex so that we don't

	 * trample ongoing ->detect() and whatnot.