From f598fb5f39b249ee68d0ce8ea2c01447a27d0d08 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Fri, 13 Jan 2012 16:20:06 -0800 Subject: [PATCH] --- yaml --- r: 286839 b: refs/heads/master c: 8109021313c7a3d8947677391ce6ab9cd0bb1d28 h: refs/heads/master i: 286837: 8ea15dc3eeea40df2cc9fbc69c755f476144263c 286835: 5e5d78d1ac4a20862631776aa867905542ad8fa7 286831: 33adcec9394350175f4cacc7a053b1f979649f14 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_drv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 54d5feac9ee9..f8f19a36d863 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 00c2064b7766c4e24af42e21da1903aedc8ca4c0 +refs/heads/master: 8109021313c7a3d8947677391ce6ab9cd0bb1d28 diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c index 8f7187915b0d..46c36f5cafb1 100644 --- a/trunk/drivers/gpu/drm/i915/i915_drv.c +++ b/trunk/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);