From: Ville Syrjälä Date: Fri, 1 Mar 2013 12:35:38 +0000 (+0200) Subject: drm/i915: Use '1' instead of FORCEWAKE_KERNEL for ST force wake X-Git-Tag: v3.10-rc2~14^2~80^2~53 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=30771e1652391e7fabef9f276e1579b8ecd76955;p=platform%2Fupstream%2Fkernel-adaptation-pc.git drm/i915: Use '1' instead of FORCEWAKE_KERNEL for ST force wake 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ä Reviewed-by: Chris Wilson Signed-off-by: Daniel Vetter --- 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),