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

Commit 8c2d689e authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2018-03-21' of... 

Merge tag 'drm-intel-fixes-2018-03-21' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes

One fix for DP MST and one fix for GPU reset on hang check.

* tag 'drm-intel-fixes-2018-03-21' of git://anongit.freedesktop.org/drm/drm-intel:
  drm/i915: Specify which engines to reset following semaphore/event lockups
  drm/i915/dp: Write to SET_POWER dpcd to enable MST hub.
parents 096c49ec 3a088dd1

drivers/gpu/drm/i915/intel_ddi.c

+2 −5
Original line number Diff line number Diff line
@@ -2175,7 +2175,6 @@ static void intel_ddi_pre_enable_dp(struct intel_encoder *encoder, 
		intel_prepare_dp_ddi_buffers(encoder, crtc_state);



	intel_ddi_init_dp_buf_reg(encoder);

	if (!is_mst)

	intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);

	intel_dp_start_link_train(intel_dp);

	if (port != PORT_A || INTEL_GEN(dev_priv) >= 9)
@@ -2274,13 +2273,11 @@ static void intel_ddi_post_disable_dp(struct intel_encoder *encoder, 
	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);

	struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);

	struct intel_dp *intel_dp = &dig_port->dp;

	bool is_mst = intel_crtc_has_type(old_crtc_state, INTEL_OUTPUT_DP_MST);



	/*

	 * Power down sink before disabling the port, otherwise we end

	 * up getting interrupts from the sink on detecting link loss.

	 */

	if (!is_mst)

	intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);



	intel_disable_ddi_buf(encoder);

drivers/gpu/drm/i915/intel_hangcheck.c

+2 −2
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ engine_stuck(struct intel_engine_cs *engine, u64 acthd) 
	 */

	tmp = I915_READ_CTL(engine);

	if (tmp & RING_WAIT) {

		i915_handle_error(dev_priv, 0,

		i915_handle_error(dev_priv, BIT(engine->id),

				  "Kicking stuck wait on %s",

				  engine->name);

		I915_WRITE_CTL(engine, tmp);
@@ -258,7 +258,7 @@ engine_stuck(struct intel_engine_cs *engine, u64 acthd) 
		default:

			return ENGINE_DEAD;

		case 1:

			i915_handle_error(dev_priv, 0,

			i915_handle_error(dev_priv, ALL_ENGINES,

					  "Kicking stuck semaphore on %s",

					  engine->name);

			I915_WRITE_CTL(engine, tmp);