Attachment 108880 Details for Bug 85684 – Wait old forcewake ack to clear on vlv

[patch] Wait old forcewake ack to clear on vlv

0001-drm-i915-Wait-old-forcewake-ack-to-clear-on-vlv.patch (text/plain), 1.60 KB, created by Mika Kuoppala on 2014-11-04 09:24:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mika Kuoppala

Created: 2014-11-04 09:24:41 UTC

Size: 1.60 KB

patch

obsolete

>From dfc5011c27f03608a2048a37fe24fb715f626f5a Mon Sep 17 00:00:00 2001
>From: Mika Kuoppala <mika.kuoppala@intel.com>
>Date: Tue, 4 Nov 2014 10:50:39 +0200
>Subject: [PATCH] drm/i915: Wait old forcewake ack to clear on vlv
>
>Don't rush into getting fw until the clearing has been acked.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85684
>Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com>
>---
> drivers/gpu/drm/i915/intel_uncore.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
>diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
>index 9427641..5259b38 100644
>--- a/drivers/gpu/drm/i915/intel_uncore.c
>+++ b/drivers/gpu/drm/i915/intel_uncore.c
>@@ -204,6 +204,10 @@ static void __vlv_force_wake_get(struct drm_i915_private *dev_priv,
> 	/* Check for Render Engine */
> 	if (FORCEWAKE_RENDER & fw_engine) {
> 
>+		if (wait_for_atomic((__raw_i915_read32(dev_priv, FORCEWAKE_ACK_VLV) &
>+				     FORCEWAKE_KERNEL) == 0, FORCEWAKE_ACK_TIMEOUT_MS))
>+			DRM_ERROR("Timed out: waiting for old Render ack to clear.\n");
>+
> 		__raw_i915_write32(dev_priv, FORCEWAKE_VLV,
> 				   _MASKED_BIT_ENABLE(FORCEWAKE_KERNEL));
> 
>@@ -217,6 +221,11 @@ static void __vlv_force_wake_get(struct drm_i915_private *dev_priv,
> 	/* Check for Media Engine */
> 	if (FORCEWAKE_MEDIA & fw_engine) {
> 
>+		if (wait_for_atomic((__raw_i915_read32(dev_priv, FORCEWAKE_ACK_MEDIA_VLV) &
>+				     FORCEWAKE_KERNEL) == 0, FORCEWAKE_ACK_TIMEOUT_MS))
>+			DRM_ERROR("Timed out: waiting for old media ack to clear.\n");
>+
>+
> 		__raw_i915_write32(dev_priv, FORCEWAKE_MEDIA_VLV,
> 				   _MASKED_BIT_ENABLE(FORCEWAKE_KERNEL));
> 
>-- 
>1.9.1
>

Actions: View | Splinter Review

Attachments on bug 85684: 108880 | 109259

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.