nforce3 agpgart support

DISCUSSION Terence Ripperda 1 participant 1 message Oct 23, 2003 3 messages not in the archive

Subsystems (4)

Documentation PCI Char and misc drivers Agpgart driver

lore

Share & tools

lore

A message that is not in the archive (sent off-list or not yet received): 20030919231038.GA18625@hygelac

A message that is not in the archive (sent off-list or not yet received): 20031023175700.GD881@hygelac

A message that is not in the archive (sent off-list or not yet received): [email protected]

Terence Ripperda

author

2003-10-23 18:14 UTC #3 lore raw

Thanks Dave,

ccing linux-kernel with the nforce patch for 2.4.22.

Terence

Quoted 14 lines · On Thu, Oct 23, 2003 at 07:04:03PM +0100, [email protected] wrote:

Quoted 3 lines · Terence Ripperda
Here's an updated patch for linux 2.4.22, which also includes support for an additional nforce3s chipset.
are these the correct people that I should be sending these patches to, or is there someone else I should be contacting?
For 2.4, send stuff straight to Marcelo (Cc linux-kernel is usually a good idea too). 2.6 stuff, bounce to me first please. With Alan busy doing an MBA for the next year, he likely won't have time to feed Marcelo patches.
Dave
Signature · 1 line
 Dave Jones     http://www.codemonkey.org.uk

arch/i386/defconfig +1 -0

diff -ru linux-2.4.22/arch/i386/defconfig linux-2.4.22-nforce/arch/i386/defconfig
@@ -607,6 +607,7 @@
 CONFIG_AGP_SIS=y
 CONFIG_AGP_ALI=y
 # CONFIG_AGP_SWORKS is not set
+CONFIG_AGP_NVIDIA=y
 CONFIG_DRM=y
 # CONFIG_DRM_OLD is not set

arch/x86_64/defconfig +2 -1

diff -ru linux-2.4.22/arch/x86_64/defconfig linux-2.4.22-nforce/arch/x86_64/defconfig
@@ -528,7 +528,7 @@
 #
 # CONFIG_FTAPE is not set
 CONFIG_AGP=y
-CONFIG_AGP_AMD_8151=y
+CONFIG_AGP_X86_64=y
 CONFIG_AGP_INTEL=y
 CONFIG_AGP_I810=y
 CONFIG_AGP_VIA=y

@@ -536,6 +536,7 @@
 CONFIG_AGP_SIS=y
 CONFIG_AGP_ALI=y
 CONFIG_AGP_SWORKS=y
+CONFIG_AGP_NVIDIA=y
 # CONFIG_DRM is not set
 # CONFIG_MWAVE is not set

Documentation/Configure.help +2 -2

diff -ru linux-2.4.22/Documentation/Configure.help linux-2.4.22-nforce/Documentation/Configure.help
@@ -3697,9 +3697,9 @@
   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.
 
-CONFIG_AGP_AMD_8151
+CONFIG_AGP_X86_64
   This option gives you AGP support for the GLX component of
-  XFree86 on AMD K8 with an AGP 8151 chipset.
+  XFree86 on AMD K8 with an AGP 8151 or NVIDIA nForce3 chipset.
 
   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/agp/agpgart_be.c +226 ~~-51~~

325 lines not on this page · raw message

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

diff -ru linux-2.4.22/drivers/char/agp/agp.h linux-2.4.22-nforce/drivers/char/agp/agp.h
@@ -466,6 +466,14 @@
 #define NVIDIA_3_APBASE     0x50
 #define NVIDIA_3_APLIMIT    0x54
 
+/* NVIDIA x86-64 registers */
+#define NVIDIA_X86_64_0_APBASE		0x10
+#define NVIDIA_X86_64_1_APBASE1		0x50
+#define NVIDIA_X86_64_1_APLIMIT1	0x54
+#define NVIDIA_X86_64_1_APSIZE		0xa8
+#define NVIDIA_X86_64_1_APBASE2		0xd8
+#define NVIDIA_X86_64_1_APLIMIT2	0xdc
+
 /* HP ZX1 SBA registers */
 #define HP_ZX1_CTRL		0x200
 #define HP_ZX1_IBASE		0x300

drivers/char/Config.in +2 -2

diff -ru linux-2.4.22/drivers/char/Config.in linux-2.4.22-nforce/drivers/char/Config.in
@@ -294,7 +294,7 @@
 
 if [ "$CONFIG_GART_IOMMU" = "y" ]; then
 	bool '/dev/agpgart (AGP Support)' CONFIG_AGP
-	define_bool CONFIG_AGP_AMD_8151 y
+	define_bool CONFIG_AGP_X86_64 y
 else
 	tristate '/dev/agpgart (AGP Support)' CONFIG_AGP
 fi

@@ -304,7 +304,7 @@
    bool '  VIA chipset support' CONFIG_AGP_VIA
    bool '  AMD Irongate, 761, and 762 support' CONFIG_AGP_AMD
    if [ "$CONFIG_GART_IOMMU" != "y" ]; then
-      bool '  AMD 8151 support' CONFIG_AGP_AMD_8151
+      bool '  x86-64 chipset support (AMD 8151, NVIDIA nForce3)' CONFIG_AGP_X86_64
    fi   
    bool '  Generic SiS support' CONFIG_AGP_SIS
    bool '  ALI chipset support' CONFIG_AGP_ALI

include/linux/agp_backend.h +1 -0

diff -ru linux-2.4.22/include/linux/agp_backend.h linux-2.4.22-nforce/include/linux/agp_backend.h
@@ -88,6 +88,7 @@
 	SVWRKS_GENERIC,
 	NVIDIA_NFORCE,
 	NVIDIA_NFORCE2,
+	NVIDIA_NFORCE3,
 	NVIDIA_GENERIC,
 	HP_ZX1,
 };

include/linux/pci_ids.h +3 -1

diff -ru linux-2.4.22/include/linux/pci_ids.h linux-2.4.22-nforce/include/linux/pci_ids.h
@@ -965,6 +965,8 @@
 #define PCI_DEVICE_ID_NVIDIA_UVTNT2		0x002D
 #define PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE	0x0065
 #define PCI_DEVICE_ID_NVIDIA_ITNT2		0x00A0
+#define PCI_DEVICE_ID_NVIDIA_NFORCE3		0x00d1
+#define PCI_DEVICE_ID_NVIDIA_NFORCE3S		0x00e1
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE_SDR	0x0100
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE_DDR	0x0101
 #define PCI_DEVICE_ID_NVIDIA_QUADRO		0x0103

@@ -977,7 +979,7 @@
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE2_ULTRA	0x0152
 #define PCI_DEVICE_ID_NVIDIA_QUADRO2_PRO	0x0153
 #define PCI_DEVICE_ID_NVIDIA_IGEFORCE2		0x01a0
-#define PCI_DEVICE_ID_NVIDIA_NFORCE		0x01a4
+#define PCI_DEVICE_ID_NVIDIA_NFORCE			0x01a4
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_IDE		0x01bc
 #define PCI_DEVICE_ID_NVIDIA_NFORCE2		0x01e0
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE3		0x0200