drm/i915: don't ironlake_init_pch_refclk() on LPT
authorPaulo Zanoni <paulo.r.zanoni@intel.com>
Tue, 3 Jul 2012 18:57:33 +0000 (15:57 -0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 5 Jul 2012 07:56:06 +0000 (09:56 +0200)
This function is used to set the PCH_DREF_CONTROL register, which does
not exist on LPT anymore.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_display.c

index f2c0100e0630925adbcba24edc3ef42c88f54b76..6edb2d5ec13c6a2e6d2e7107a0ebf0abd8c7bef4 100644 (file)
@@ -504,7 +504,7 @@ static int i915_drm_thaw(struct drm_device *dev)
 
        /* KMS EnterVT equivalent */
        if (drm_core_check_feature(dev, DRIVER_MODESET)) {
-               if (HAS_PCH_SPLIT(dev))
+               if (HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev))
                        ironlake_init_pch_refclk(dev);
 
                mutex_lock(&dev->struct_mutex);
index bd3366e755e1439336f751455ba6d10292a65511..b5ee440cd621b8fd3897ad19469965bb5f31d354 100644 (file)
@@ -6859,7 +6859,7 @@ static void intel_setup_outputs(struct drm_device *dev)
        /* disable all the possible outputs/crtcs before entering KMS mode */
        drm_helper_disable_unused_functions(dev);
 
-       if (HAS_PCH_SPLIT(dev))
+       if (HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev))
                ironlake_init_pch_refclk(dev);
 }