From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 17/33] drm/i915: Pass VLV_DISPLAY_BASE + reg to intel_init_{sdvo, hdmi, dp} on VLV Date: Fri, 25 Jan 2013 17:02:17 +0100 Message-ID: <20130125160217.GK23080@phenom.ffwll.local> References: <1359034198-19678-1-git-send-email-ville.syrjala@linux.intel.com> <1359034198-19678-18-git-send-email-ville.syrjala@linux.intel.com> <20130124220521.GB23080@phenom.ffwll.local> <20130125120340.GU9135@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-ea0-f171.google.com (mail-ea0-f171.google.com [209.85.215.171]) by gabe.freedesktop.org (Postfix) with ESMTP id C94AAE63B0 for ; Fri, 25 Jan 2013 08:00:11 -0800 (PST) Received: by mail-ea0-f171.google.com with SMTP id c13so233028eaa.2 for ; Fri, 25 Jan 2013 08:00:11 -0800 (PST) Content-Disposition: inline In-Reply-To: <20130125120340.GU9135@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 =?iso-8859-1?Q?Syrj=E4l=E4?= Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, Jan 25, 2013 at 02:03:40PM +0200, Ville Syrj=E4l=E4 wrote: > On Thu, Jan 24, 2013 at 11:05:21PM +0100, Daniel Vetter wrote: > > On Thu, Jan 24, 2013 at 03:29:42PM +0200, ville.syrjala@linux.intel.com= wrote: > > > From: Ville Syrj=E4l=E4 > > > = > > > When passing the DP/HDMI/SDVO registers to the encoder init functions, > > > include the VLV specific offset in the value. > > > = > > > Signed-off-by: Ville Syrj=E4l=E4 > > > --- > > > drivers/gpu/drm/i915/intel_display.c | 18 +++++++++--------- > > > 1 file changed, 9 insertions(+), 9 deletions(-) > > > = > > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i= 915/intel_display.c > > > index 26df9e3..60b5112 100644 > > > --- a/drivers/gpu/drm/i915/intel_display.c > > > +++ b/drivers/gpu/drm/i915/intel_display.c > > > @@ -8230,20 +8230,20 @@ static void intel_setup_outputs(struct drm_de= vice *dev) > > > int found; > > > = > > > /* Check for built-in panel first. Shares lanes with HDMI on SDVOC= */ > > > - if (I915_READ(DP_C) & DP_DETECTED) > > > - intel_dp_init(dev, DP_C, PORT_C); > > > + if (I915_READ(VLV_DISPLAY_BASE + DP_C) & DP_DETECTED) > > > + intel_dp_init(dev, VLV_DISPLAY_BASE + DP_C, PORT_C); > > > = > > > - if (I915_READ(SDVOB) & PORT_DETECTED) { > > > + if (I915_READ(VLV_DISPLAY_BASE + SDVOB) & PORT_DETECTED) { > > > /* SDVOB multiplex with HDMIB */ > > > - found =3D intel_sdvo_init(dev, SDVOB, true); > > > + found =3D intel_sdvo_init(dev, VLV_DISPLAY_BASE + SDVOB, true); > > = > > I think we should kill the intel_sdvo_init copy&pasta here beforehand. = Or > > notice that we have a big problem and need to fixup sdvo support ... > = > I think Jesse something like that lined up. Should we wait for that, or > do you want me to make a quick fix? I'd vote for a quick fix first to remove sdvo, preferrably acked by Jesse, then your conversion patch here on top. But if Jesse is awol, we can do it the other way round, too. -Daniel -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch