All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Set guardband clipping workaround bit in the right register.
@ 2012-10-06  0:46 Kenneth Graunke
  2012-10-06  6:26 ` Paul Menzel
  0 siblings, 1 reply; 5+ messages in thread
From: Kenneth Graunke @ 2012-10-06  0:46 UTC (permalink / raw)
  To: intel-gfx; +Cc: Daniel Vetter, Oliver McFadden

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.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
---
 drivers/gpu/drm/i915/i915_reg.h | 2 +-
 drivers/gpu/drm/i915/intel_pm.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index a828e90..438bb7a 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -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)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 82ca172..7ac8a48 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -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
-- 
1.7.11.4

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: Set guardband clipping workaround bit in the right register.
  2012-10-06  0:46 [PATCH] drm/i915: Set guardband clipping workaround bit in the right register Kenneth Graunke
@ 2012-10-06  6:26 ` Paul Menzel
  2012-10-07 15:51   ` Kenneth Graunke
  0 siblings, 1 reply; 5+ messages in thread
From: Paul Menzel @ 2012-10-06  6:26 UTC (permalink / raw)
  To: Kenneth Graunke; +Cc: Daniel Vetter, intel-gfx, Oliver McFadden


[-- Attachment #1.1: Type: text/plain, Size: 1110 bytes --]

Dear Kenneth,


thanks for the patch.


Am Freitag, den 05.10.2012, 17:46 -0700 schrieb Kenneth Graunke:
> 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. ;-)

> 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 <daniel.vetter@ffwll.ch>
> Cc: Oliver McFadden <oliver.mcfadden@linux.intel.com>
> Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
> ---
>  drivers/gpu/drm/i915/i915_reg.h | 2 +-
>  drivers/gpu/drm/i915/intel_pm.c | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)

[…]

Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>


Thanks,

Paul

[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH] drm/i915: Set guardband clipping workaround bit in the right register.
  2012-10-06  6:26 ` Paul Menzel
@ 2012-10-07 15:51   ` Kenneth Graunke
  2012-10-09  7:43     ` Mika Kuoppala
  0 siblings, 1 reply; 5+ messages in thread
From: Kenneth Graunke @ 2012-10-07 15:51 UTC (permalink / raw)
  To: intel-gfx; +Cc: Daniel Vetter, Oliver McFadden

A previous patch, namely:

commit bf97b276ca04cee9ab65ffd378fa8e6aedd71ff6
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
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.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
---
 drivers/gpu/drm/i915/i915_reg.h | 2 +-
 drivers/gpu/drm/i915/intel_pm.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index a828e90..438bb7a 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -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)
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 82ca172..7ac8a48 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -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
-- 
1.7.12.2

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: Set guardband clipping workaround bit in the right register.
  2012-10-07 15:51   ` Kenneth Graunke
@ 2012-10-09  7:43     ` Mika Kuoppala
  2012-10-09  9:30       ` Daniel Vetter
  0 siblings, 1 reply; 5+ messages in thread
From: Mika Kuoppala @ 2012-10-09  7:43 UTC (permalink / raw)
  To: Kenneth Graunke, intel-gfx; +Cc: Daniel Vetter, Oliver McFadden

On Sun,  7 Oct 2012 08:51:07 -0700, Kenneth Graunke <kenneth@whitecape.org> wrote:
> A previous patch, namely:
> 
> commit bf97b276ca04cee9ab65ffd378fa8e6aedd71ff6
> Author: Daniel Vetter <daniel.vetter@ffwll.ch>
> 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.
> 
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Oliver McFadden <oliver.mcfadden@linux.intel.com>
> Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
> Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>

Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: Set guardband clipping workaround bit in the right register.
  2012-10-09  7:43     ` Mika Kuoppala
@ 2012-10-09  9:30       ` Daniel Vetter
  0 siblings, 0 replies; 5+ messages in thread
From: Daniel Vetter @ 2012-10-09  9:30 UTC (permalink / raw)
  To: Mika Kuoppala; +Cc: Daniel Vetter, intel-gfx, Oliver McFadden

On Tue, Oct 09, 2012 at 10:43:10AM +0300, Mika Kuoppala wrote:
> On Sun,  7 Oct 2012 08:51:07 -0700, Kenneth Graunke <kenneth@whitecape.org> wrote:
> > A previous patch, namely:
> > 
> > commit bf97b276ca04cee9ab65ffd378fa8e6aedd71ff6
> > Author: Daniel Vetter <daniel.vetter@ffwll.ch>
> > 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.
> > 
> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> > Cc: Oliver McFadden <oliver.mcfadden@linux.intel.com>
> > Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
> > Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
> 
> Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>

Applied to -fixes, thanks for the patch&review.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-10-09  9:29 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-06  0:46 [PATCH] drm/i915: Set guardband clipping workaround bit in the right register Kenneth Graunke
2012-10-06  6:26 ` Paul Menzel
2012-10-07 15:51   ` Kenneth Graunke
2012-10-09  7:43     ` Mika Kuoppala
2012-10-09  9:30       ` Daniel Vetter

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.