Skip to contentSkip to conversation

drm/i915: Implement VGA request stall workarounds

PATCH In review Rodrigo Vivi 2 participants 3 messages Dec 18, 2012 – Jan 8, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: Implement VGA request stall workarounds

According to BSpec, for ILK and SNB those bits must be programmed to 1 before enabling VGA display and kept enable while VGA display is enabled. It says also it is safe to have it as 1 even when VGA display is disabled.

---
 drivers/gpu/drm/i915/i915_reg.h | 2 ++
 drivers/gpu/drm/i915/intel_pm.c | 8 ++++++++
 2 files changed, 10 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +2 -0
index f2a5ea6..8314124 100644
@@ -816,6 +816,8 @@
 #define   ILK_FBC_RT_VALID	(1<<0)
 
 #define ILK_DISPLAY_CHICKEN1	0x42000
+#define   ILK_VRD_REQ_STALL_DIS	(1<<31)
+#define   ILK_VRD_REQ_STALL_TH	(1<<29)
 #define   ILK_FBCQ_DIS		(1<<22)
 #define	  ILK_PABSTRETCH_DIS	(1<<21)
 
drivers/gpu/drm/i915/intel_pm.c +8 -0
index abfff29..dfb1be7 100644
@@ -3381,6 +3381,10 @@ static void ironlake_init_clock_gating(struct drm_device *dev)
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	uint32_t dspclk_gate = ILK_VRHUNIT_CLOCK_GATE_DISABLE;
 
+	I915_WRITE(ILK_DISPLAY_CHICKEN1,
+		   I915_READ(ILK_DISPLAY_CHICKEN1) |
+		   ILK_VRD_REQ_STALL_DIS | ILK_VRD_REQ_STALL_TH);
+
 	/* Required for FBC */
 	dspclk_gate |= ILK_DPFCRUNIT_CLOCK_GATE_DISABLE |
 		   ILK_DPFCUNIT_CLOCK_GATE_DISABLE |
@@ -3470,6 +3474,10 @@ static void gen6_init_clock_gating(struct drm_device *dev)
 
 	I915_WRITE(ILK_DSPCLK_GATE_D, dspclk_gate);
 
+	I915_WRITE(ILK_DISPLAY_CHICKEN1,
+		   I915_READ(ILK_DISPLAY_CHICKEN1) |
+		   ILK_VRD_REQ_STALL_DIS | ILK_VRD_REQ_STALL_TH);
+
 	I915_WRITE(ILK_DISPLAY_CHICKEN2,
 		   I915_READ(ILK_DISPLAY_CHICKEN2) |
 		   ILK_ELPIN_409_SELECT);
Signature · 1 line
1.7.11.7
#1 lore raw
Quoted 3 lines · Rodrigo Vivi

According to BSpec, for ILK and SNB those bits must be programmed to 1 before enabling VGA display and kept enable while VGA display is enabled. It says also it is safe to have it as 1 even when VGA display is disabled.

Is this about the VGA legacy plane? Although probably doesn't matter too much in any case.
-Daniel

Quoted 51 lines
---
 drivers/gpu/drm/i915/i915_reg.h | 2 ++
 drivers/gpu/drm/i915/intel_pm.c | 8 ++++++++
 2 files changed, 10 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +2 -0
index f2a5ea6..8314124 100644
@@ -816,6 +816,8 @@
 #define   ILK_FBC_RT_VALID	(1<<0)
 
 #define ILK_DISPLAY_CHICKEN1	0x42000
+#define   ILK_VRD_REQ_STALL_DIS	(1<<31)
+#define   ILK_VRD_REQ_STALL_TH	(1<<29)
 #define   ILK_FBCQ_DIS		(1<<22)
 #define	  ILK_PABSTRETCH_DIS	(1<<21)
 
drivers/gpu/drm/i915/intel_pm.c +8 -0
index abfff29..dfb1be7 100644
@@ -3381,6 +3381,10 @@ static void ironlake_init_clock_gating(struct drm_device *dev)
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	uint32_t dspclk_gate = ILK_VRHUNIT_CLOCK_GATE_DISABLE;
 
+	I915_WRITE(ILK_DISPLAY_CHICKEN1,
+		   I915_READ(ILK_DISPLAY_CHICKEN1) |
+		   ILK_VRD_REQ_STALL_DIS | ILK_VRD_REQ_STALL_TH);
+
 	/* Required for FBC */
 	dspclk_gate |= ILK_DPFCRUNIT_CLOCK_GATE_DISABLE |
 		   ILK_DPFCUNIT_CLOCK_GATE_DISABLE |
@@ -3470,6 +3474,10 @@ static void gen6_init_clock_gating(struct drm_device *dev)
 
 	I915_WRITE(ILK_DSPCLK_GATE_D, dspclk_gate);
 
+	I915_WRITE(ILK_DISPLAY_CHICKEN1,
+		   I915_READ(ILK_DISPLAY_CHICKEN1) |
+		   ILK_VRD_REQ_STALL_DIS | ILK_VRD_REQ_STALL_TH);
+
 	I915_WRITE(ILK_DISPLAY_CHICKEN2,
 		   I915_READ(ILK_DISPLAY_CHICKEN2) |
 		   ILK_ELPIN_409_SELECT);
Signature · 6 lines
1.7.11.7

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
#2 lore raw

no idea..
you are probably right... I didn't fixed what I expected anyway! :(

Quoted 64 lines · Daniel Vetter
Quoted 3 lines · Rodrigo Vivi

According to BSpec, for ILK and SNB those bits must be programmed to 1 before enabling VGA display and kept enable while VGA display is enabled. It says also it is safe to have it as 1 even when VGA display is disabled.

Is this about the VGA legacy plane? Although probably doesn't matter too much in any case.
-Daniel

Quoted 47 lines
---
 drivers/gpu/drm/i915/i915_reg.h | 2 ++
 drivers/gpu/drm/i915/intel_pm.c | 8 ++++++++
 2 files changed, 10 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +2 -0
index f2a5ea6..8314124 100644
@@ -816,6 +816,8 @@
 #define   ILK_FBC_RT_VALID   (1<<0)
 
 #define ILK_DISPLAY_CHICKEN1 0x42000
+#define   ILK_VRD_REQ_STALL_DIS      (1<<31)
+#define   ILK_VRD_REQ_STALL_TH       (1<<29)
 #define   ILK_FBCQ_DIS               (1<<22)
 #define        ILK_PABSTRETCH_DIS    (1<<21)
 
drivers/gpu/drm/i915/intel_pm.c +8 -1
index abfff29..dfb1be7 100644
@@ -3381,6 +3381,10 @@ static void ironlake_init_clock_gating(struct drm_device *dev)
      struct drm_i915_private *dev_priv = dev->dev_private;
      uint32_t dspclk_gate = ILK_VRHUNIT_CLOCK_GATE_DISABLE;
 
+     I915_WRITE(ILK_DISPLAY_CHICKEN1,
+                I915_READ(ILK_DISPLAY_CHICKEN1) |
+                ILK_VRD_REQ_STALL_DIS | ILK_VRD_REQ_STALL_TH);
+
      /* Required for FBC */
      dspclk_gate |= ILK_DPFCRUNIT_CLOCK_GATE_DISABLE |
                 ILK_DPFCUNIT_CLOCK_GATE_DISABLE |
@@ -3470,6 +3474,10 @@ static void gen6_init_clock_gating(struct drm_device *dev)
 
      I915_WRITE(ILK_DSPCLK_GATE_D, dspclk_gate);
 
+     I915_WRITE(ILK_DISPLAY_CHICKEN1,
+                I915_READ(ILK_DISPLAY_CHICKEN1) |
+                ILK_VRD_REQ_STALL_DIS | ILK_VRD_REQ_STALL_TH);
+
      I915_WRITE(ILK_DISPLAY_CHICKEN2,
                 I915_READ(ILK_DISPLAY_CHICKEN2) |
                 ILK_ELPIN_409_SELECT);
--

1.7.11.7

Quoted 4 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

Signature · 2 lines
Rodrigo Vivi
Blog: http://blog.vivi.eng.br