[PATCH] ALI 1644 AGP/DRM support.

diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h
index a2c4ed580b35455012a2ddfd7b1d44eefdaa53c5..9fb4f74256c6860412627d76921f9643ec4c390d 100644 (file)
--- a/drivers/char/agp/agp.h
+++ b/drivers/char/agp/agp.h
@@ -248,6 +248,9 @@ struct agp_bridge_data {
 #ifndef PCI_DEVICE_ID_AL_M1641_0
 #define PCI_DEVICE_ID_AL_M1641_0       0x1641
 #endif
+#ifndef PCI_DEVICE_ID_AL_M1644_0
+#define PCI_DEVICE_ID_AL_M1644_0       0x1644
+#endif
 #ifndef PCI_DEVICE_ID_AL_M1647_0
 #define PCI_DEVICE_ID_AL_M1647_0       0x1647
 #endif

diff --git a/drivers/char/agp/agpgart_be.c b/drivers/char/agp/agpgart_be.c
index de7f2eda96ac55e51effacbf6817b025ca938a4d..06f76ec8cabaa1303f0788e2bb4abdff489c91a6 100644 (file)
--- a/drivers/char/agp/agpgart_be.c
+++ b/drivers/char/agp/agpgart_be.c
@@ -3476,6 +3476,12 @@ static struct {
                "Ali",
                "M1641",
                ali_generic_setup },
+       { PCI_DEVICE_ID_AL_M1644_0,
+               PCI_VENDOR_ID_AL,
+               ALI_M1644,
+               "Ali",
+               "M1644",
+               ali_generic_setup },
        { PCI_DEVICE_ID_AL_M1647_0,
                PCI_VENDOR_ID_AL,
                ALI_M1647,
@@ -3513,7 +3519,7 @@ static struct {
                PCI_VENDOR_ID_AMD,
                AMD_762,
                "AMD",
-               "AMD 760MP",
+               "760MP",
                amd_irongate_setup },
        { 0,
                PCI_VENDOR_ID_AMD,
@@ -3579,11 +3585,11 @@ static struct {
                "i845",
                intel_845_setup },
        { PCI_DEVICE_ID_INTEL_850_0,
-               PCI_VENDOR_ID_INTEL,
-               INTEL_I850,
-               "Intel",
-               "i850",
-               intel_850_setup },
+               PCI_VENDOR_ID_INTEL,
+               INTEL_I850,
+               "Intel",
+               "i850",
+intel_850_setup },
        { PCI_DEVICE_ID_INTEL_860_0,
                PCI_VENDOR_ID_INTEL,
                INTEL_I860,

diff --git a/drivers/char/drm/drm_agpsupport.h b/drivers/char/drm/drm_agpsupport.h
index 3c588f93f2a391e45637325854252c5d15976c52..60d8800394c7be4616e4eb06763513ea33fc34d9 100644 (file)
--- a/drivers/char/drm/drm_agpsupport.h
+++ b/drivers/char/drm/drm_agpsupport.h
@@ -303,6 +303,7 @@ drm_agp_head_t *DRM(agp_init)(void)
                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;
 #endif

diff --git a/include/linux/agp_backend.h b/include/linux/agp_backend.h
index 7a6cdf75d23749e524cf90e4bb6ec62e48ebae0b..e7800593155c4799a997f1ef855b612ba86af467 100644 (file)
--- a/include/linux/agp_backend.h
+++ b/include/linux/agp_backend.h
@@ -69,6 +69,7 @@ enum chipset_type {
        ALI_M1631,
        ALI_M1632,
        ALI_M1641,
+       ALI_M1644,
        ALI_M1647,
        ALI_M1651,
        ALI_GENERIC,