git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e71fe01
)
drm/i915: Re-enable gen7 RC6 and GPU turbo after resume.
author
Eric Anholt
<eric@anholt.net>
Tue, 24 Jan 2012 00:14:06 +0000
(16:14 -0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Fri, 3 Feb 2012 17:21:44 +0000
(09:21 -0800)
commit
04115a9dee110b52a8eaa556c574022fa3bf4704
upstream.
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/i915/i915_suspend.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/i915_suspend.c
b/drivers/gpu/drm/i915/i915_suspend.c
index
7886e4f
..
43cbafe
100644
(file)
--- a/
drivers/gpu/drm/i915/i915_suspend.c
+++ b/
drivers/gpu/drm/i915/i915_suspend.c
@@
-822,7
+822,7
@@
int i915_save_state(struct drm_device *dev)
if (IS_IRONLAKE_M(dev))
ironlake_disable_drps(dev);
- if (I
S_GEN6(dev)
)
+ if (I
NTEL_INFO(dev)->gen >= 6
)
gen6_disable_rps(dev);
/* Cache mode state */
@@
-881,7
+881,7
@@
int i915_restore_state(struct drm_device *dev)
intel_init_emon(dev);
}
- if (I
S_GEN6(dev)
) {
+ if (I
NTEL_INFO(dev)->gen >= 6
) {
gen6_enable_rps(dev_priv);
gen6_update_ring_freq(dev_priv);
}