Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / char / agp / intel-agp.h

diff --git a/drivers/char/agp/intel-agp.h b/drivers/char/agp/intel-agp.h
index 90539df02504ca0ee75ebf1923fd814a50a738bc..5feebe2800e9a5147fa04e951ff40dfd62e1688d 100644 (file)
--- a/drivers/char/agp/intel-agp.h
+++ b/drivers/char/agp/intel-agp.h
@@ -75,6 +75,8 @@
 #define I810_GMS_DISABLE       0x00000000
 #define I810_PGETBL_CTL                0x2020
 #define I810_PGETBL_ENABLED    0x00000001
+/* Note: PGETBL_CTL2 has a different offset on G33. */
+#define I965_PGETBL_CTL2       0x20c4
 #define I965_PGETBL_SIZE_MASK  0x0000000e
 #define I965_PGETBL_SIZE_512KB (0 << 1)
 #define I965_PGETBL_SIZE_256KB (1 << 1)
@@ -82,9 +84,17 @@
 #define I965_PGETBL_SIZE_1MB   (3 << 1)
 #define I965_PGETBL_SIZE_2MB   (4 << 1)
 #define I965_PGETBL_SIZE_1_5MB (5 << 1)
-#define G33_PGETBL_SIZE_MASK    (3 << 8)
-#define G33_PGETBL_SIZE_1M      (1 << 8)
-#define G33_PGETBL_SIZE_2M      (2 << 8)
+#define G33_GMCH_SIZE_MASK     (3 << 8)
+#define G33_GMCH_SIZE_1M       (1 << 8)
+#define G33_GMCH_SIZE_2M       (2 << 8)
+#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 GFX_FLSH_CNTL          0x2170 /* 915+ */
 
 #define I810_DRAM_CTL          0x3000
 #define I810_DRAM_ROW_0                0x00000001
@@ -120,6 +130,7 @@
 #define INTEL_GMCH_GMS_STOLEN_352M     (0xd << 4)
 
 #define I915_IFPADDR    0x60
+#define I830_HIC        0x70
 
 /* Intel 965G registers */
 #define I965_MSAC 0x62