drm/i915: Fix GT_MODE default value

bwidawsk · gregkh · commit 2a853d7062c3 · 2012-10-13T05:50:29.000+09:00
commit f8f2ac9 upstream. I can't even find how I figured this might be needed anymore. But sure enough, the value I'm reading back on platforms doesn't match what the docs recommends. It seemed to fix Chris' GT1 in limited testing as well. Tested-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
@@ -519,6 +519,9 @@
 # define VS_TIMER_DISPATCH				(1 << 6)
 # define MI_FLUSH_ENABLE				(1 << 12)
 
+#define GEN6_GT_MODE	0x20d0
+#define   GEN6_GT_MODE_HI	(1 << 9)
+
 #define GFX_MODE	0x02520
 #define GFX_MODE_GEN7	0x0229c
 #define RING_MODE_GEN7(ring)	((ring)->mmio_base+0x29c)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
@@ -3387,6 +3387,11 @@ static void gen6_init_clock_gating(struct drm_device *dev)
 			   DISPPLANE_TRICKLE_FEED_DISABLE);
 		intel_flush_display_plane(dev_priv, pipe);
 	}
+
+	/* The default value should be 0x200 according to docs, but the two
+	 * platforms I checked have a 0 for this. (Maybe BIOS overrides?) */
+	I915_WRITE(GEN6_GT_MODE, _MASKED_BIT_DISABLE(0xffff));
+	I915_WRITE(GEN6_GT_MODE, _MASKED_BIT_ENABLE(GEN6_GT_MODE_HI));
 }
 
 static void gen7_setup_fixed_func_scheduler(struct drm_i915_private *dev_priv)

Original file line number	Diff line number	Diff line change
`@@ -3387,6 +3387,11 @@ static void gen6_init_clock_gating(struct drm_device *dev)`
`3387`	`3387`	`DISPPLANE_TRICKLE_FEED_DISABLE);`
`3388`	`3388`	`intel_flush_display_plane(dev_priv, pipe);`
`3389`	`3389`	`}`
	`3390`	`+`
	`3391`	`+ /* The default value should be 0x200 according to docs, but the two`
	`3392`	`+ * platforms I checked have a 0 for this. (Maybe BIOS overrides?) */`
	`3393`	`+ I915_WRITE(GEN6_GT_MODE, _MASKED_BIT_DISABLE(0xffff));`
	`3394`	`+ I915_WRITE(GEN6_GT_MODE, _MASKED_BIT_ENABLE(GEN6_GT_MODE_HI));`
`3390`	`3395`	`}`
`3391`	`3396`
`3392`	`3397`	`static void gen7_setup_fixed_func_scheduler(struct drm_i915_private *dev_priv)`