2 files changed, 29 insertions, 0 deletions

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 0d3b97f01690..5ac9837e49a5 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -692,6 +692,21 @@
 
 #define GEN6_BSD_RNCID                  0x12198
 
+#define GEN7_FF_THREAD_MODE             0x20a0
+#define   GEN7_FF_SCHED_MASK            0x0077070
+#define   GEN7_FF_TS_SCHED_HS1          (0x5<<16)
+#define   GEN7_FF_TS_SCHED_HS0          (0x3<<16)
+#define   GEN7_FF_TS_SCHED_LOAD_BALANCE (0x1<<16)
+#define   GEN7_FF_TS_SCHED_HW           (0x0<<16) /* Default */
+#define   GEN7_FF_VS_SCHED_HS1          (0x5<<12)
+#define   GEN7_FF_VS_SCHED_HS0          (0x3<<12)
+#define   GEN7_FF_VS_SCHED_LOAD_BALANCE (0x1<<12) /* Default */
+#define   GEN7_FF_VS_SCHED_HW           (0x0<<12)
+#define   GEN7_FF_DS_SCHED_HS1          (0x5<<4)
+#define   GEN7_FF_DS_SCHED_HS0          (0x3<<4)
+#define   GEN7_FF_DS_SCHED_LOAD_BALANCE (0x1<<4)  /* Default */
+#define   GEN7_FF_DS_SCHED_HW           (0x0<<4)
+
 /*
  * Framebuffer compression (915+ only)
  */
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 78179e03a901..96fc4679d438 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8937,6 +8937,18 @@ static void gen6_init_clock_gating(struct drm_device *dev)
         }
 }
 
+static void gen7_setup_fixed_func_scheduler(struct drm_i915_private *dev_priv)
+{
+        uint32_t reg = I915_READ(GEN7_FF_THREAD_MODE);
+
+        reg &= ~GEN7_FF_SCHED_MASK;
+        reg |= GEN7_FF_TS_SCHED_HW;
+        reg |= GEN7_FF_VS_SCHED_HW;
+        reg |= GEN7_FF_DS_SCHED_HW;
+
+        I915_WRITE(GEN7_FF_THREAD_MODE, reg);
+}
+
 static void ivybridge_init_clock_gating(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
@@ -8981,6 +8993,8 @@ static void ivybridge_init_clock_gating(struct drm_device *dev)
                            DISPPLANE_TRICKLE_FEED_DISABLE);
                 intel_flush_display_plane(dev_priv, pipe);
         }
+
+        gen7_setup_fixed_func_scheduler(dev_priv);
 }
 
 static void valleyview_init_clock_gating(struct drm_device *dev)