---

yaml --- r: 286839 b: refs/heads/master c: 8109021 h: refs/heads/master i: 286837: 8ea15dc 286835: 5e5d78d 286831: 33adcec v: v3
git-mirror · Jan 14, 2012 · f598fb5 · f598fb5
1 parent 108c229
commit f598fb5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);