Merge tag 'v3.9-rc3' into drm-intel-next-queued

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / i915 / intel_lvds.c

diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 3d1d97488cc95527c699dd6eb8b0c2ec78cc6adf..6ff145f97e90fa39444526dc5f35e3b27c43c7f5 100644 (file)
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -1019,12 +1019,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;
 
        /* 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;
 }
 
 /**