drm/i915: Turn on a required 3D clock gating bit on Sandybridge.
Subsystems (2)
PATCH 1/2 drm/i915: Turn on a required 3D clock gating bit on Sandybridge.
Fixes rendering failures in Unigine Tropics and Sanctuary and the mesa "fire" demo.
Signed-off-by Eric Anholt <[email protected]>
--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_display.c | 9 +++++++++ 2 files changed, 12 insertions(+), 0 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -3397,6 +3397,9 @@#define GT_FIFO_FREE_ENTRIES 0x120008#define GT_FIFO_NUM_RESERVED_ENTRIES 20 +#define GEN6_UCGCTL2 0x9404 +# define GEN6_RCPBUNIT_CLOCK_GATE_DISABLE (1 << 12) +#define GEN6_RPNSWREQ 0xA008#define GEN6_TURBO_DISABLE (1<<31)#define GEN6_FREQUENCY (x) ((x)<<25)
drivers/gpu/drm/i915/intel_display.c +9 -0
@@ -7850,6 +7850,15 @@ static void gen6_init_clock_gating(struct drm_device *dev)I915_WRITE (WM2_LP_ILK ,0 );I915_WRITE (WM1_LP_ILK ,0 ); +/* According to the BSpec vol1g, bit 12 (RCPBUNIT) clock +* gating disable must be set. Failure to set it results in +* flickering pixels due to Z write ordering failures after +* some amount of runtime in the Mesa "fire" demo, and Unigine +* Sanctuary and Tropics, and apparently anything else with +* alpha test or pixel discard. +*/ +I915_WRITE (GEN6_UCGCTL2 ,GEN6_RCPBUNIT_CLOCK_GATE_DISABLE ); +/* * According to the spec the following bits should be * set in order to enable memory self-refresh and fbc:
Signature · 1 line
1.7.7
PATCH 2/2 drm/i915: Turn on another required clock gating bit on gen6.
Unlike the previous one, I don't have known testcases it fixes. I'd rather not go through the same debug cycle on whatever testcases those might be.
Signed-off-by Eric Anholt <[email protected]>
--- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_display.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -3399,6 +3399,7 @@#define GEN6_UCGCTL2 0x9404# define GEN6_RCPBUNIT_CLOCK_GATE_DISABLE (1 << 12) +# define GEN6_RCCUNIT_CLOCK_GATE_DISABLE (1 << 11)#define GEN6_RPNSWREQ 0xA008#define GEN6_TURBO_DISABLE (1<<31)
drivers/gpu/drm/i915/intel_display.c +6 -1
@@ -7856,8 +7856,13 @@ static void gen6_init_clock_gating(struct drm_device *dev)* some amount of runtime in the Mesa "fire" demo, and Unigine * 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. */ -I915_WRITE (GEN6_UCGCTL2 ,GEN6_RCPBUNIT_CLOCK_GATE_DISABLE ); +I915_WRITE (GEN6_UCGCTL2 , +GEN6_RCPBUNIT_CLOCK_GATE_DISABLE | +GEN6_RCCUNIT_CLOCK_GATE_DISABLE );/* * According to the spec the following bits should be
Signature · 1 line
1.7.7