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

Commit b81e34c2 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Avoid confusion between DP and TRANS_DP_CTL in DP .get_config() 



Use a separate variable for the TRANS_DP_CTL value instead of reusing
'tmp' that otherwise contains the DP port register value.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarSivakumar Thulasimani <sivakumar.thulasimani@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 96f3f1f9

drivers/gpu/drm/i915/intel_dp.c

+4 −3
Original line number Diff line number Diff line
@@ -2282,13 +2282,14 @@ static void intel_dp_get_config(struct intel_encoder *encoder, 
	pipe_config->has_audio = tmp & DP_AUDIO_OUTPUT_ENABLE && port != PORT_A;



	if (HAS_PCH_CPT(dev) && port != PORT_A) {

		tmp = I915_READ(TRANS_DP_CTL(crtc->pipe));

		if (tmp & TRANS_DP_HSYNC_ACTIVE_HIGH)

		u32 trans_dp = I915_READ(TRANS_DP_CTL(crtc->pipe));



		if (trans_dp & TRANS_DP_HSYNC_ACTIVE_HIGH)

			flags |= DRM_MODE_FLAG_PHSYNC;

		else

			flags |= DRM_MODE_FLAG_NHSYNC;



		if (tmp & TRANS_DP_VSYNC_ACTIVE_HIGH)

		if (trans_dp & TRANS_DP_VSYNC_ACTIVE_HIGH)

			flags |= DRM_MODE_FLAG_PVSYNC;

		else

			flags |= DRM_MODE_FLAG_NVSYNC;