From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eugeni Dodonov Subject: [PATCH 16/29] drm/i915: detect PCH encoders on Haswell Date: Fri, 13 Apr 2012 17:08:52 -0300 Message-ID: <1334347745-11743-17-git-send-email-eugeni.dodonov@intel.com> References: <1334347745-11743-1-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 oproxy9.bluehost.com (oproxy9.bluehost.com [69.89.24.6]) by gabe.freedesktop.org (Postfix) with SMTP id 483C1A0DE2 for ; Fri, 13 Apr 2012 13:35:37 -0700 (PDT) In-Reply-To: <1334347745-11743-1-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: intel-gfx@lists.freedesktop.org Cc: Eugeni Dodonov List-Id: intel-gfx@lists.freedesktop.org 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; + } + switch (encoder->type) { case INTEL_OUTPUT_EDP: if (!intel_encoder_is_pch_edp(&encoder->base)) -- 1.7.10