diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2014-12-08 11:09:10 -0500 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-12-10 11:47:20 -0500 |
| commit | 7ff0ebcc1e30e3216c8c62ee71f59ac830b10364 (patch) | |
| tree | f87cf3981ac495f0af773a4a9a0a372980dc4bfd /drivers/gpu/drm/i915/i915_suspend.c | |
| parent | 15a17aae5f803551981a7acc6a4058b247a7452c (diff) | |
drm/i915: Move FBC stuff to intel_fbc.c
No functional changes. This is just the begin of a FBC rework.
v2 (Paulo):
- Revert intel_fbc_init() changed parameter.
- Revert set_no_fbc_reason() rename.
- Rebase.
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_suspend.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_suspend.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c index dfe661743398..1e4999dd3ed5 100644 --- 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) | |||
| 264 | } | 264 | } |
| 265 | 265 | ||
| 266 | /* only restore FBC info on the platform that supports FBC*/ | 266 | /* only restore FBC info on the platform that supports FBC*/ |
| 267 | intel_disable_fbc(dev); | 267 | intel_fbc_disable(dev); |
| 268 | 268 | ||
| 269 | /* restore FBC interval */ | 269 | /* restore FBC interval */ |
| 270 | if (HAS_FBC(dev) && INTEL_INFO(dev)->gen <= 4 && !IS_G4X(dev)) | 270 | if (HAS_FBC(dev) && INTEL_INFO(dev)->gen <= 4 && !IS_G4X(dev)) |