drm/i915: Set guardband clipping workaround bit in the right register.
Subsystems (2)
PATCH 1/1 drm/i915: Set guardband clipping workaround bit in the right register.
Commit bf97b276ca04 accidentally set bit 5 in 3D_CHICKEN, which has nothing to do with clipping. This patch changes it to be set in 3D_CHICKEN3, where it belongs.
The game "Dante" demonstrates random clipping issues when guardband clipping is enabled and bit 5 of 3D_CHICKEN3 isn't set. So the workaround actually is necessary.
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_pm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -521,7 +521,7 @@*/ # define _3D_CHICKEN2_WM_READ_PIPELINED (1 << 14)#define _3D_CHICKEN3 0x02090 -#define _3D_CHICKEN_SF_DISABLE_FASTCLIP_CULL (1 << 5) +#define _3D_CHICKEN3_SF_DISABLE_FASTCLIP_CULL (1 << 5)#define MI_MODE 0x0209c# define VS_TIMER_DISPATCH (1 << 6)
drivers/gpu/drm/i915/intel_pm.c +2 -2
@@ -3410,8 +3410,8 @@ static void gen6_init_clock_gating(struct drm_device *dev) GEN6_RCCUNIT_CLOCK_GATE_DISABLE);/* Bspec says we need to always set all mask bits. */ -I915_WRITE (_3D_CHICKEN, (0xFFFF <<16 ) | - _3D_CHICKEN_SF_DISABLE_FASTCLIP_CULL); +I915_WRITE (_3D_CHICKEN3, (0xFFFF <<16 ) | + _3D_CHICKEN3_SF_DISABLE_FASTCLIP_CULL);/* * According to the spec the following bits should be
Signature · 1 line
1.7.11.4
Dear Kenneth,
thanks for the patch.
Am Freitag, den 05.10.2012, 17:46 -0700 schrieb Kenneth Graunke:
Quoted 1 line
Commit
bf97b276ca04
Could you please paste the date, author and commit summary of this commit too? At least I cannot memorize hashes that well and having the summary pasted would give me enough information most of the time about the other commit. ;-)
Quoted 15 lines
accidentally set bit 5 in 3D_CHICKEN, which has nothing to do with clipping. This patch changes it to be set in 3D_CHICKEN3, where it belongs.
The game "Dante" demonstrates random clipping issues when guardband clipping is enabled and bit 5 of 3D_CHICKEN3 isn't set. So the workaround actually is necessary.
Cc Daniel Vetter <[email protected]>Cc Oliver McFadden <[email protected]>Signed-off-by Kenneth Graunke <[email protected]>--- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_pm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
[…]
Thanks,
Paul
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915: Set guardband clipping workaround bit in the right register.
A previous patch, namely:
commit bf97b276ca04cee9ab65ffd378fa8e6aedd71ff6
Author: Daniel Vetter <[email protected]> Date: Wed Apr 11 20:42:41 2012 +0200
drm/i915: implement w/a for incorrect guarband clipping
accidentally set bit 5 in 3D_CHICKEN, which has nothing to do with clipping. This patch changes it to be set in 3D_CHICKEN3, where it belongs.
The game "Dante" demonstrates random clipping issues when guardband clipping is enabled and bit 5 of 3D_CHICKEN3 isn't set. So the workaround is actually necessary.
--- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_pm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -521,7 +521,7 @@*/ # define _3D_CHICKEN2_WM_READ_PIPELINED (1 << 14)#define _3D_CHICKEN3 0x02090 -#define _3D_CHICKEN_SF_DISABLE_FASTCLIP_CULL (1 << 5) +#define _3D_CHICKEN3_SF_DISABLE_FASTCLIP_CULL (1 << 5)#define MI_MODE 0x0209c# define VS_TIMER_DISPATCH (1 << 6)
drivers/gpu/drm/i915/intel_pm.c +2 -2
@@ -3410,8 +3410,8 @@ static void gen6_init_clock_gating(struct drm_device *dev) GEN6_RCCUNIT_CLOCK_GATE_DISABLE);/* Bspec says we need to always set all mask bits. */ -I915_WRITE (_3D_CHICKEN, (0xFFFF <<16 ) | - _3D_CHICKEN_SF_DISABLE_FASTCLIP_CULL); +I915_WRITE (_3D_CHICKEN3, (0xFFFF <<16 ) | + _3D_CHICKEN3_SF_DISABLE_FASTCLIP_CULL);/* * According to the spec the following bits should be
Signature · 1 line
1.7.12.2
Quoted 12 lines · Kenneth Graunke
A previous patch, namely:
commit
bf97b276ca04cee9ab65ffd378fa8e6aedd71ff6Author: Daniel Vetter <[email protected]> Date: Wed Apr 11 20:42:41 2012 +0200drm/i915: implement w/a for incorrect guarband clipping
accidentally set bit 5 in 3D_CHICKEN, which has nothing to do with clipping. This patch changes it to be set in 3D_CHICKEN3, where it belongs.
Quoted 8 lines
The game "Dante" demonstrates random clipping issues when guardband clipping is enabled and bit 5 of 3D_CHICKEN3 isn't set. So the workaround is actually necessary.
Cc Daniel Vetter <[email protected]>Cc Oliver McFadden <[email protected]>Acked-by Paul Menzel <[email protected]>Signed-off-by Kenneth Graunke <[email protected]>
Daniel Vetter
AppliedQuoted 17 lines · Mika Kuoppala
Quoted 16 lines · Kenneth Graunke
A previous patch, namely:
commit
bf97b276ca04cee9ab65ffd378fa8e6aedd71ff6Author: Daniel Vetter <[email protected]> Date: Wed Apr 11 20:42:41 2012 +0200drm/i915: implement w/a for incorrect guarband clipping
accidentally set bit 5 in 3D_CHICKEN, which has nothing to do with clipping. This patch changes it to be set in 3D_CHICKEN3, where it belongs.
The game "Dante" demonstrates random clipping issues when guardband clipping is enabled and bit 5 of 3D_CHICKEN3 isn't set. So the workaround is actually necessary.
Quoted 6 lines
Quoted 4 lines
Cc Daniel Vetter <[email protected]>Cc Oliver McFadden <[email protected]>Acked-by Paul Menzel <[email protected]>Signed-off-by Kenneth Graunke <[email protected]>Reviewed-by Mika Kuoppala <[email protected]>
Applied to -fixes, thanks for the patch&review.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch