From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sivakumar Thulasimani Subject: Re: [PATCH 4/7] drm/i915: Avoid confusion between DP and TRANS_DP_CTL in DP .get_config() Date: Tue, 07 Jul 2015 13:44:48 +0530 Message-ID: <559B8A78.6090002@intel.com> References: <1436184606-18729-1-git-send-email-ville.syrjala@linux.intel.com> <1436184606-18729-5-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1696205146==" Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id D5BB66E4C9 for ; Tue, 7 Jul 2015 01:16:09 -0700 (PDT) In-Reply-To: <1436184606-18729-5-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: ville.syrjala@linux.intel.com, intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org This is a multi-part message in MIME format. --===============1696205146== Content-Type: multipart/alternative; boundary="------------080203020903050003040404" This is a multi-part message in MIME format. --------------080203020903050003040404 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Reviewed-by: Sivakumar Thulasimani On 7/6/2015 5:40 PM, ville.syrjala@linux.intel.com wrote: > From: Ville Syrj=C3=A4l=C3=A4 > > 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: Ville Syrj=C3=A4l=C3=A4 > --- > drivers/gpu/drm/i915/intel_dp.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/int= el_dp.c > index 3dd4342..b6ba02e 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -2245,13 +2245,14 @@ static void intel_dp_get_config(struct intel_en= coder *encoder, > pipe_config->has_audio =3D tmp & DP_AUDIO_OUTPUT_ENABLE && port !=3D= PORT_A; > =20 > if (HAS_PCH_CPT(dev) && port !=3D PORT_A) { > - tmp =3D I915_READ(TRANS_DP_CTL(crtc->pipe)); > - if (tmp & TRANS_DP_HSYNC_ACTIVE_HIGH) > + u32 trans_dp =3D I915_READ(TRANS_DP_CTL(crtc->pipe)); > + > + if (trans_dp & TRANS_DP_HSYNC_ACTIVE_HIGH) > flags |=3D DRM_MODE_FLAG_PHSYNC; > else > flags |=3D DRM_MODE_FLAG_NHSYNC; > =20 > - if (tmp & TRANS_DP_VSYNC_ACTIVE_HIGH) > + if (trans_dp & TRANS_DP_VSYNC_ACTIVE_HIGH) > flags |=3D DRM_MODE_FLAG_PVSYNC; > else > flags |=3D DRM_MODE_FLAG_NVSYNC; --=20 regards, Sivakumar --------------080203020903050003040404 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable

Reviewed= -by: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>

On 7/6/2015 5:40 PM, ville.syrjala@linux.intel.com wrote:
From: Ville Syrj=C3=A4l=C3=A4 <ville.syrj=
ala@linux.intel.com>

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: Ville Syrj=C3=A4l=C3=A4 <ville.syrjala@linux.in=
tel.com>
---
 drivers/gpu/drm/i915/intel_dp.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel=
_dp.c
index 3dd4342..b6ba02e 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -2245,13 +2245,14 @@ static void intel_dp_get_config(struct intel_enco=
der *encoder,
 	pipe_config->has_audio =3D tmp & DP_AUDIO_OUTPUT_ENABLE &&am=
p; port !=3D PORT_A;
=20
 	if (HAS_PCH_CPT(dev) && port !=3D PORT_A) {
-		tmp =3D I915_READ(TRANS_DP_CTL(crtc->pipe));
-		if (tmp & TRANS_DP_HSYNC_ACTIVE_HIGH)
+		u32 trans_dp =3D I915_READ(TRANS_DP_CTL(crtc->pipe));
+
+		if (trans_dp & TRANS_DP_HSYNC_ACTIVE_HIGH)
 			flags |=3D DRM_MODE_FLAG_PHSYNC;
 		else
 			flags |=3D DRM_MODE_FLAG_NHSYNC;
=20
-		if (tmp & TRANS_DP_VSYNC_ACTIVE_HIGH)
+		if (trans_dp & TRANS_DP_VSYNC_ACTIVE_HIGH)
 			flags |=3D DRM_MODE_FLAG_PVSYNC;
 		else
 			flags |=3D DRM_MODE_FLAG_NVSYNC;


--=20
regards,
Sivakumar
--------------080203020903050003040404-- --===============1696205146== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK --===============1696205146==--