diff options
| author | Daniel Vetter | 2012-06-29 23:32:16 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2012-07-05 09:56:04 +0200 |
| commit | 930ebb462422117e12b85bb5fd6548ed13d0afb5 (patch) | |
| tree | 7d2dd97469353442ae8a8ffee4c7760f337ae627 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: move force wake support into intel_pm (diff) | |
| download | kernel-qcow2-linux-930ebb462422117e12b85bb5fd6548ed13d0afb5.tar.gz kernel-qcow2-linux-930ebb462422117e12b85bb5fd6548ed13d0afb5.tar.xz kernel-qcow2-linux-930ebb462422117e12b85bb5fd6548ed13d0afb5.zip | |
drm/i915: fix up ilk rc6 disabling confusion
While creating the new enable/disable_gt_powersave functions in
commit 8090c6b9daa04dda649ac0a2209601042abfb0a4
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Sun Jun 24 16:42:32 2012 +0200
drm/i915: wrap up gt powersave enabling functions
I've botched up the handling of ironlake_disable_rc6. Fix this up by
calling it at the right place. Note though that ironlake_disable_rc6
does a bit more than just disabling rc6 - it also tears down all the
allocated context objects.
Hence we need to move intel_teardown_rc6 out and directly call it from
intel_modeset_cleanup.
Also properly mark ironlake_enable_rc6 as static and kill the un-used
declaration in i915_drv.h.
Note: In review a question popped out why disable_rc6 also tears down
the backing object and why we should move that out - it's simply for
consistency with gen6+ rps code, which does it that way.
Cc: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Reviewed-by: Ben Widawsky <ben@bwidawsk.net>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 342f18e9cbe0..bd3366e755e1 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -7267,6 +7267,8 @@ void intel_modeset_cleanup(struct drm_device *dev) intel_disable_gt_powersave(dev); + ironlake_teardown_rc6(dev); + if (IS_VALLEYVIEW(dev)) vlv_init_dpio(dev); |