aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2011-08-12 17:07:18 -0700
committerKeith Packard <keithp@keithp.com>2011-08-15 12:10:27 -0700
commit92b79f4322b8a2506bdd862f554a2a81ff0a2dad (patch)
treeeec727f584f444e01e78ec86ed69833b3401888a /drivers
parentc3613de92ebea302137d21d8938421c3f88d8741 (diff)
downloadautogen-92b79f4322b8a2506bdd862f554a2a81ff0a2dad.tar.gz
autogen-92b79f4322b8a2506bdd862f554a2a81ff0a2dad.tar.xz
autogen-92b79f4322b8a2506bdd862f554a2a81ff0a2dad.zip
drm/i915: Cannot set clock gating under UMS
The clock gating functions are only assigned under KMS, so don't try to call them under UMS. Signed-off-by: Keith Packard <keithp@keithp.com> Tested-by: Justin P. Mattock <justinmattock@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/i915/i915_suspend.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index 87677d60d0d..f10742359ec 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -871,7 +871,8 @@ int i915_restore_state(struct drm_device *dev)
}
mutex_unlock(&dev->struct_mutex);
- intel_init_clock_gating(dev);
+ if (drm_core_check_feature(dev, DRIVER_MODESET))
+ intel_init_clock_gating(dev);
if (IS_IRONLAKE_M(dev)) {
ironlake_enable_drps(dev);