diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index b542bf6302f68ba8313590f1176c21f34f4bbbae..4ec192bc27ba66d2c1731a1366cd1ea8c655e231 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -1002,8 +1002,14 @@ static int ironlake_do_reset(struct drm_device *dev)
 
 	I915_WRITE(MCHBAR_MIRROR_BASE + ILK_GDSR,
 		   ILK_GRDOM_MEDIA | ILK_GRDOM_RESET_ENABLE);
-	return wait_for((I915_READ(MCHBAR_MIRROR_BASE + ILK_GDSR) &
-			 ILK_GRDOM_RESET_ENABLE) == 0, 500);
+	ret = wait_for((I915_READ(MCHBAR_MIRROR_BASE + ILK_GDSR) &
+			ILK_GRDOM_RESET_ENABLE) == 0, 500);
+	if (ret)
+		return ret;
+
+	I915_WRITE(MCHBAR_MIRROR_BASE + ILK_GDSR, 0);
+
+	return 0;
 }
 
 static int gen6_do_reset(struct drm_device *dev)