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: upstream/snapshot3+hdmi~8239^2~3^2~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8109021313c7a3d8947677391ce6ab9cd0bb1d28;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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

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>
---

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 8f71879..46c36f5 100644
--- 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, 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);