From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 20/33] drm/i915: VLV_ADPA must be used in VLV code Date: Fri, 25 Jan 2013 13:59:42 +0200 Message-ID: <20130125115942.GT9135@intel.com> References: <1359034198-19678-1-git-send-email-ville.syrjala@linux.intel.com> <1359034198-19678-21-git-send-email-ville.syrjala@linux.intel.com> <20130124221210.GC23080@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id E35DDE6235 for ; Fri, 25 Jan 2013 03:59:46 -0800 (PST) Content-Disposition: inline In-Reply-To: <20130124221210.GC23080@phenom.ffwll.local> 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: Daniel Vetter Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Thu, Jan 24, 2013 at 11:12:10PM +0100, Daniel Vetter wrote: > On Thu, Jan 24, 2013 at 03:29:45PM +0200, ville.syrjala@linux.intel.com w= rote: > > 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/in= tel_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 = drm_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. Dang. I'll make a patch to use apda_reg always. > -Daniel > = > > @@ -319,7 +319,7 @@ static bool valleyview_crt_detect_hotplug(struct dr= m_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 -- = Ville Syrj=E4l=E4 Intel OTC