Re: [Intel-gfx] [PATCH 2/2] drm/i915: Re-enable gen7 RC6 and GPU turbo after resume.

2012-01-24 Thread Keith Packard 
On Mon, 23 Jan 2012 16:14:06 -0800, Eric Anholt e...@anholt.net wrote:

 Signed-off-by: Eric Anholt e...@anholt.net
 Cc: sta...@vger.kernel.org

I've applied this to drm-intel-fixes

-- 
keith.pack...@intel.com


pgpLcUStmh3FO.pgp
Description: PGP signature
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 2/2] drm/i915: Re-enable gen7 RC6 and GPU turbo after resume.

2012-01-23 Thread Eric Anholt 
Signed-off-by: Eric Anholt e...@anholt.net
Cc: sta...@vger.kernel.org
---
 drivers/gpu/drm/i915/i915_suspend.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_suspend.c 
b/drivers/gpu/drm/i915/i915_suspend.c
index 30d924f..2b5eb22 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -827,7 +827,7 @@ int i915_save_state(struct drm_device *dev)
 
if (IS_IRONLAKE_M(dev))
ironlake_disable_drps(dev);
-   if (IS_GEN6(dev))
+   if (INTEL_INFO(dev)-gen = 6)
gen6_disable_rps(dev);
 
/* Cache mode state */
@@ -886,7 +886,7 @@ int i915_restore_state(struct drm_device *dev)
intel_init_emon(dev);
}
 
-   if (IS_GEN6(dev)) {
+   if (INTEL_INFO(dev)-gen = 6) {
gen6_enable_rps(dev_priv);
gen6_update_ring_freq(dev_priv);
}
-- 
1.7.7.3

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH 2/2] drm/i915: Re-enable gen7 RC6 and GPU turbo after resume.

2012-01-23 Thread Keith Packard 
On Mon, 23 Jan 2012 16:14:06 -0800, Eric Anholt e...@anholt.net wrote:

   if (IS_IRONLAKE_M(dev))
   ironlake_disable_drps(dev);
 - if (IS_GEN6(dev))
 + if (INTEL_INFO(dev)-gen = 6)
   gen6_disable_rps(dev);
  
   /* Cache mode state */
 @@ -886,7 +886,7 @@ int i915_restore_state(struct drm_device *dev)
   intel_init_emon(dev);
   }
  
 - if (IS_GEN6(dev)) {
 + if (INTEL_INFO(dev)-gen = 6) {
   gen6_enable_rps(dev_priv);
   gen6_update_ring_freq(dev_priv);
   }

I fear we'll continue to find stuff like this...

I just reviewed all of the IS_GEN6 calls and found that
i915_forcewake_open/i915_forcewake_release only work on
GEN6; I assume these are supposed to work on GEN6 and after, so a test
like the above might be appropriate?

I didn't see much else, although there are some suspicious bits in
i915_debugfs.c that could probably use review.

In any case, the above patch is

Reviewed-by: Keith Packard kei...@keithp.com

and I will merge it into -fixes

-- 
keith.pack...@intel.com


pgpaYYAHaxZTw.pgp
Description: PGP signature
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx