diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-29 09:08:51 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-29 09:08:51 +0200 |
| commit | b9a3acf46afdafc601947136f63e9dd228cd86e8 (patch) | |
| tree | 2b206b6d3c51f673c94fbcdf03df2a699e7110d2 /drivers/gpu/drm/i915/i915_suspend.c | |
| parent | sh: ecovec: add renesas_usbhs DMAEngine support (diff) | |
| parent | sh: fix the compile error in setup-sh7757.c (diff) | |
| download | linux-b9a3acf46afdafc601947136f63e9dd228cd86e8.tar.xz linux-b9a3acf46afdafc601947136f63e9dd228cd86e8.zip | |
Merge branch 'sh/stable-updates' into sh-latest
Diffstat (limited to 'drivers/gpu/drm/i915/i915_suspend.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_suspend.c | 3 |
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 87677d60d0df..f10742359ec9 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); |