From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Widawsky Subject: [PATCH 19/21] drm/i915: Never allow VGA on LPT LP PCH Date: Thu, 7 Nov 2013 21:40:49 -0800 Message-ID: <1383889251-498-19-git-send-email-benjamin.widawsky@intel.com> References: <1383889251-498-1-git-send-email-benjamin.widawsky@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 07BDAFA1A0 for ; Fri, 8 Nov 2013 00:16:07 -0800 (PST) In-Reply-To: <1383889251-498-1-git-send-email-benjamin.widawsky@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Intel GFX Cc: Ben Widawsky , Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org Sometimes the VBT lies, I guess? I can't explain why this occurs, but it does on the early platforms we have. Since it seems never unsafe to do this, I don't feel we need any quirk or warnings. Cc: Paulo Zanoni Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/intel_display.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 6ced1a1..00b0bf9 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5671,6 +5671,7 @@ static void lpt_disable_clkout_dp(struct drm_device *dev) static void lpt_init_pch_refclk(struct drm_device *dev) { + struct drm_i915_private *dev_priv = dev->dev_private; struct drm_mode_config *mode_config = &dev->mode_config; struct intel_encoder *encoder; bool has_vga = false; @@ -5683,7 +5684,7 @@ static void lpt_init_pch_refclk(struct drm_device *dev) } } - if (has_vga) + if (dev_priv->pch_id != INTEL_PCH_LPT_LP_DEVICE_ID_TYPE && has_vga) lpt_enable_clkout_dp(dev, true, true); else lpt_disable_clkout_dp(dev); -- 1.8.4.2