From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 20/33] drm/i915: VLV_ADPA must be used in VLV code Date: Thu, 24 Jan 2013 23:12:10 +0100 Message-ID: <20130124221210.GC23080@phenom.ffwll.local> References: <1359034198-19678-1-git-send-email-ville.syrjala@linux.intel.com> <1359034198-19678-21-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-ee0-f54.google.com (mail-ee0-f54.google.com [74.125.83.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 809F5E5BF4 for ; Thu, 24 Jan 2013 14:10:05 -0800 (PST) Received: by mail-ee0-f54.google.com with SMTP id c41so4794468eek.27 for ; Thu, 24 Jan 2013 14:10:04 -0800 (PST) Content-Disposition: inline In-Reply-To: <1359034198-19678-21-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: ville.syrjala@linux.intel.com Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Thu, Jan 24, 2013 at 03:29:45PM +0200, ville.syrjala@linux.intel.com wro= te: > From: Ville Syrj=E4l=E4 > = > ADPA doesn't include the required offset, so don't use it in VLV > specific code. VLV_ADPA must be used instead. > = > Signed-off-by: Ville Syrj=E4l=E4 > --- > drivers/gpu/drm/i915/intel_crt.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/inte= l_crt.c > index 71a5eba..9fe3d67 100644 > --- a/drivers/gpu/drm/i915/intel_crt.c > +++ b/drivers/gpu/drm/i915/intel_crt.c > @@ -305,12 +305,12 @@ static bool valleyview_crt_detect_hotplug(struct dr= m_connector *connector) > bool ret; > u32 save_adpa; > = > - save_adpa =3D adpa =3D I915_READ(ADPA); > + save_adpa =3D adpa =3D I915_READ(VLV_ADPA); > DRM_DEBUG_KMS("trigger hotplug detect cycle: adpa=3D0x%x\n", adpa); > = > adpa |=3D ADPA_CRT_HOTPLUG_FORCE_TRIGGER; > = > - I915_WRITE(ADPA, adpa); > + I915_WRITE(VLV_ADPA, adpa); > = > if (wait_for((I915_READ(ADPA) & ADPA_CRT_HOTPLUG_FORCE_TRIGGER) =3D=3D = 0, > 1000)) { A few are missing here ... I wonder whether we shouldn't just use crt->adpa_reg instead? intel_ironlake_crt_detect_hotplug right above suffers from the same by using PCH_ADPA. -Daniel > @@ -319,7 +319,7 @@ static bool valleyview_crt_detect_hotplug(struct drm_= connector *connector) > } > = > /* Check the status to see if both blue and green are on now */ > - adpa =3D I915_READ(ADPA); > + adpa =3D I915_READ(VLV_ADPA); > if ((adpa & ADPA_CRT_HOTPLUG_MONITOR_MASK) !=3D 0) > ret =3D true; > else > -- = > 1.7.12.4 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch