From: Keith Packard <keithp@keithp.com>
Date: Wed, 29 Jun 2011 20:47:53 +0000 (-0700)
Subject: Merge branch 'drm-intel-fixes' into drm-intel-next
X-Git-Tag: v3.12-rc1~5248^2~18^2~31
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e489bda422b0a2c2cc33e598a4d400dfe654ad64;p=kernel%2Fkernel-generic.git

Merge branch 'drm-intel-fixes' into drm-intel-next
---

e489bda422b0a2c2cc33e598a4d400dfe654ad64
diff --cc drivers/gpu/drm/i915/i915_suspend.c
index 6fbd997,5257cfc..8cd1c8b
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@@ -875,11 -878,11 +878,13 @@@ int i915_restore_state(struct drm_devic
  		intel_init_emon(dev);
  	}
  
 -	if (IS_GEN6(dev))
 +	if (IS_GEN6(dev)) {
  		gen6_enable_rps(dev_priv);
 +		gen6_update_ring_freq(dev_priv);
 +	}
  
+ 	mutex_lock(&dev->struct_mutex);
+ 
  	/* Cache mode state */
  	I915_WRITE (CACHE_MODE_0, dev_priv->saveCACHE_MODE_0 | 0xffff0000);