drm/i915/chv: Combine GEN8_ROW_CHICKEN w/a

WaDisablePartialInstShootdown:chv and
WaDisableThreadStallDopClockGating:chv are related to the same
register so combine them.

Signed-off-by: Arun Siluvery <[email protected]>
Reviewed-by: Ville Syrjälä <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 70fcf2aa0ca25cf8e8e67adfeaaa44c3b97b140f..1df79a952291ad8f5eb8ea27b9a9ea3927f25c23 100644 (file)
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -788,12 +788,10 @@ static int chv_init_workarounds(struct intel_engine_cs *ring)
        struct drm_i915_private *dev_priv = dev->dev_private;
 
        /* WaDisablePartialInstShootdown:chv */
-       WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN,
-                 PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE);
-
        /* WaDisableThreadStallDopClockGating:chv */
        WA_SET_BIT_MASKED(GEN8_ROW_CHICKEN,
-                 STALL_DOP_GATING_DISABLE);
+                         PARTIAL_INSTRUCTION_SHOOTDOWN_DISABLE |
+                         STALL_DOP_GATING_DISABLE);
 
        return 0;
 }