diff -Naur linux-2.4.21rc6ac2/arch/i386/Makefile linux-2.4.21rc6ac2mw0/arch/i386/Makefile --- linux-2.4.21rc6ac2/arch/i386/Makefile 2003-06-03 14:02:42.000000000 +0200 +++ linux-2.4.21rc6ac2mw0/arch/i386/Makefile 2003-06-03 14:26:15.000000000 +0200 @@ -28,6 +28,9 @@ # prevent gcc from keeping the stack 16 byte aligned CFLAGS += $(call check_gcc,-mpreferred-stack-boundary=2,) +# Force GCC 3 to inline +CFLAGS += $(call check_gcc,-finline-limit=2500,) + ifdef CONFIG_M386 CFLAGS += -march=i386 endif @@ -53,11 +56,11 @@ endif ifdef CONFIG_MPENTIUMIII -CFLAGS += -march=i686 +CFLAGS += $(call check_gcc,-march=pentium3,-march=i686) endif ifdef CONFIG_MPENTIUM4 -CFLAGS += -march=i686 +CFLAGS += $(call check_gcc,-march=pentium4,-march=i686) endif ifdef CONFIG_MK6 diff -Naur linux-2.4.21rc6ac2/drivers/char/drm/drm_agpsupport.h linux-2.4.21rc6ac2mw0/drivers/char/drm/drm_agpsupport.h --- linux-2.4.21rc6ac2/drivers/char/drm/drm_agpsupport.h 2003-06-03 14:03:12.000000000 +0200 +++ linux-2.4.21rc6ac2mw0/drivers/char/drm/drm_agpsupport.h 2003-06-03 14:14:47.000000000 +0200 @@ -259,67 +259,13 @@ return NULL; } head->memory = NULL; - switch (head->agp_info.chipset) { - case INTEL_GENERIC: head->chipset = "Intel"; break; - case INTEL_LX: head->chipset = "Intel 440LX"; break; - case INTEL_BX: head->chipset = "Intel 440BX"; break; - case INTEL_GX: head->chipset = "Intel 440GX"; break; - case INTEL_I810: head->chipset = "Intel i810"; break; - case INTEL_I815: head->chipset = "Intel i815"; break; - case INTEL_I820: head->chipset = "Intel i820"; 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; - - case VIA_GENERIC: head->chipset = "VIA"; break; - case VIA_VP3: head->chipset = "VIA VP3"; break; - case VIA_MVP3: head->chipset = "VIA MVP3"; break; - case VIA_MVP4: head->chipset = "VIA MVP4"; break; - case VIA_APOLLO_KX133: head->chipset = "VIA Apollo KX133"; - break; - case VIA_APOLLO_KT133: head->chipset = "VIA Apollo KT133"; - break; - case VIA_APOLLO_KM266: head->chipset = "VIA Apollo KM266 / KL266"; - break; - case VIA_APOLLO_KT400: head->chipset = "VIA Apollo KT400"; - break; - case VIA_APOLLO_PRO: head->chipset = "VIA Apollo Pro"; - break; - - case SIS_GENERIC: head->chipset = "SiS"; break; - case AMD_GENERIC: head->chipset = "AMD"; break; - case AMD_IRONGATE: head->chipset = "AMD Irongate"; break; - case AMD_8151: head->chipset = "AMD 8151"; break; - case ALI_GENERIC: head->chipset = "ALi"; break; - case ALI_M1541: head->chipset = "ALi M1541"; break; - - case ALI_M1621: head->chipset = "ALi M1621"; break; - case ALI_M1631: head->chipset = "ALi M1631"; break; - case ALI_M1632: head->chipset = "ALi M1632"; break; - case ALI_M1641: head->chipset = "ALi M1641"; break; - case ALI_M1644: head->chipset = "ALi M1644"; break; - case ALI_M1647: head->chipset = "ALi M1647"; break; - case ALI_M1651: head->chipset = "ALi M1651"; break; - - case SVWRKS_HE: head->chipset = "Serverworks HE"; - break; - case SVWRKS_LE: head->chipset = "Serverworks LE"; - break; - case SVWRKS_GENERIC: head->chipset = "Serverworks Generic"; - break; - - case HP_ZX1: head->chipset = "HP ZX1"; break; - - default: head->chipset = "Unknown"; break; - } head->cant_use_aperture = head->agp_info.cant_use_aperture; head->page_mask = head->agp_info.page_mask; - DRM_INFO("AGP %d.%d on %s @ 0x%08lx %ZuMB\n", + DRM_INFO("AGP %d.%d Aperture @ 0x%08lx %ZuMB\n", head->agp_info.version.major, head->agp_info.version.minor, - head->chipset, head->agp_info.aper_base, head->agp_info.aper_size); } diff -Naur linux-2.4.21rc6ac2/drivers/video/radeon.h linux-2.4.21rc6ac2mw0/drivers/video/radeon.h --- linux-2.4.21rc6ac2/drivers/video/radeon.h 2002-11-29 00:53:15.000000000 +0100 +++ linux-2.4.21rc6ac2mw0/drivers/video/radeon.h 2003-06-03 14:15:42.000000000 +0200 @@ -15,6 +15,10 @@ #define PCI_DEVICE_ID_RADEON_PM 0x4c52 #define PCI_DEVICE_ID_RADEON_QL 0x514c #define PCI_DEVICE_ID_RADEON_QW 0x5157 +#define PCI_DEVICE_ID_RADEON_LF 0x4c66 +#define PCI_DEVICE_ID_RADEON_IF 0x4966 +#define PCI_DEVICE_ID_RADEON_NE 0x4e45 +#define PCI_DEVICE_ID_RADEON_QM 0x514d #define RADEON_REGSIZE 0x4000 diff -Naur linux-2.4.21rc6ac2/drivers/video/radeonfb.c linux-2.4.21rc6ac2mw0/drivers/video/radeonfb.c --- linux-2.4.21rc6ac2/drivers/video/radeonfb.c 2003-06-03 14:02:48.000000000 +0200 +++ linux-2.4.21rc6ac2mw0/drivers/video/radeonfb.c 2003-06-03 14:15:42.000000000 +0200 @@ -101,7 +101,11 @@ RADEON_LW, /* Radeon Mobility M7 */ RADEON_LY, /* Radeon Mobility M6 */ RADEON_LZ, /* Radeon Mobility M6 */ - RADEON_PM /* Radeon Mobility P/M */ + RADEON_LF, /* Radeon Mobility 9000 */ + RADEON_PM, /* Radeon Mobility P/M */ + RADEON_IF, /* Radeon 9000 */ + RADEON_NE, /* Radeon 9500/9700 */ + RADEON_QM /* Radeon 9100 */ }; @@ -129,6 +133,10 @@ { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_RADEON_LY, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_LY}, { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_RADEON_LZ, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_LZ}, { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_RADEON_PM, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_PM}, + { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_RADEON_IF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_IF}, + { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_RADEON_LF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_LF}, + { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_RADEON_NE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_NE}, + { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_RADEON_QM, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_QM}, { 0, } }; MODULE_DEVICE_TABLE(pci, radeonfb_pci_table); @@ -858,9 +866,26 @@ strcpy(rinfo->name, "Radeon M6 LZ "); rinfo->hasCRTC2 = 1; break; - case PCI_DEVICE_ID_RADEON_PM: + case PCI_DEVICE_ID_RADEON_PM: strcpy(rinfo->name, "Radeon P/M "); rinfo->hasCRTC2 = 1; + break; + case PCI_DEVICE_ID_RADEON_IF: + strcpy(rinfo->name, "Radeon 9000 "); + rinfo->hasCRTC2 = 1; + break; + case PCI_DEVICE_ID_RADEON_LF: + strcpy(rinfo->name, "Radeon M9000 "); + rinfo->hasCRTC2 = 1; + break; + case PCI_DEVICE_ID_RADEON_NE: + strcpy(rinfo->name, "Radeon 9700 "); + rinfo->hasCRTC2 = 1; + break; + case PCI_DEVICE_ID_RADEON_QM: + strcpy(rinfo->name, "Radeon 9100 "); + rinfo->hasCRTC2 = 1; + break; default: return -ENODEV; } @@ -938,6 +963,7 @@ case PCI_DEVICE_ID_RADEON_LY: case PCI_DEVICE_ID_RADEON_LZ: case PCI_DEVICE_ID_RADEON_PM: + case PCI_DEVICE_ID_RADEON_LF: rinfo->dviDisp_type = MT_LCD; break; default: @@ -2879,6 +2905,7 @@ case PCI_DEVICE_ID_RADEON_LY: case PCI_DEVICE_ID_RADEON_LZ: case PCI_DEVICE_ID_RADEON_PM: + case PCI_DEVICE_ID_RADEON_LF: break; default: return PBOOK_SLEEP_REFUSE;