recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.3/0032-drm-i915-Re-enable-gen7-RC6-and-GPU-turbo-after-resu.patch

   1 From a9dbe8df9f33f70904247f2e263a9647eb8e448a Mon Sep 17 00:00:00 2001
   2 From: Eric Anholt <eric@anholt.net>
   3 Date: Mon, 23 Jan 2012 16:14:06 -0800
   4 Subject: [PATCH 32/90] drm/i915: Re-enable gen7 RC6 and GPU turbo after
   5  resume.
   6
   7 commit 04115a9dee110b52a8eaa556c574022fa3bf4704 upstream.
   8
   9 Signed-off-by: Eric Anholt <eric@anholt.net>
  10 Reviewed-by: Keith Packard <keithp@keithp.com>
  11 Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
  12 Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
  13 Signed-off-by: Keith Packard <keithp@keithp.com>
  14 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  15 ---
  16  drivers/gpu/drm/i915/i915_suspend.c |    4 ++--
  17  1 files changed, 2 insertions(+), 2 deletions(-)
  18
  19 diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
  20 index 7886e4f..43cbafe 100644
  21 --- a/drivers/gpu/drm/i915/i915_suspend.c
  22 +++ b/drivers/gpu/drm/i915/i915_suspend.c
  23 @@ -822,7 +822,7 @@ int i915_save_state(struct drm_device *dev)
  24
  25         if (IS_IRONLAKE_M(dev))
  26                 ironlake_disable_drps(dev);
  27 -       if (IS_GEN6(dev))
  28 +       if (INTEL_INFO(dev)->gen >= 6)
  29                 gen6_disable_rps(dev);
  30
  31         /* Cache mode state */
  32 @@ -881,7 +881,7 @@ int i915_restore_state(struct drm_device *dev)
  33                 intel_init_emon(dev);
  34         }
  35
  36 -       if (IS_GEN6(dev)) {
  37 +       if (INTEL_INFO(dev)->gen >= 6) {
  38                 gen6_enable_rps(dev_priv);
  39                 gen6_update_ring_freq(dev_priv);
  40         }
  41 --
  42 1.7.7.4
  43