diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-11 11:39:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-11 11:39:05 -0700 |
| commit | 3334500b460a5eede2e3466ca97a90fe3b91ceb5 (patch) | |
| tree | 970829ec5116abcaf237be5214b89638404554be /drivers/char/agp/agp.h | |
| parent | 72f60acb01fc7ef135d3181ba9235c9ef0ab68ea (diff) | |
| parent | 874808c6dd429f7431b906a32c7f78a68e7636af (diff) | |
| download | linux-stable-3334500b460a5eede2e3466ca97a90fe3b91ceb5.tar.gz linux-stable-3334500b460a5eede2e3466ca97a90fe3b91ceb5.tar.bz2 linux-stable-3334500b460a5eede2e3466ca97a90fe3b91ceb5.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart:
[AGPGART] intel_agp: Add support for G33, Q33 and Q35 chipsets
[AGPGART] intel_agp: add support for 945GME
[AGPGART] intel_agp: add support for 965GME/GLE
[AGPGART] intel_agp: use table for device probe
[AGPGART] intel_agp: cleanup intel private data
Diffstat (limited to 'drivers/char/agp/agp.h')
| -rw-r--r-- | drivers/char/agp/agp.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h index fdbca25a3948..35ab1a9f8e8b 100644 --- a/drivers/char/agp/agp.h +++ b/drivers/char/agp/agp.h @@ -176,7 +176,7 @@ struct agp_bridge_data { #define I830_GMCH_MEM_MASK 0x1 #define I830_GMCH_MEM_64M 0x1 #define I830_GMCH_MEM_128M 0 -#define I830_GMCH_GMS_MASK 0x70 +#define I830_GMCH_GMS_MASK 0xF0 #define I830_GMCH_GMS_DISABLED 0x00 #define I830_GMCH_GMS_LOCAL 0x10 #define I830_GMCH_GMS_STOLEN_512 0x20 @@ -231,6 +231,10 @@ struct agp_bridge_data { #define I965_PGETBL_SIZE_512KB (0 << 1) #define I965_PGETBL_SIZE_256KB (1 << 1) #define I965_PGETBL_SIZE_128KB (2 << 1) +#define G33_PGETBL_SIZE_MASK (3 << 8) +#define G33_PGETBL_SIZE_1M (1 << 8) +#define G33_PGETBL_SIZE_2M (2 << 8) + #define I810_DRAM_CTL 0x3000 #define I810_DRAM_ROW_0 0x00000001 #define I810_DRAM_ROW_0_SDRAM 0x00000001 |