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: Thu, 24 Jan 2013 23:05:21 +0100 Message-ID: <20130124220521.GB23080@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> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-ea0-f174.google.com (mail-ea0-f174.google.com [209.85.215.174]) by gabe.freedesktop.org (Postfix) with ESMTP id 946FAE5F77 for ; Thu, 24 Jan 2013 14:03:15 -0800 (PST) Received: by mail-ea0-f174.google.com with SMTP id 1so4058546eaa.19 for ; Thu, 24 Jan 2013 14:03:15 -0800 (PST) Content-Disposition: inline In-Reply-To: <1359034198-19678-18-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:42PM +0200, ville.syrjala@linux.intel.com wro= te: > 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/i915/= 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_device= *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 ... -Daniel > if (!found) > - intel_hdmi_init(dev, SDVOB, PORT_B); > - if (!found && (I915_READ(DP_B) & DP_DETECTED)) > - intel_dp_init(dev, DP_B, PORT_B); > + intel_hdmi_init(dev, VLV_DISPLAY_BASE + SDVOB, PORT_B); > + if (!found && (I915_READ(VLV_DISPLAY_BASE + DP_B) & DP_DETECTED)) > + intel_dp_init(dev, VLV_DISPLAY_BASE + DP_B, PORT_B); > } > = > - if (I915_READ(SDVOC) & PORT_DETECTED) > - intel_hdmi_init(dev, SDVOC, PORT_C); > + if (I915_READ(VLV_DISPLAY_BASE + SDVOC) & PORT_DETECTED) > + intel_hdmi_init(dev, VLV_DISPLAY_BASE + SDVOC, PORT_C); > = > } else if (SUPPORTS_DIGITAL_OUTPUTS(dev)) { > bool found =3D false; > -- = > 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