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 fe82d79f1cd6fc941516320695ed8f281ee73466..72a6bf40c6c9ca27722890f43de50469d0100f61 100644 (file)
--- 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);