From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 4/7] drm/i915: add HDMI and DP port enumeration on ValleyView Date: Wed, 13 Jun 2012 10:11:09 +0200 Message-ID: <20120613081109.GC4829@phenom.ffwll.local> References: <1339537655-5792-1-git-send-email-jbarnes@virtuousgeek.org> <1339537655-5792-5-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-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by gabe.freedesktop.org (Postfix) with ESMTP id C4D699EB0C for ; Wed, 13 Jun 2012 01:09:38 -0700 (PDT) Received: by wibhm14 with SMTP id hm14so3677720wib.12 for ; Wed, 13 Jun 2012 01:09:38 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1339537655-5792-5-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 Tue, Jun 12, 2012 at 02:47:32PM -0700, Jesse Barnes wrote: > ValleyView is similar to IbexPeak here, but with different register > offsets. > > Signed-off-by: Jesse Barnes > --- > drivers/gpu/drm/i915/intel_display.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 5006928..2a677f8 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -6772,7 +6772,24 @@ static void intel_setup_outputs(struct drm_device *dev) > > if (!dpd_is_edp && (I915_READ(PCH_DP_D) & DP_DETECTED)) > intel_dp_init(dev, PCH_DP_D); > + } else if (IS_VALLEYVIEW(dev)) { > + int found; > + > + if (I915_READ(VLV_HDMIB) & PORT_DETECTED) { VLV_HDMIB == SDVOB, which royally confused me, especially since below you use SDVOC for VLV_HDMC. Yeah, pre-pch_split we just use the SDVO names for the HDMI registers. I guess I'll just wait for Paulo to clean up this mess. > + /* SDVOB multiplex with HDMIB */ > + found = intel_sdvo_init(dev, VLV_HDMIB, true); > + if (!found) > + intel_hdmi_init(dev, VLV_HDMIB); > + if (!found && (I915_READ(DP_B) & DP_DETECTED)) > + intel_dp_init(dev, DP_B); > + } > + > + if (I915_READ(SDVOC) & PORT_DETECTED) > + intel_hdmi_init(dev, SDVOC); > > + /* Shares lanes with HDMI on SDVOC */ > + if (!dpd_is_edp && (I915_READ(DP_C) & DP_DETECTED)) > + intel_dp_init(dev, DP_C); This !dpd_is_edp check here looks fishy for DP_C, copy&paste fail? Also, I wonder where you set up the vlv eDP panels? > } else if (SUPPORTS_DIGITAL_OUTPUTS(dev)) { > bool found = false; > > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Mail: daniel@ffwll.ch Mobile: +41 (0)79 365 57 48