From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: [PATCH 4/7] drm/i915: add HDMI and DP port enumeration on ValleyView Date: Wed, 13 Jun 2012 10:19:46 -0700 Message-ID: <20120613101946.5c68a1bd@jbarnes-desktop> References: <1339537655-5792-1-git-send-email-jbarnes@virtuousgeek.org> <1339537655-5792-5-git-send-email-jbarnes@virtuousgeek.org> <20120613081109.GC4829@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from oproxy7-pub.bluehost.com (oproxy7-pub.bluehost.com [67.222.55.9]) by gabe.freedesktop.org (Postfix) with SMTP id A6C119E8FD for ; Wed, 13 Jun 2012 10:19:48 -0700 (PDT) In-Reply-To: <20120613081109.GC4829@phenom.ffwll.local> 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: Daniel Vetter Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Wed, 13 Jun 2012 10:11:09 +0200 Daniel Vetter wrote: > 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. I dropped this and just use SDVOB now; the docs look the same as Cantiga, so we may as well keep it looking similar. > > > + /* 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? Ah yeah, merge error on my part. Fixed. > Also, I wonder where you set up the vlv eDP panels? That'll be coming with Shobit's eDP patchset. Thanks, -- Jesse Barnes, Intel Open Source Technology Center