From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 16/29] drm/i915: detect PCH encoders on Haswell Date: Tue, 17 Apr 2012 12:21:48 +0200 Message-ID: <20120417102148.GH4104@phenom.ffwll.local> References: <1334347745-11743-1-git-send-email-eugeni.dodonov@intel.com> <1334347745-11743-17-git-send-email-eugeni.dodonov@intel.com> 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 82094A08F6 for ; Tue, 17 Apr 2012 03:20:51 -0700 (PDT) Received: by eekb45 with SMTP id b45so1560370eek.36 for ; Tue, 17 Apr 2012 03:20:50 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1334347745-11743-17-git-send-email-eugeni.dodonov@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: Eugeni Dodonov Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, Apr 13, 2012 at 05:08:52PM -0300, Eugeni Dodonov wrote: > On Haswell, the only PCH-connected output is the one driven by DDI E in > FDI mode, used for VGA connection. All the others are handled by the CPU. > > Signed-off-by: Eugeni Dodonov > --- > drivers/gpu/drm/i915/intel_display.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index e4ebd39..b01afb0 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -3098,6 +3098,13 @@ static bool intel_crtc_driving_pch(struct drm_crtc *crtc) > if (encoder->base.crtc != crtc) > continue; > > + /* On Haswell, only DDI E can connect to PCH through FDI to drive VGA */ > + if (IS_HASWELL(dev) && (encoder->type != DRM_MODE_ENCODER_DAC)) { > + DRM_DEBUG_KMS("Non-PCH encoder detected on Haswell. Allowed: %d, detected: %d\n", > + DRM_MODE_ENCODER_DAC, encoder->type); > + return false; > + } Shouldn't we use a PCH_LTP check here, given that it looks like hsd can be combined with ppt? Or is it really only DDI E that can be used for fdi and hsw+ppt would only be able to drive 1 pch output? -Daniel > + > switch (encoder->type) { > case INTEL_OUTPUT_EDP: > if (!intel_encoder_is_pch_edp(&encoder->base)) > -- > 1.7.10 > > _______________________________________________ > 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