From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: expose HDMI connectors on port C on BYT Date: Fri, 9 Aug 2013 19:03:05 +0200 Message-ID: <20130809170305.GD31670@phenom.ffwll.local> References: <1376066075-12906-1-git-send-email-jbarnes@virtuousgeek.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com [74.125.83.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 95ED0E5F79 for ; Fri, 9 Aug 2013 10:02:59 -0700 (PDT) Received: by mail-ee0-f49.google.com with SMTP id d41so2228983eek.22 for ; Fri, 09 Aug 2013 10:02:58 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1376066075-12906-1-git-send-email-jbarnes@virtuousgeek.org> 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: Jesse Barnes Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, Aug 09, 2013 at 09:34:35AM -0700, Jesse Barnes wrote: > Ryan noticed that on his board, HDMI was wired up to port C but not > exposed by the kernel, which had only expected DP on that port. Fix > that up by enumerating both ports if possible. > > Tested-by: "Matsumura, Ryan" > Acked-by: Chris Wilson > Signed-off-by: Jesse Barnes > --- > drivers/gpu/drm/i915/intel_display.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index a0914db..fe37908 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -9343,8 +9343,13 @@ static void intel_setup_outputs(struct drm_device *dev) > intel_dp_init(dev, PCH_DP_D, PORT_D); > } else if (IS_VALLEYVIEW(dev)) { > /* Check for built-in panel first. Shares lanes with HDMI on SDVOC */ > - if (I915_READ(VLV_DISPLAY_BASE + DP_C) & DP_DETECTED) > - intel_dp_init(dev, VLV_DISPLAY_BASE + DP_C, PORT_C); > + if (I915_READ(VLV_DISPLAY_BASE + GEN4_HDMIC) & SDVO_DETECTED) { > + intel_hdmi_init(dev, VLV_DISPLAY_BASE + GEN4_HDMIC, > + PORT_C); > + if (I915_READ(VLV_DISPLAY_BASE + DP_C) & DP_DETECTED) > + intel_dp_init(dev, VLV_DISPLAY_BASE + DP_C, > + PORT_C); > + } Spaces instead of tabs in the above hunk. Tsk, tsk ... Fixed while applying. -Daniel > > if (I915_READ(VLV_DISPLAY_BASE + GEN4_HDMIB) & SDVO_DETECTED) { > intel_hdmi_init(dev, VLV_DISPLAY_BASE + GEN4_HDMIB, > -- > 1.7.9.5 > > _______________________________________________ > 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