2.4 IA64 460GX gart support

PATCH New Bjorn Helgaas 1 participant 1 message Sep 10, 2003

Subsystems (2)

Char and misc drivers Agpgart driver

lore

Share & tools

lore

Bjorn Helgaas

author

2003-09-10 18:54 UTC #0 lore raw

PATCH 1/1 2.4 IA64 460GX gart support

This patch adds the bulk of the GART support for the IA64 460GX chipset. This isn't everything needed; there's some infrastructure stuff that probably won't be acceptable in 2.4, so I'll keep that in the ia64 patch for now.

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.1110 -> 1.1111
# drivers/char/agp/agpgart_be.c 1.46 -> 1.47
# drivers/char/Config.in 1.55 -> 1.56
# drivers/char/agp/agp.h 1.22 -> 1.23
# include/linux/agp_backend.h 1.19 -> 1.20
# drivers/char/drm-4.0/agpsupport.c 1.5 -> 1.6
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/09/10 [email protected] 1.1111
# 460GX gart support.
# --------------------------------------------
#

drivers/char/Config.in +1 -0

diff -Nru a/drivers/char/Config.in b/drivers/char/Config.in
@@ -327,6 +327,7 @@
       bool '  NVIDIA chipset support' CONFIG_AGP_NVIDIA
    fi
    if [ "$CONFIG_IA64" = "y" ]; then
+      bool '  Intel 460GX support' CONFIG_AGP_I460
       bool '  HP ZX1 AGP support' CONFIG_AGP_HP_ZX1
    fi
    bool '  ATI IGP chipset support' CONFIG_AGP_ATI

drivers/char/agp/agp.h +11 -0

diff -Nru a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h
@@ -256,6 +256,9 @@
 #ifndef PCI_DEVICE_ID_INTEL_82443GX_1
 #define PCI_DEVICE_ID_INTEL_82443GX_1   0x71a1
 #endif
+#ifndef PCI_DEVICE_ID_INTEL_460GX
+#define PCI_DEVICE_ID_INTEL_460GX       0x84ea
+#endif
 #ifndef PCI_DEVICE_ID_AMD_IRONGATE_0
 #define PCI_DEVICE_ID_AMD_IRONGATE_0    0x7006
 #endif

@@ -331,6 +334,14 @@
 #define INTEL_NBXCFG    0x50
 #define INTEL_ERRSTS    0x91
 
+/* Intel 460GX Registers */
+#define INTEL_I460_APBASE		0x10
+#define INTEL_I460_BAPBASE		0x98
+#define INTEL_I460_GXBCTL		0xa0
+#define INTEL_I460_AGPSIZ		0xa2
+#define INTEL_I460_ATTBASE		0xfe200000
+#define INTEL_I460_GATT_VALID		(1UL << 24)
+#define INTEL_I460_GATT_COHERENT	(1UL << 25)
 /* Intel 855GM/852GM registers */
 #define I855_GMCH_CTRL             0x52
 #define I855_GMCH_ENABLED          0x4

drivers/char/agp/agpgart_be.c +603 -2

618 lines not on this page · raw message

drivers/char/drm-4.0/agpsupport.c +1 -0

diff -Nru a/drivers/char/drm-4.0/agpsupport.c b/drivers/char/drm-4.0/agpsupport.c
@@ -264,6 +264,7 @@
 #if LINUX_VERSION_CODE >= 0x020400
 		case INTEL_I840:	head->chipset = "Intel i840";    break;
 #endif
+		case INTEL_460GX:	head->chipset = "Intel 460GX";	 break;
 
 		case VIA_GENERIC:	head->chipset = "VIA";           break;
 		case VIA_VP3:		head->chipset = "VIA VP3";       break;

include/linux/agp_backend.h +1 -0

diff -Nru a/include/linux/agp_backend.h b/include/linux/agp_backend.h
@@ -57,6 +57,7 @@
 	INTEL_I865_G,
 	INTEL_I7205,
 	INTEL_I7505,
+	INTEL_460GX,
 	VIA_GENERIC,
 	VIA_VP3,
 	VIA_MVP3,