Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30771e16 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 83983c8b

drivers/gpu/drm/i915/intel_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -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),