diff options
author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2012-07-03 14:57:33 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-07-05 03:56:06 -0400 |
commit | 40579abed0624ce1dd0e54da312566dcc5f0622a (patch) | |
tree | 473c325e00ae996da9e165fa9ed93acd1bb39d9f /drivers/gpu | |
parent | 45e6e3a1cd2f53fd5996e75b4029defed97ca585 (diff) |
drm/i915: don't ironlake_init_pch_refclk() on LPT
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>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index f2c0100e0630..6edb2d5ec13c 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
@@ -504,7 +504,7 @@ static int i915_drm_thaw(struct drm_device *dev) | |||
504 | 504 | ||
505 | /* KMS EnterVT equivalent */ | 505 | /* KMS EnterVT equivalent */ |
506 | if (drm_core_check_feature(dev, DRIVER_MODESET)) { | 506 | if (drm_core_check_feature(dev, DRIVER_MODESET)) { |
507 | if (HAS_PCH_SPLIT(dev)) | 507 | if (HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev)) |
508 | ironlake_init_pch_refclk(dev); | 508 | ironlake_init_pch_refclk(dev); |
509 | 509 | ||
510 | mutex_lock(&dev->struct_mutex); | 510 | mutex_lock(&dev->struct_mutex); |
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index bd3366e755e1..b5ee440cd621 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -6859,7 +6859,7 @@ static void intel_setup_outputs(struct drm_device *dev) | |||
6859 | /* disable all the possible outputs/crtcs before entering KMS mode */ | 6859 | /* disable all the possible outputs/crtcs before entering KMS mode */ |
6860 | drm_helper_disable_unused_functions(dev); | 6860 | drm_helper_disable_unused_functions(dev); |
6861 | 6861 | ||
6862 | if (HAS_PCH_SPLIT(dev)) | 6862 | if (HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev)) |
6863 | ironlake_init_pch_refclk(dev); | 6863 | ironlake_init_pch_refclk(dev); |
6864 | } | 6864 | } |
6865 | 6865 | ||