[PATCH] AGP update for i820 and i860 chipsets

[PATCH] AGP update for i820 and i860 chipsets

[Daniele Venzano]

[-- Attachment #1: Type: text/plain, Size: 678 bytes --]

This patch fixes the ID for i860 chipset and adds support for the UP
version of i820 AGP bridge. I made it against kernel 2.4.17. It compiles
and works both builin or as a module.

It was submitted long ago by Nicolas Aspert and works well for
me, I'm running XFree with DRI and AGP 4x without problems.

This is my first patch, so there could be problems, however you could
find it also at:
http://digilander.iol.it/webvenza/agp_patch.html

Best regards.
-- 
-----------------------------------------------------
Daniele Venzano
Senior member of the Linux User Group Genova (LUGGe)
E-Mail: venza@iol.it
Web: http://digilander.iol.it/webvenza/
LUGGe: http://lugge.ziobudda.net


[-- Attachment #2: patch-agp_i8xx-2.4.17_fix_pci_ids --]
[-- Type: text/plain, Size: 2392 bytes --]

diff -urN -X dontdiff linux/drivers/char/Config.in linux-agp/drivers/char/Config.in
--- linux/drivers/char/Config.in	Fri Jan 18 19:58:09 2002
+++ linux-agp/drivers/char/Config.in	Fri Jan 18 20:10:14 2002
@@ -210,7 +210,7 @@
 
 dep_tristate '/dev/agpgart (AGP Support)' CONFIG_AGP $CONFIG_DRM_AGP
 if [ "$CONFIG_AGP" != "n" ]; then
-   bool '  Intel 440LX/BX/GX and I815/I830M/I840/I850 support' CONFIG_AGP_INTEL
+   bool '  Intel 440LX/BX/GX and I815/I820/I830M/I840/I845/I850/I860 support' CONFIG_AGP_INTEL
    bool '  Intel I810/I815/I830M (on-board) support' CONFIG_AGP_I810
    bool '  VIA chipset support' CONFIG_AGP_VIA
    bool '  AMD Irongate, 761, and 762 support' CONFIG_AGP_AMD
diff -urN -X dontdiff linux/drivers/char/agp/agp.h linux-agp/drivers/char/agp/agp.h
--- linux/drivers/char/agp/agp.h	Fri Jan 18 19:58:09 2002
+++ linux-agp/drivers/char/agp/agp.h	Fri Jan 18 20:11:36 2002
@@ -179,6 +179,9 @@
 #ifndef PCI_DEVICE_ID_INTEL_820_0
 #define PCI_DEVICE_ID_INTEL_820_0       0x2500
 #endif
+#ifndef PCI_DEVICE_ID_INTEL_820_UP_0
+#define PCI_DEVICE_ID_INTEL_820_UP_0    0x2501
+#endif
 #ifndef PCI_DEVICE_ID_INTEL_840_0
 #define PCI_DEVICE_ID_INTEL_840_0		0x1a21
 #endif
@@ -189,7 +192,7 @@
 #define PCI_DEVICE_ID_INTEL_850_0     0x2530
 #endif
 #ifndef PCI_DEVICE_ID_INTEL_860_0
-#define PCI_DEVICE_ID_INTEL_860_0	0x2532
+#define PCI_DEVICE_ID_INTEL_860_0	0x2531
 #endif
 #ifndef PCI_DEVICE_ID_INTEL_810_DC100_0
 #define PCI_DEVICE_ID_INTEL_810_DC100_0 0x7122
diff -urN -X dontdiff linux/drivers/char/agp/agpgart_be.c linux-agp/drivers/char/agp/agpgart_be.c
--- linux/drivers/char/agp/agpgart_be.c	Fri Jan 18 19:58:18 2002
+++ linux-agp/drivers/char/agp/agpgart_be.c	Fri Jan 18 20:11:46 2002
@@ -1800,7 +1800,7 @@
        agp_bridge.needs_scratch_page = FALSE;
        agp_bridge.configure = intel_820_configure;
        agp_bridge.fetch_size = intel_8xx_fetch_size;
-       agp_bridge.cleanup = intel_cleanup;
+       agp_bridge.cleanup = intel_820_cleanup;
        agp_bridge.tlb_flush = intel_820_tlbflush;
        agp_bridge.mask_memory = intel_mask_memory;
        agp_bridge.agp_enable = agp_generic_agp_enable;
@@ -3567,6 +3567,12 @@
 		"i815",
 		intel_generic_setup },
 	{ PCI_DEVICE_ID_INTEL_820_0,
+		PCI_VENDOR_ID_INTEL,
+		INTEL_I820,
+		"Intel",
+		"i820",
+		intel_820_setup },
+	{ PCI_DEVICE_ID_INTEL_820_UP_0,
 		PCI_VENDOR_ID_INTEL,
 		INTEL_I820,
 		"Intel",

Re: [PATCH] AGP update for i820 and i860 chipsets

[Andy Pfiffer]

On Fri, 2002-01-18 at 14:11, Daniele Venzano wrote:
> This patch fixes the ID for i860 chipset and adds support for the UP
> version of i820 AGP bridge. I made it against kernel 2.4.17. It compiles
> and works both builin or as a module.

I was looking for this fix just yesterday.

This patch works on my system.  You might want to take the extra step
and fix the PCI device id list, too:

% lspci | grep Unknown
00:00.0 Host bridge: Intel Corporation: Unknown device 2531 (rev 04)
00:02.0 PCI bridge: Intel Corporation: Unknown device 2533 (rev 04)
% 

Andy

Re: [PATCH] AGP update for i820 and i860 chipsets

[Daniele Venzano]

On Fri, Jan 18, 2002 at 04:33:41PM -0800, Andy Pfiffer wrote:
> This patch works on my system.  You might want to take the extra step
> and fix the PCI device id list, too:
> % lspci | grep Unknown
> 00:00.0 Host bridge: Intel Corporation: Unknown device 2531 (rev 04)
> 00:02.0 PCI bridge: Intel Corporation: Unknown device 2533 (rev 04)
> % 

I looked in drivers/pci/devlist.h and found:

DEVICE(8086,2531,"82850 860 (Wombat) Chipset Host Bridge (MCH)")
DEVICE(8086,2533,"82860 860 (Wombat) Chipset AGP Bridge")

I hadn't to modify it.
This in kernel 2.4.17, I hope this is the only place where pci ids
reside, if not what shuold I change ?

-- 
-----------------------------------------------------
Daniele Venzano
Senior member of the Linux User Group Genova (LUGGe)
E-Mail: venza@iol.it
Web: http://digilander.iol.it/webvenza/
LUGGe: http://lugge.ziobudda.net

Re: [PATCH] AGP update for i820 and i860 chipsets

[Nicolas Aspert]

Daniele Venzano wrote:

> This patch fixes the ID for i860 chipset and adds support for the UP
> version of i820 AGP bridge. I made it against kernel 2.4.17. It compiles
> and works both builin or as a module.
> 
> It was submitted long ago by Nicolas Aspert and works well for
> me, I'm running XFree with DRI and AGP 4x without problems.
> 
> This is my first patch, so there could be problems, however you could
> find it also at:
> http://digilander.iol.it/webvenza/agp_patch.html
> 
> Best regards.
> 
> 

Hello Daniele

In fact, the patch you sent went into 2.4.18-pre2, along with my 830MP 
stuff (which missed the suspend/resume), so it should be OK in the next 
releases.

I am now doing the corrective patch for the suspend/resume stuff.

Best regards

Nicolas
-- 
Nicolas Aspert      Signal Processing Laboratory (LTS)
Swiss Federal Institute of Technology (EPFL)
Office:  ELE 237
Phone:   +41 - 21 - 693 36 32 (LTS Office)
Fax:     +41 - 21 - 693 76 00  Web: http://ltswww.epfl.ch/~aspert