drm/i915: A few BDW workarounds
Subsystems (2)
cover drm/i915: A few BDW workarounds
From: Ville Syrjälä <[email protected]>
I was trawling the w/a database today and came across a few things we seem to be missing on BDW.
Ville Syrjälä (3):
drm/i915: Disable semaphore wait event idle message on BDW drm/i915: Implement WaDisableSDEUnitClockGating:bdw drm/i915: We implement WaDisableAsyncFlipPerfMode:bdw
drivers/gpu/drm/i915/i915_reg.h | 6 ++++++ drivers/gpu/drm/i915/intel_pm.c | 7 +++++++ drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-)
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/3 drm/i915: Disable semaphore wait event idle message on BDW
From: Ville Syrjälä <[email protected]>
According to BSpec we need to always set this magic bit in ring buffer mode.
--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_pm.c | 3 +++ 2 files changed, 6 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -944,6 +944,9 @@#define GEN6_BLITTER_LOCK_SHIFT 16#define GEN6_BLITTER_FBC_NOTIFY (1<<3) +#define GEN6_RC_SLEEP_PSMI_CONTROL 0x2050 +#define GEN8_RC_SEMA_IDLE_MSG_DISABLE (1 << 12) +#define GEN6_BSD_SLEEP_PSMI_CONTROL 0x12050#define GEN6_BSD_SLEEP_MSG_DISABLE (1 << 0)#define GEN6_BSD_SLEEP_FLUSH_DISABLE (1 << 2)
drivers/gpu/drm/i915/intel_pm.c +3 -0
@@ -4841,6 +4841,9 @@ static void gen8_init_clock_gating(struct drm_device *dev)I915_WRITE (GEN7_FF_THREAD_MODE ,I915_READ (GEN7_FF_THREAD_MODE ) & ~(GEN8_FF_DS_REF_CNT_FFME |GEN7_FF_VS_REF_CNT_FFME )); + +I915_WRITE (GEN6_RC_SLEEP_PSMI_CONTROL , +_MASKED_BIT_ENABLE (GEN8_RC_SEMA_IDLE_MSG_DISABLE )); }static void haswell_init_clock_gating (struct drm_device *dev)
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/3] drm/i915: Disable semaphore wait event idle message on BDW
Quoted 6 lines · [email protected] writes:
From: Ville Syrjälä <[email protected]>
According to BSpec we need to always set this magic bit in ring buffer mode.
Signed-off-by Ville Syrjälä <[email protected]>
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/3 drm/i915: Implement WaDisableSDEUnitClockGating:bdw
In reply to [email protected]From: Ville Syrjälä <[email protected]>
--- drivers/gpu/drm/i915/i915_reg.h | 3 +++ drivers/gpu/drm/i915/intel_pm.c | 4 ++++ 2 files changed, 7 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -4901,6 +4901,9 @@#define GEN7_UCGCTL4 0x940c#define GEN7_L3BANK2X_CLOCK_GATE_DISABLE (1<<25) +#define GEN8_UCGCTL6 0x9430 +#define GEN8_SDEUNIT_CLOCK_GATE_DISABLE (1<<14) +#define GEN6_RPNSWREQ 0xA008#define GEN6_TURBO_DISABLE (1<<31)#define GEN6_FREQUENCY (x) ((x)<<25)
drivers/gpu/drm/i915/intel_pm.c +4 -0
@@ -4844,6 +4844,10 @@ static void gen8_init_clock_gating(struct drm_device *dev)I915_WRITE (GEN6_RC_SLEEP_PSMI_CONTROL ,_MASKED_BIT_ENABLE (GEN8_RC_SEMA_IDLE_MSG_DISABLE )); + +/* WaDisableSDEUnitClockGating:bdw */ +I915_WRITE (GEN8_UCGCTL6 ,I915_READ (GEN8_UCGCTL6 ) | +GEN8_SDEUNIT_CLOCK_GATE_DISABLE ); }static void haswell_init_clock_gating (struct drm_device *dev)
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/3 drm/i915: We implement WaDisableAsyncFlipPerfMode:bdw
In reply to [email protected]From: Ville Syrjälä <[email protected]>
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +1 -1
@@ -571,7 +571,7 @@ static int init_render_ring(struct intel_ring_buffer *ring)* to use MI_WAIT_FOR_EVENT within the CS. It should already be * programmed to '1' on all products. * -* WaDisableAsyncFlipPerfMode:snb,ivb,hsw,vlv +* WaDisableAsyncFlipPerfMode:snb,ivb,hsw,vlv,bdw */ if (INTEL_INFO (dev)->gen >=6 )I915_WRITE (MI_MODE ,_MASKED_BIT_ENABLE (ASYNC_FLIP_PERF_DISABLE ));
Signature · 6 lines
1.8.3.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/3] drm/i915: We implement WaDisableAsyncFlipPerfMode:bdw
Quoted 12 lines · On Thu, Feb 27, 2014 at 09:59:03PM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0
drivers/gpu/drm/i915/intel_ringbuffer.c static int init_render_ring(struct intel_ring_buffer *ring) · line 577
Quoted 8 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +1
-1@@ -571,7 +571,7 @@ static int init_render_ring(struct intel_ring_buffer *ring)* to use MI_WAIT_FOR_EVENT within the CS. It should already be * programmed to '1' on all products. * -* WaDisableAsyncFlipPerfMode:snb,ivb,hsw,vlv +* WaDisableAsyncFlipPerfMode:snb,ivb,hsw,vlv,bdw */ if (INTEL_INFO (dev)->gen >=6 )I915_WRITE (MI_MODE ,_MASKED_BIT_ENABLE (ASYNC_FLIP_PERF_DISABLE ));
Patch 2, and 3 are:
Signature · 5 lines
Ben Widawsky, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/3] drm/i915: We implement WaDisableAsyncFlipPerfMode:bdw
Quoted 23 lines · Ben Widawsky
Quoted 12 lines · On Thu, Feb 27, 2014 at 09:59:03PM +0200, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
Signed-off-by Ville Syrjälä <[email protected]>--- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0drivers/gpu/drm/i915/intel_ringbuffer.c static int init_render_ring(struct intel_ring_buffer *ring) · line 577
Quoted 8 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +1
-1@@ -571,7 +571,7 @@ static int init_render_ring(struct intel_ring_buffer *ring)* to use MI_WAIT_FOR_EVENT within the CS. It should already be * programmed to '1' on all products. * -* WaDisableAsyncFlipPerfMode:snb,ivb,hsw,vlv +* WaDisableAsyncFlipPerfMode:snb,ivb,hsw,vlv,bdw */ if (INTEL_INFO (dev)->gen >=6 )I915_WRITE (MI_MODE ,_MASKED_BIT_ENABLE (ASYNC_FLIP_PERF_DISABLE ));Patch 2, and 3 are:
Quoted 1 line
Reviewed-by Ben Widawsky <[email protected]>
All three merged, thanks for patches&review.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch