From: Daniel Vetter <daniel@ffwll.ch>
Date: Sat, 14 Jan 2012 00:20:06 +0000 (-0800)
Subject: drm/i915: convert force_wake_get to func pointer in the gpu reset code
X-Git-Tag: v2.6.39-400.9.0~133^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3e49c0876a81134e9476c74e51c0018bb8e2008f;p=users%2Fjedix%2Flinux-maple.git

drm/i915: convert force_wake_get to func pointer in the gpu reset code

Orabug: 15851255

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 <eugeni.dodonov@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
---

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index fe82d79f1cd6..72a6bf40c6c9 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -618,7 +618,7 @@ int i915_reset(struct drm_device *dev, u8 flags)
 		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);