|
@@ -6644,23 +6644,16 @@ static void gen8_enable_rps(struct drm_i915_private *dev_priv)
|
|
for_each_engine(engine, dev_priv, id)
|
|
for_each_engine(engine, dev_priv, id)
|
|
I915_WRITE(RING_MAX_IDLE(engine->mmio_base), 10);
|
|
I915_WRITE(RING_MAX_IDLE(engine->mmio_base), 10);
|
|
I915_WRITE(GEN6_RC_SLEEP, 0);
|
|
I915_WRITE(GEN6_RC_SLEEP, 0);
|
|
- if (IS_BROADWELL(dev_priv))
|
|
|
|
- I915_WRITE(GEN6_RC6_THRESHOLD, 625); /* 800us/1.28 for TO */
|
|
|
|
- else
|
|
|
|
- I915_WRITE(GEN6_RC6_THRESHOLD, 50000); /* 50/125ms per EI */
|
|
|
|
|
|
+ I915_WRITE(GEN6_RC6_THRESHOLD, 625); /* 800us/1.28 for TO */
|
|
|
|
|
|
/* 3: Enable RC6 */
|
|
/* 3: Enable RC6 */
|
|
if (intel_enable_rc6() & INTEL_RC6_ENABLE)
|
|
if (intel_enable_rc6() & INTEL_RC6_ENABLE)
|
|
rc6_mask = GEN6_RC_CTL_RC6_ENABLE;
|
|
rc6_mask = GEN6_RC_CTL_RC6_ENABLE;
|
|
intel_print_rc6_info(dev_priv, rc6_mask);
|
|
intel_print_rc6_info(dev_priv, rc6_mask);
|
|
- if (IS_BROADWELL(dev_priv))
|
|
|
|
- I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
|
|
|
|
- GEN7_RC_CTL_TO_MODE |
|
|
|
|
- rc6_mask);
|
|
|
|
- else
|
|
|
|
- I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
|
|
|
|
- GEN6_RC_CTL_EI_MODE(1) |
|
|
|
|
- rc6_mask);
|
|
|
|
|
|
+
|
|
|
|
+ I915_WRITE(GEN6_RC_CONTROL, GEN6_RC_CTL_HW_ENABLE |
|
|
|
|
+ GEN7_RC_CTL_TO_MODE |
|
|
|
|
+ rc6_mask);
|
|
|
|
|
|
/* 4 Program defaults and thresholds for RPS*/
|
|
/* 4 Program defaults and thresholds for RPS*/
|
|
I915_WRITE(GEN6_RPNSWREQ,
|
|
I915_WRITE(GEN6_RPNSWREQ,
|