diff mbox

[2/3] drm/i915: Use '1' instead of FORCEWAKE_KERNEL for ST force wake

Message ID 1362141339-14424-2-git-send-email-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ville Syrjala March 1, 2013, 12:35 p.m. UTC 
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Use the number '1' instead of FORCEWAKE_KERNEL when requesting single
thread force wake since there is only one bit in the register. Using
the FORCEWAKE_KERNEL name might give someone the wrong impression.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Chris Wilson March 1, 2013, 1:35 p.m. UTC | #1 
On Fri, Mar 01, 2013 at 02:35:38PM +0200, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Use the number '1' instead of FORCEWAKE_KERNEL when requesting single
> thread force wake since there is only one bit in the register. Using
> the FORCEWAKE_KERNEL name might give someone the wrong impression.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

All 3 Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
Daniel Vetter March 3, 2013, 8:08 p.m. UTC | #2 
On Fri, Mar 01, 2013 at 01:35:53PM +0000, Chris Wilson wrote:
> On Fri, Mar 01, 2013 at 02:35:38PM +0200, ville.syrjala@linux.intel.com wrote:
> > From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > 
> > Use the number '1' instead of FORCEWAKE_KERNEL when requesting single
> > thread force wake since there is only one bit in the register. Using
> > the FORCEWAKE_KERNEL name might give someone the wrong impression.
> > 
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> All 3 Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Entire series merged, thanks.
-Daniel
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 4e1abd0..2d4ec08 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4282,7 +4282,7 @@  static void __gen6_gt_force_wake_get(struct drm_i915_private *dev_priv)
 			    FORCEWAKE_ACK_TIMEOUT_MS))
 		DRM_ERROR("Timed out waiting for forcewake old ack to clear.\n");
 
-	I915_WRITE_NOTRACE(FORCEWAKE, FORCEWAKE_KERNEL);
+	I915_WRITE_NOTRACE(FORCEWAKE, 1);
 	POSTING_READ(ECOBUS); /* something from same cacheline, but !FORCEWAKE */
 
 	if (wait_for_atomic((I915_READ_NOTRACE(forcewake_ack) & 1),