From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 20/20] drm/i915: VLV doesn't have HDMI on port C Date: Tue, 19 Mar 2013 22:11:37 +0100 Message-ID: <20130319211136.GF9021@phenom.ffwll.local> References: <1362768363-3710-1-git-send-email-jbarnes@virtuousgeek.org> <1362768363-3710-20-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-f51.google.com (mail-ee0-f51.google.com [74.125.83.51]) by gabe.freedesktop.org (Postfix) with ESMTP id 47CB7E5C4E for ; Tue, 19 Mar 2013 14:08:52 -0700 (PDT) Received: by mail-ee0-f51.google.com with SMTP id d17so460813eek.24 for ; Tue, 19 Mar 2013 14:08:51 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1362768363-3710-20-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, Mar 08, 2013 at 10:46:03AM -0800, Jesse Barnes wrote: > Port C is for eDP. Port B is shared between HDMI and DP. > > Signed-off-by: Jesse Barnes > --- > drivers/gpu/drm/i915/intel_display.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 3b085bb..3459c64 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -8557,10 +8557,6 @@ static void intel_setup_outputs(struct drm_device *dev) > if (I915_READ(VLV_DISPLAY_BASE + DP_B) & DP_DETECTED) > intel_dp_init(dev, VLV_DISPLAY_BASE + DP_B, PORT_B); > } > - > - if (I915_READ(VLV_DISPLAY_BASE + GEN4_HDMIC) & SDVO_DETECTED) > - intel_hdmi_init(dev, VLV_DISPLAY_BASE + GEN4_HDMIC, > - PORT_C); Meh, patch conflict since some random other patch in this series removed an empty line here. Iirc I've spotted that in the infamous "frob vlv pll stuff harder over the dpio sideband" patch. Merge a few other random patches which will hopefully only blow up on the next vlv silicon iteration ;-) Cheers, Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch