2.5.68 intel i855PM AGP support
Subsystems (2)
PATCH 1/1 2.5.68 intel i855PM AGP support
Adds i855PM support. Mainly adding a PCI id, unfortunately, requires renaming the i855GM PCI ids to avoid name conflict. Also renames some of the i855GM constants from i855PM to i855GM.
Bill
drivers/char/agp/intel-agp.c renamed from drivers/char/agp/intel-agp.c.foo +13 -7
@@ -1368,12 +1368,18 @@ .chipset_setup = intel_850_setup }, { - .device_id = PCI_DEVICE_ID_INTEL_82855_HB, + .device_id = PCI_DEVICE_ID_INTEL_82855PM_HB, .chipset = INTEL_I855_PM, .chipset_name = "855PM", .chipset_setup = intel_845_setup }, { + .device_id = PCI_DEVICE_ID_INTEL_82855GM_HB, + .chipset = INTEL_I855_GM, + .chipset_name = "855GM", + .chipset_setup = intel_845_setup + }, + { .device_id = PCI_DEVICE_ID_INTEL_82860_HB, .chipset = INTEL_I860, .chipset_name = "i860",
@@ -1534,16 +1540,16 @@ printk(KERN_INFO PFX "Detected an Intel(R) 830M Chipset.\n"); agp_bridge->type =INTEL_I810 ;return intel_i830_setup (i810_dev); - -case PCI_DEVICE_ID_INTEL_82855_HB : - i810_dev =pci_find_device (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82855_IG ,NULL ); + +case PCI_DEVICE_ID_INTEL_82855GM_HB : + i810_dev =pci_find_device (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82855GM_IG ,NULL );if (i810_dev &&PCI_FUNC (i810_dev->devfn) !=0 ) - i810_dev =pci_find_device (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82855_IG , i810_dev); + i810_dev =pci_find_device (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82855GM_IG , i810_dev);if (i810_dev ==NULL ) { -/* Intel 855PM with external graphic card */ +/* Intel 855GM with external graphic card */ /* It will be initialized later */ - agp_bridge->type =INTEL_I855_PM ; + agp_bridge->type =INTEL_I855_GM ;break ; } {
include/linux/pci_ids.h renamed from include/linux/pci_ids.h.foo +3 -2
@@ -1902,10 +1902,11 @@#define PCI_DEVICE_ID_INTEL_82845G_IG 0x2562#define PCI_DEVICE_ID_INTEL_82865_HB 0x2570#define PCI_DEVICE_ID_INTEL_82865_IG 0x2572 +#define PCI_DEVICE_ID_INTEL_82855PM_HB 0x3340#define PCI_DEVICE_ID_INTEL_82830_HB 0x3575#define PCI_DEVICE_ID_INTEL_82830_CGC 0x3577 -#define PCI_DEVICE_ID_INTEL_82855_HB 0x3580 -#define PCI_DEVICE_ID_INTEL_82855_IG 0x3582 +#define PCI_DEVICE_ID_INTEL_82855GM_HB 0x3580 +#define PCI_DEVICE_ID_INTEL_82855GM_IG 0x3582#define PCI_DEVICE_ID_INTEL_80310 0x530d#define PCI_DEVICE_ID_INTEL_82371SB_0 0x7000#define PCI_DEVICE_ID_INTEL_82371SB_1 0x7010
include/linux/agp_backend.h renamed from include/linux/agp_backend.h.foo +1 -0
@@ -47,6 +47,7 @@INTEL_I830_M ,INTEL_I845_G ,INTEL_I855_PM , +INTEL_I855_GM ,INTEL_I865_G ,INTEL_I840 , INTEL_I845,
Quoted 3 lines · Bill Nottingham
Adds i855PM support. Mainly adding a PCI id, unfortunately, requires renaming the i855GM PCI ids to avoid name conflict. Also renames some of the i855GM constants from i855PM to i855GM.
Ah crap, I should've warned you about Christoph's changes from the last day or so. Take a look at
http://www.codemonkey.org.uk/cruft/agpgart-bits.diff
and you'll see that there's been a bit of a shuffle, and a move toward killing off that ->chipset enum.
Dave