From f26d0343ac9cd681c2b8d5225c74eaf76d51b56a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= Date: Fri, 1 Mar 2013 14:35:38 +0200 Subject: [PATCH] --- yaml --- r: 371173 b: refs/heads/master c: 30771e1652391e7fabef9f276e1579b8ecd76955 h: refs/heads/master i: 371171: fbd73de291a1a07c663e145d02c11630e8cc389b v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_pm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cac10f1641f7..8f84507ac150 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83983c8b5145542e7533688518ee70665cb87ae6 +refs/heads/master: 30771e1652391e7fabef9f276e1579b8ecd76955 diff --git a/trunk/drivers/gpu/drm/i915/intel_pm.c b/trunk/drivers/gpu/drm/i915/intel_pm.c index 4e1abd04a89b..2d4ec08383dd 100644 --- a/trunk/drivers/gpu/drm/i915/intel_pm.c +++ b/trunk/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),