Commit 97b068a6 authored by Daniel Vetter's avatar Daniel Vetter Committed by Greg Kroah-Hartman

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

commit 81090213 upstream.

This was forgotten in the original multi-threaded forcewake
conversion:

commit 8d715f00
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: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarEugeni Dodonov <eugeni.dodonov@intel.com>
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarEugeni Dodonov <eugeni.dodonov@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a390a377
...@@ -645,7 +645,7 @@ int i915_reset(struct drm_device *dev, u8 flags) ...@@ -645,7 +645,7 @@ int i915_reset(struct drm_device *dev, u8 flags)
ret = gen6_do_reset(dev, flags); ret = gen6_do_reset(dev, flags);
/* If reset with a user forcewake, try to restore */ /* If reset with a user forcewake, try to restore */
if (atomic_read(&dev_priv->forcewake_count)) if (atomic_read(&dev_priv->forcewake_count))
__gen6_gt_force_wake_get(dev_priv); dev_priv->display.force_wake_get(dev_priv);
break; break;
case 5: case 5:
ret = ironlake_do_reset(dev, flags); ret = ironlake_do_reset(dev, flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment