* [PATCH] agp/intel: Fix typo in G4x_GMCH_SIZE_VT_2M
@ 2011-07-12 22:38 Chris Wilson
0 siblings, 0 replies; 6+ messages in thread
From: Chris Wilson @ 2011-07-12 22:38 UTC (permalink / raw)
To: Dave Airlie
Cc: dri-devel, linux-kernel, Chris Wilson, Konstantin Belousov,
Daniel Vetter
Konstantin Belousov found an error in the define of G4x_GMCH_SIZE_VT_2M
relative to the GMCH specs, and confirmed that indeed one of his users
with a Q45 reports 0xb not 0xc for a 2/2MiB GATT.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Konstantin Belousov <kostikbel@gmail.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/char/agp/intel-agp.h | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/char/agp/intel-agp.h b/drivers/char/agp/intel-agp.h
index 999803c..5da67f1 100644
--- a/drivers/char/agp/intel-agp.h
+++ b/drivers/char/agp/intel-agp.h
@@ -90,9 +90,10 @@
#define G4x_GMCH_SIZE_MASK (0xf << 8)
#define G4x_GMCH_SIZE_1M (0x1 << 8)
#define G4x_GMCH_SIZE_2M (0x3 << 8)
-#define G4x_GMCH_SIZE_VT_1M (0x9 << 8)
-#define G4x_GMCH_SIZE_VT_1_5M (0xa << 8)
-#define G4x_GMCH_SIZE_VT_2M (0xc << 8)
+#define G4x_GMCH_SIZE_VT_EN (0x8 << 8)
+#define G4x_GMCH_SIZE_VT_1M (G4x_GMCH_SIZE_1M | G4x_GMCH_SIZE_VT_EN)
+#define G4x_GMCH_SIZE_VT_1_5M ((0x2 << 8) | G4x_GMCH_SIZE_VT_EN)
+#define G4x_GMCH_SIZE_VT_2M (G4x_GMCH_SIZE_2M | G4x_GMCH_SIZE_VT_EN)
#define GFX_FLSH_CNTL 0x2170 /* 915+ */
--
1.7.5.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] agp/intel: Fix typo in G4x_GMCH_SIZE_VT_2M
2011-07-12 18:27 Chris Wilson
@ 2011-07-12 20:56 ` Daniel Vetter
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Vetter @ 2011-07-12 20:56 UTC (permalink / raw)
To: Chris Wilson; +Cc: Daniel Vetter, intel-gfx
Bleh, I need to fix my in-brain hex calculator ;-)
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
--
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] agp/intel: Fix typo in G4x_GMCH_SIZE_VT_2M
2011-07-08 10:56 ` Konstantin Belousov
@ 2011-07-12 18:28 ` Chris Wilson
0 siblings, 0 replies; 6+ messages in thread
From: Chris Wilson @ 2011-07-12 18:28 UTC (permalink / raw)
To: Konstantin Belousov; +Cc: Daniel Vetter, intel-gfx
On Fri, 8 Jul 2011 13:56:36 +0300, Konstantin Belousov <kostikbel@gmail.com> wrote:
Non-text part: multipart/signed
> On Fri, Jul 08, 2011 at 11:48:50AM +0100, Chris Wilson wrote:
> > +#define G4x_GMCH_SIZE_VT_1_5M (0x2 | G4x_GMCH_SIZE_VT_EN) /* no nonVT equiv */
> I think this should be (0x2 << 8), and not 0x2.
Absolutely right.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] agp/intel: Fix typo in G4x_GMCH_SIZE_VT_2M
@ 2011-07-12 18:27 Chris Wilson
2011-07-12 20:56 ` Daniel Vetter
0 siblings, 1 reply; 6+ messages in thread
From: Chris Wilson @ 2011-07-12 18:27 UTC (permalink / raw)
To: intel-gfx; +Cc: Daniel Vetter
Konstantin Belousov found an error in the define of G4x_GMCH_SIZE_VT_2M
relative to the GMCH specs, and confirmed that indeed one of his users
with a Q45 reports 0xb not 0xc for a 2/2MiB GATT.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Konstantin Belousov <kostikbel@gmail.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
--
v2: Fixed typo spotted by Konstantin.
---
drivers/char/agp/intel-agp.h | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/char/agp/intel-agp.h b/drivers/char/agp/intel-agp.h
index 999803c..5da67f1 100644
--- a/drivers/char/agp/intel-agp.h
+++ b/drivers/char/agp/intel-agp.h
@@ -90,9 +90,10 @@
#define G4x_GMCH_SIZE_MASK (0xf << 8)
#define G4x_GMCH_SIZE_1M (0x1 << 8)
#define G4x_GMCH_SIZE_2M (0x3 << 8)
-#define G4x_GMCH_SIZE_VT_1M (0x9 << 8)
-#define G4x_GMCH_SIZE_VT_1_5M (0xa << 8)
-#define G4x_GMCH_SIZE_VT_2M (0xc << 8)
+#define G4x_GMCH_SIZE_VT_EN (0x8 << 8)
+#define G4x_GMCH_SIZE_VT_1M (G4x_GMCH_SIZE_1M | G4x_GMCH_SIZE_VT_EN)
+#define G4x_GMCH_SIZE_VT_1_5M ((0x2 << 8) | G4x_GMCH_SIZE_VT_EN)
+#define G4x_GMCH_SIZE_VT_2M (G4x_GMCH_SIZE_2M | G4x_GMCH_SIZE_VT_EN)
#define GFX_FLSH_CNTL 0x2170 /* 915+ */
--
1.7.5.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] agp/intel: Fix typo in G4x_GMCH_SIZE_VT_2M
2011-07-08 10:48 ` Chris Wilson
@ 2011-07-08 10:56 ` Konstantin Belousov
2011-07-12 18:28 ` Chris Wilson
0 siblings, 1 reply; 6+ messages in thread
From: Konstantin Belousov @ 2011-07-08 10:56 UTC (permalink / raw)
To: Chris Wilson; +Cc: Daniel Vetter, intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 1390 bytes --]
On Fri, Jul 08, 2011 at 11:48:50AM +0100, Chris Wilson wrote:
> Konstantin Belousov found an error in the define of G4x_GMCH_SIZE_VT_2M
> relative to the GMCH specs, and confirmed that indeed one of his users
> with a Q45 reports 0xb not 0xc for a 2/2MiB GATT.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Konstantin Belousov <kostikbel@gmail.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/char/agp/intel-agp.h | 7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/char/agp/intel-agp.h b/drivers/char/agp/intel-agp.h
> index 999803c..23d9f5d 100644
> --- a/drivers/char/agp/intel-agp.h
> +++ b/drivers/char/agp/intel-agp.h
> @@ -90,9 +90,10 @@
> #define G4x_GMCH_SIZE_MASK (0xf << 8)
> #define G4x_GMCH_SIZE_1M (0x1 << 8)
> #define G4x_GMCH_SIZE_2M (0x3 << 8)
> -#define G4x_GMCH_SIZE_VT_1M (0x9 << 8)
> -#define G4x_GMCH_SIZE_VT_1_5M (0xa << 8)
> -#define G4x_GMCH_SIZE_VT_2M (0xc << 8)
> +#define G4x_GMCH_SIZE_VT_EN (0x8 << 8)
> +#define G4x_GMCH_SIZE_VT_1M (G4x_GMCH_SIZE_1M | G4x_GMCH_SIZE_VT_EN)
> +#define G4x_GMCH_SIZE_VT_1_5M (0x2 | G4x_GMCH_SIZE_VT_EN) /* no nonVT equiv */
I think this should be (0x2 << 8), and not 0x2.
> +#define G4x_GMCH_SIZE_VT_2M (G4x_GMCH_SIZE_2M | G4x_GMCH_SIZE_VT_EN)
>
> #define GFX_FLSH_CNTL 0x2170 /* 915+ */
>
> --
> 1.7.5.4
[-- Attachment #1.2: Type: application/pgp-signature, Size: 196 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] 6+ messages in thread
* [PATCH] agp/intel: Fix typo in G4x_GMCH_SIZE_VT_2M
[not found] <20110708100914.GQ48734@deviant.kiev.zoral.com.ua>
@ 2011-07-08 10:48 ` Chris Wilson
2011-07-08 10:56 ` Konstantin Belousov
0 siblings, 1 reply; 6+ messages in thread
From: Chris Wilson @ 2011-07-08 10:48 UTC (permalink / raw)
To: intel-gfx; +Cc: Daniel Vetter
Konstantin Belousov found an error in the define of G4x_GMCH_SIZE_VT_2M
relative to the GMCH specs, and confirmed that indeed one of his users
with a Q45 reports 0xb not 0xc for a 2/2MiB GATT.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Konstantin Belousov <kostikbel@gmail.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/char/agp/intel-agp.h | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/char/agp/intel-agp.h b/drivers/char/agp/intel-agp.h
index 999803c..23d9f5d 100644
--- a/drivers/char/agp/intel-agp.h
+++ b/drivers/char/agp/intel-agp.h
@@ -90,9 +90,10 @@
#define G4x_GMCH_SIZE_MASK (0xf << 8)
#define G4x_GMCH_SIZE_1M (0x1 << 8)
#define G4x_GMCH_SIZE_2M (0x3 << 8)
-#define G4x_GMCH_SIZE_VT_1M (0x9 << 8)
-#define G4x_GMCH_SIZE_VT_1_5M (0xa << 8)
-#define G4x_GMCH_SIZE_VT_2M (0xc << 8)
+#define G4x_GMCH_SIZE_VT_EN (0x8 << 8)
+#define G4x_GMCH_SIZE_VT_1M (G4x_GMCH_SIZE_1M | G4x_GMCH_SIZE_VT_EN)
+#define G4x_GMCH_SIZE_VT_1_5M (0x2 | G4x_GMCH_SIZE_VT_EN) /* no nonVT equiv */
+#define G4x_GMCH_SIZE_VT_2M (G4x_GMCH_SIZE_2M | G4x_GMCH_SIZE_VT_EN)
#define GFX_FLSH_CNTL 0x2170 /* 915+ */
--
1.7.5.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-07-12 22:38 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-12 22:38 [PATCH] agp/intel: Fix typo in G4x_GMCH_SIZE_VT_2M Chris Wilson
-- strict thread matches above, loose matches on Subject: below --
2011-07-12 18:27 Chris Wilson
2011-07-12 20:56 ` Daniel Vetter
[not found] <20110708100914.GQ48734@deviant.kiev.zoral.com.ua>
2011-07-08 10:48 ` Chris Wilson
2011-07-08 10:56 ` Konstantin Belousov
2011-07-12 18:28 ` Chris Wilson
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.