From 536754c14ff6a83d448265e9a31eb0c77d2ce292 Mon Sep 17 00:00:00 2001 From: Ben Widawsky Date: Fri, 24 Jun 2011 14:31:47 -0700 Subject: [PATCH] --- yaml --- r: 254179 b: refs/heads/master c: 25732821cb965f00475922ca46e84f78e4bada95 h: refs/heads/master i: 254177: 44f8f87bba1c8c374dbfe47c25bdbfc583770906 254175: 8297a3cc1a4b9515e7a252193722d4d6dcee972e v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_drv.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index abe3c35c7ad5..56557e791a9c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c9017e5b77118439952fe8dc22809bae4fae4b6 +refs/heads/master: 25732821cb965f00475922ca46e84f78e4bada95 diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c index 0defd4270594..609358faaa90 100644 --- a/trunk/drivers/gpu/drm/i915/i915_drv.c +++ b/trunk/drivers/gpu/drm/i915/i915_drv.c @@ -579,6 +579,9 @@ int i915_reset(struct drm_device *dev, u8 flags) } else switch (INTEL_INFO(dev)->gen) { case 6: 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); break; case 5: ret = ironlake_do_reset(dev, flags);