git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'drm-intel-next-2014-12-19' of git://anongit.freedesktop.org/drm-intel...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
i915
/
i915_suspend.c
diff --git
a/drivers/gpu/drm/i915/i915_suspend.c
b/drivers/gpu/drm/i915/i915_suspend.c
index 26368822a33f764d7ac1438cfbd6fc082a9e918c..9f19ed38cdc346e9731996461b18801b63f9b7ea 100644
(file)
--- a/
drivers/gpu/drm/i915/i915_suspend.c
+++ b/
drivers/gpu/drm/i915/i915_suspend.c
@@
-264,7
+264,7
@@
static void i915_restore_display(struct drm_device *dev)
}
/* only restore FBC info on the platform that supports FBC*/
- intel_
disable_fbc
(dev);
+ intel_
fbc_disable
(dev);
/* restore FBC interval */
if (HAS_FBC(dev) && INTEL_INFO(dev)->gen <= 4 && !IS_G4X(dev))