diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index e5ee65655e8c95f9bfd387c93c034e6dd2cab92c..ba465f9cc2f2a3d934c9b4bc8f6013c0106a0664 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -982,10 +982,22 @@ static int gen6_do_reset(struct drm_device *dev)
 	intel_uncore_forcewake_reset(dev);
 
 	/* If reset with a user forcewake, try to restore, otherwise turn it off */
-	if (dev_priv->uncore.forcewake_count)
-		dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_ALL);
-	else
-		dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_ALL);
+	if (IS_VALLEYVIEW(dev)) {
+		if (dev_priv->uncore.fw_rendercount)
+			dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_RENDER);
+		else
+			dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_RENDER);
+
+		if (dev_priv->uncore.fw_mediacount)
+			dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_MEDIA);
+		else
+			dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_MEDIA);
+	} else {
+		if (dev_priv->uncore.forcewake_count)
+			dev_priv->uncore.funcs.force_wake_get(dev_priv, FORCEWAKE_ALL);
+		else
+			dev_priv->uncore.funcs.force_wake_put(dev_priv, FORCEWAKE_ALL);
+	}
 
 	/* Restore fifo count */
 	dev_priv->uncore.fifo_count = __raw_i915_read32(dev_priv, GTFIFOCTL) & GT_FIFO_FREE_ENTRIES_MASK;