Skip to contentSkip to conversation

drivers/char/agp i845 support

PATCH New GOTO Masanori 1 participant 1 message Oct 30, 2001

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers/char/agp i845 support

Hi,

Here's a patch which supports agp i845 for 2.4.13-ac5 (Current 2.4.14-pre* does not support new patch i860,
so I made only for -ac).

-- gotom

Documentation/Configure.help +2 -2
diff -Nuar linux-2.4.13-ac5/Documentation/Configure.help linux-2.4.13-ac5.agp/Documentation/Configure.help
@@ -3098,10 +3098,10 @@
   a module, say M here and read <file:Documentation/modules.txt>.  The
   module will be called agpgart.o.
 
-Intel 440LX/BX/GX/815/830/840/850/860 support
+Intel 440LX/BX/GX/815/830/840/845/850/860 support
 CONFIG_AGP_INTEL
   This option gives you AGP support for the GLX component of the
-  XFree86 4.x on Intel 440LX/BX/GX, 815, 830, 840, 850  and 860 chipsets.
+  XFree86 4.x on Intel 440LX/BX/GX, 815, 830, 840, 845, 850 and 860 chipsets.
 
   You should say Y here if you use XFree86 3.3.6 or 4.x and want to
   use GLX or DRI.  If unsure, say N.
drivers/char/Config.in +1 -1
diff -Nuar linux-2.4.13-ac5/drivers/char/Config.in linux-2.4.13-ac5.agp/drivers/char/Config.in
@@ -213,7 +213,7 @@
    bool '  ALI chipset support' CONFIG_AGP_ALI
    bool '  AMD Irongate, 761, and 762 support' CONFIG_AGP_AMD
    bool '  Generic SiS support' CONFIG_AGP_SIS
-   bool '  Intel 440LX/BX/GX and I815/I830/I840/I850/I860 support' CONFIG_AGP_INTEL
+   bool '  Intel 440LX/BX/GX and I815/I830/I840/I845/I850/I860 support' CONFIG_AGP_INTEL
    bool '  Intel I810/I815/I830M (on-board) support' CONFIG_AGP_I810
    bool '  Serverworks LE/HE support' CONFIG_AGP_SWORKS
    bool '  VIA chipset support' CONFIG_AGP_VIA
drivers/char/agp/agp.h +16 -9
diff -Nuar linux-2.4.13-ac5/drivers/char/agp/agp.h linux-2.4.13-ac5.agp/drivers/char/agp/agp.h
@@ -156,16 +156,16 @@
 #define PGE_EMPTY(p) (!(p) || (p) == (unsigned long) agp_bridge.scratch_page)
 
 #ifndef PCI_DEVICE_ID_VIA_82C691_0
-#define PCI_DEVICE_ID_VIA_82C691_0      0x0691
+#define PCI_DEVICE_ID_VIA_82C691_0	0x0691
 #endif
 #ifndef PCI_DEVICE_ID_VIA_8371_0
-#define PCI_DEVICE_ID_VIA_8371_0      0x0391
+#define PCI_DEVICE_ID_VIA_8371_0	0x0391
 #endif
 #ifndef PCI_DEVICE_ID_VIA_8363_0
-#define PCI_DEVICE_ID_VIA_8363_0      0x0305
+#define PCI_DEVICE_ID_VIA_8363_0	0x0305
 #endif
 #ifndef PCI_DEVICE_ID_VIA_82C694X_0
-#define PCI_DEVICE_ID_VIA_82C694X_0      0x0605
+#define PCI_DEVICE_ID_VIA_82C694X_0	0x0605
 #endif
 #ifndef PCI_DEVICE_ID_INTEL_810_0
 #define PCI_DEVICE_ID_INTEL_810_0       0x7120
@@ -177,10 +177,13 @@
 #define PCI_DEVICE_ID_INTEL_830_M_1     0x3577
 #endif
 #ifndef PCI_DEVICE_ID_INTEL_840_0
-#define PCI_DEVICE_ID_INTEL_840_0		0x1a21
+#define PCI_DEVICE_ID_INTEL_840_0	0x1a21
+#endif
+#ifndef PCI_DEVICE_ID_INTEL_845_0
+#define PCI_DEVICE_ID_INTEL_845_0	0x1a30
 #endif
 #ifndef PCI_DEVICE_ID_INTEL_850_0
-#define PCI_DEVICE_ID_INTEL_850_0     0x2530
+#define PCI_DEVICE_ID_INTEL_850_0	0x2530
 #endif
 #ifndef PCI_DEVICE_ID_INTEL_860_0
 #define PCI_DEVICE_ID_INTEL_860_0	0x2532
@@ -271,12 +274,16 @@
 #define I830_RDRAM_DDT(x)          (((x) & 0x18) >> 3)
 
 /* intel i840 registers */
-#define INTEL_I840_MCHCFG   0x50
+#define INTEL_I840_MCHCFG	0x50
 #define INTEL_I840_ERRSTS	0xc8
 
+/* intel i845 registers */
+#define INTEL_I845_MCHCFG	0x51
+#define INTEL_I845_ERRSTS	0xc8
+
 /* intel i850 registers */
-#define INTEL_I850_MCHCFG   0x50
-#define INTEL_I850_ERRSTS   0xc8
+#define INTEL_I850_MCHCFG	0x50
+#define INTEL_I850_ERRSTS	0xc8
 
 /* intel i860 registers */
 #define INTEL_I860_MCHCFG	0x50
drivers/char/agp/agpgart_be.c +73 -2

99 lines not on this page · raw message

drivers/char/drm/drm_agpsupport.h +1 -0
diff -Nuar linux-2.4.13-ac5/drivers/char/drm/drm_agpsupport.h linux-2.4.13-ac5.agp/drivers/char/drm/drm_agpsupport.h
@@ -274,6 +274,7 @@
 #if LINUX_VERSION_CODE >= 0x020400
 		case INTEL_I815:	head->chipset = "Intel i815";	 break;
 		case INTEL_I840:	head->chipset = "Intel i840";    break;
+		case INTEL_I845:	head->chipset = "Intel i845";    break;
 		case INTEL_I850:	head->chipset = "Intel i850";	 break;
 #endif
 
include/linux/agp_backend.h +1 -0
diff -Nuar linux-2.4.13-ac5/include/linux/agp_backend.h linux-2.4.13-ac5.agp/include/linux/agp_backend.h
@@ -48,6 +48,7 @@
 	INTEL_I815,
 	INTEL_I830_M,
 	INTEL_I840,
+	INTEL_I845,
 	INTEL_I850,
 	INTEL_I860,
 	VIA_GENERIC,