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

Commit e28d54cb authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

drm/i915: check TRANSCODER_EDP on intel_modeset_setup_hw_state 



We need to check if any of the pipes is using TRANSCODER_EDP.

V2: DDI_BUF_CTL was renamed, so fix the usage here.

Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent ad80a810

drivers/gpu/drm/i915/intel_display.c

+25 −0
Original line number Diff line number Diff line
@@ -8690,6 +8690,31 @@ void intel_modeset_setup_hw_state(struct drm_device *dev) 
	struct intel_encoder *encoder;

	struct intel_connector *connector;



	if (IS_HASWELL(dev)) {

		tmp = I915_READ(TRANS_DDI_FUNC_CTL(TRANSCODER_EDP));



		if (tmp & TRANS_DDI_FUNC_ENABLE) {

			switch (tmp & TRANS_DDI_EDP_INPUT_MASK) {

			case TRANS_DDI_EDP_INPUT_A_ON:

			case TRANS_DDI_EDP_INPUT_A_ONOFF:

				pipe = PIPE_A;

				break;

			case TRANS_DDI_EDP_INPUT_B_ONOFF:

				pipe = PIPE_B;

				break;

			case TRANS_DDI_EDP_INPUT_C_ONOFF:

				pipe = PIPE_C;

				break;

			}



			crtc = to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]);

			crtc->cpu_transcoder = TRANSCODER_EDP;



			DRM_DEBUG_KMS("Pipe %c using transcoder EDP\n",

				      pipe_name(pipe));

		}

	}



	for_each_pipe(pipe) {

		crtc = to_intel_crtc(dev_priv->pipe_to_crtc_mapping[pipe]);