drm/i915: VLV wants WaVSThreadDispatchOverride too

Call gen7_setup_fixed_func_scheduler() on VLV as well.

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

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 5b1ca3a38e49244197a0ce50bcab4b058674e6d0..6c435e48f5541e0430bebe63c37031808236e4d5 100644 (file)
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4658,7 +4658,7 @@ static void gen7_setup_fixed_func_scheduler(struct drm_i915_private *dev_priv)
        uint32_t reg = I915_READ(GEN7_FF_THREAD_MODE);
 
        /*
-        * WaVSThreadDispatchOverride:ivb
+        * WaVSThreadDispatchOverride:ivb,vlv
         *
         * This actually overrides the dispatch
         * mode for all thread types.
@@ -4931,6 +4931,8 @@ static void valleyview_init_clock_gating(struct drm_device *dev)
                   I915_READ(GEN7_SQ_CHICKEN_MBCUNIT_CONFIG) |
                   GEN7_SQ_CHICKEN_MBCUNIT_SQINTMOB);
 
+       gen7_setup_fixed_func_scheduler(dev_priv);
+
        /*
         * According to the spec, bit 13 (RCZUNIT) must be set on IVB.
         * This implements the WaDisableRCZUnitClockGating:vlv workaround.