diff options
| author | Daniel Vetter <daniel@ffwll.ch> | 2012-01-13 16:20:06 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-01-13 16:20:06 -0800 |
| commit | 8109021313c7a3d8947677391ce6ab9cd0bb1d28 (patch) | |
| tree | 65f80997225cecdf43ab2a7f7ae0817d169bc3f0 /drivers/gpu | |
| parent | 00c2064b7766c4e24af42e21da1903aedc8ca4c0 (diff) | |
| download | linux-stable-8109021313c7a3d8947677391ce6ab9cd0bb1d28.tar.gz linux-stable-8109021313c7a3d8947677391ce6ab9cd0bb1d28.tar.bz2 linux-stable-8109021313c7a3d8947677391ce6ab9cd0bb1d28.zip | |
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 8f7187915b0d..46c36f5cafb1 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); |