projects
/
linux-edison.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1c70c0c
dc501fb
)
Merge branch 'drm-intel-fixes' into drm-intel-next
author
Keith Packard
<keithp@keithp.com>
Wed, 29 Jun 2011 20:47:53 +0000
(13:47 -0700)
committer
Keith Packard
<keithp@keithp.com>
Wed, 29 Jun 2011 20:47:53 +0000
(13:47 -0700)
1
2
drivers/gpu/drm/i915/i915_debugfs.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/i915_drv.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/i915_suspend.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/gpu/drm/i915/i915_debugfs.c
Simple merge
diff --cc
drivers/gpu/drm/i915/i915_drv.h
Simple merge
diff --cc
drivers/gpu/drm/i915/i915_suspend.c
index
6fbd997
,
5257cfc
..
8cd1c8b
---
1
/
drivers/gpu/drm/i915/i915_suspend.c
---
2
/
drivers/gpu/drm/i915/i915_suspend.c
+++ b/
drivers/gpu/drm/i915/i915_suspend.c
@@@
-875,11
-878,11
+878,13
@@@
int i915_restore_state(struct drm_devic
intel_init_emon(dev);
}
- if (IS_GEN6(dev))
+ if (IS_GEN6(dev))
{
gen6_enable_rps(dev_priv);
+ gen6_update_ring_freq(dev_priv);
+ }
+ mutex_lock(&dev->struct_mutex);
+
/* Cache mode state */
I915_WRITE (CACHE_MODE_0, dev_priv->saveCACHE_MODE_0 | 0xffff0000);