From e1f879f2cf91f822c0a6acd063232c703b8c394b Mon Sep 17 00:00:00 2001 From: Paulo Zanoni Date: Wed, 6 Mar 2013 20:03:19 -0300 Subject: [PATCH] --- yaml --- r: 371197 b: refs/heads/master c: 311e359c0bcbcfa6d71a56407477f2ec9c28c2d5 h: refs/heads/master i: 371195: 0db98914179ddb12dea2b571078ee6a62fc14ac7 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_lvds.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index bcfee540d714..d0250e47134f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 86d52df633869b54a6f0b9a8f088be9c89a42c3d +refs/heads/master: 311e359c0bcbcfa6d71a56407477f2ec9c28c2d5 diff --git a/trunk/drivers/gpu/drm/i915/intel_lvds.c b/trunk/drivers/gpu/drm/i915/intel_lvds.c index 6b24fc57ff47..53bd5fd84028 100644 --- a/trunk/drivers/gpu/drm/i915/intel_lvds.c +++ b/trunk/drivers/gpu/drm/i915/intel_lvds.c @@ -1020,15 +1020,15 @@ static bool intel_lvds_supported(struct drm_device *dev) { /* With the introduction of the PCH we gained a dedicated * LVDS presence pin, use it. */ - if (HAS_PCH_SPLIT(dev)) + if (HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev)) return true; - if (IS_VALLEYVIEW(dev)) - return false; - /* Otherwise LVDS was only attached to mobile products, * except for the inglorious 830gm */ - return IS_MOBILE(dev) && !IS_I830(dev); + if (INTEL_INFO(dev)->gen <= 4 && IS_MOBILE(dev) && !IS_I830(dev)) + return true; + + return false; } /**