diff options
-rw-r--r-- | drivers/gpu/drm/i915/intel_uncore.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index deb4430541cf..1d7b879cc68c 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c | |||
@@ -1497,7 +1497,6 @@ static int gen6_reset_engines(struct drm_i915_private *dev_priv, | |||
1497 | [VECS] = GEN6_GRDOM_VECS, | 1497 | [VECS] = GEN6_GRDOM_VECS, |
1498 | }; | 1498 | }; |
1499 | u32 hw_mask; | 1499 | u32 hw_mask; |
1500 | int ret; | ||
1501 | 1500 | ||
1502 | if (engine_mask == ALL_ENGINES) { | 1501 | if (engine_mask == ALL_ENGINES) { |
1503 | hw_mask = GEN6_GRDOM_FULL; | 1502 | hw_mask = GEN6_GRDOM_FULL; |
@@ -1509,11 +1508,7 @@ static int gen6_reset_engines(struct drm_i915_private *dev_priv, | |||
1509 | hw_mask |= hw_engine_mask[engine->id]; | 1508 | hw_mask |= hw_engine_mask[engine->id]; |
1510 | } | 1509 | } |
1511 | 1510 | ||
1512 | ret = gen6_hw_domain_reset(dev_priv, hw_mask); | 1511 | return gen6_hw_domain_reset(dev_priv, hw_mask); |
1513 | |||
1514 | intel_uncore_forcewake_reset(dev_priv, true); | ||
1515 | |||
1516 | return ret; | ||
1517 | } | 1512 | } |
1518 | 1513 | ||
1519 | /** | 1514 | /** |