drm/i915: WaDisableRCCUnitClockGating isn't applicable to IVB
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 22 Jan 2014 19:32:48 +0000 (21:32 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 28 Jan 2014 13:19:41 +0000 (14:19 +0100)
WaDisableRCCUnitClockGating is only relevant for SNB.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_pm.c

index 7e85b3e8702dd4179c88a06e7c8d906f9bb9c71f..f7efe69a914ea01549804c56fa1e8f1fe2146041 100644 (file)
@@ -4861,15 +4861,11 @@ static void ivybridge_init_clock_gating(struct drm_device *dev)
         * Sanctuary and Tropics, and apparently anything else with
         * alpha test or pixel discard.
         *
-        * According to the spec, bit 11 (RCCUNIT) must also be set,
-        * but we didn't debug actual testcases to find it out.
-        *
         * According to the spec, bit 13 (RCZUNIT) must be set on IVB.
         * This implements the WaDisableRCZUnitClockGating:ivb workaround.
         */
        I915_WRITE(GEN6_UCGCTL2,
-                  GEN6_RCZUNIT_CLOCK_GATE_DISABLE |
-                  GEN6_RCCUNIT_CLOCK_GATE_DISABLE);
+                  GEN6_RCZUNIT_CLOCK_GATE_DISABLE);
 
        /* This is required by WaCatErrorRejectionIssue:ivb */
        I915_WRITE(GEN7_SQ_CHICKEN_MBCUNIT_CONFIG,