This is a note to let you know that I've just added the patch titled
drm/i915: convert force_wake_get to func pointer in the gpu reset code
to the 3.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-i915-convert-force_wake_get-to-func-pointer-in-the-gpu-reset-code.patch
and it can be found in the queue-3.2 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 8109021313c7a3d8947677391ce6ab9cd0bb1d28 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <[email protected]>
Date: Fri, 13 Jan 2012 16:20:06 -0800
Subject: drm/i915: convert force_wake_get to func pointer in the gpu reset code
From: Daniel Vetter <[email protected]>
commit 8109021313c7a3d8947677391ce6ab9cd0bb1d28 upstream.
This was forgotten in the original multi-threaded forcewake
conversion:
commit 8d715f0024f64ad1b1be85d8c081cf577944c847
Author: Keith Packard <keithp at keithp.com>
Date: Fri Nov 18 20:39:01 2011 -0800
drm/i915: add multi-threaded forcewake support
Signed-Off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
Reviewed-by: Eugeni Dodonov <[email protected]>
Signed-off-by: Keith Packard <[email protected]>
Signed-off-by: Eugeni Dodonov <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/gpu/drm/i915/i915_drv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -645,7 +645,7 @@ int i915_reset(struct drm_device *dev, u
ret = gen6_do_reset(dev, flags);
/* If reset with a user forcewake, try to restore */
if (atomic_read(&dev_priv->forcewake_count))
- __gen6_gt_force_wake_get(dev_priv);
+ dev_priv->display.force_wake_get(dev_priv);
break;
case 5:
ret = ironlake_do_reset(dev, flags);
Patches currently in stable-queue which might be from [email protected] are
queue-3.2/drm-i915-convert-force_wake_get-to-func-pointer-in-the-gpu-reset-code.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
