All pastes #1965045 Raw Edit

Untitled

public text v1 · immutable
#1965045 ·published 2010-10-17 18:33 UTC
rendered paste body
diff -ru intelorig/common.h intelQx57/common.h
--- intelorig/common.h	2010-10-17 07:31:59.000000000 +0000
+++ intelQx57/common.h	2010-10-16 20:58:00.000000000 +0000
@@ -313,6 +313,11 @@
 #define PCI_CHIP_Q45_G_BRIDGE	0x2E10
 #endif
 
+#ifndef PCI_CHIP_Qx57
+#define PCI_CHIP_Qx57		0x0046
+#define PCI_CHIP_Qx57_G_BRIDGE	0x0044
+#endif
+
 #ifndef PCI_CHIP_G41_G
 #define PCI_CHIP_G41_G		0x2E32
 #define PCI_CHIP_G41_G_BRIDGE	0x2E30
@@ -353,7 +358,7 @@
 #define IS_IGDG(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGD_G)
 #define IS_IGD(pI810) (IS_IGDG(pI810) || IS_IGDGM(pI810))
 #define IS_GM45(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_GM45_GM)
-#define IS_G4X(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGD_E_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_Q45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G41_G || IS_GM45(pI810))
+#define IS_G4X(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGD_E_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_Q45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G41_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_Qx57 || IS_GM45(pI810))
 #define IS_I965GM(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GM || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GME)
 #define IS_965_Q(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_Q)
 #define IS_I965G(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G35_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_Q || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I946_GZ || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GM || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GME || IS_G4X(pI810))
diff -ru intelorig/i810_driver.c intelQx57/i810_driver.c
--- intelorig/i810_driver.c	2010-10-17 07:31:59.000000000 +0000
+++ intelQx57/i810_driver.c	2010-10-17 07:30:37.000000000 +0000
@@ -157,6 +157,7 @@
    INTEL_DEVICE_MATCH (PCI_CHIP_G45_G, 0 ),
    INTEL_DEVICE_MATCH (PCI_CHIP_Q45_G, 0 ),
    INTEL_DEVICE_MATCH (PCI_CHIP_G41_G, 0 ),
+   INTEL_DEVICE_MATCH (PCI_CHIP_Qx57, 0 ),
     { 0, 0, 0 },
 };
 
@@ -215,6 +216,7 @@
    {PCI_CHIP_IGD_E_G,		"Intel Integrated Graphics Device"},
    {PCI_CHIP_G45_G,		"G45/G43"},
    {PCI_CHIP_Q45_G,		"Q45/Q43"},
+   {PCI_CHIP_Qx57,		"QM57/QS57"},
    {PCI_CHIP_G41_G,		"G41"},
    {-1,				NULL}
 };
@@ -252,6 +254,7 @@
    {PCI_CHIP_G45_G,		PCI_CHIP_G45_G,		RES_SHARED_VGA},
    {PCI_CHIP_Q45_G,		PCI_CHIP_Q45_G,		RES_SHARED_VGA},
    {PCI_CHIP_G41_G,		PCI_CHIP_G41_G,		RES_SHARED_VGA},
+   {PCI_CHIP_Qx57,		PCI_CHIP_Qx57,		RES_SHARED_VGA},
    {-1,				-1, RES_UNDEFINED }
 };
 
@@ -741,6 +744,7 @@
 	    case PCI_CHIP_G45_G:
 	    case PCI_CHIP_Q45_G:
 	    case PCI_CHIP_G41_G:
+	    case PCI_CHIP_Qx57:
 	       I830InitpScrn(pScrn);
 	       break;
 #ifndef I830_ONLY
diff -ru intelorig/i830_driver.c intelQx57/i830_driver.c
--- intelorig/i830_driver.c	2010-10-17 07:31:59.000000000 +0000
+++ intelQx57/i830_driver.c	2010-10-17 07:30:37.000000000 +0000
@@ -258,6 +258,7 @@
    {PCI_CHIP_G45_G,		"G45/G43"},
    {PCI_CHIP_Q45_G,		"Q45/Q43"},
    {PCI_CHIP_G41_G,		"G41"},
+   {PCI_CHIP_Qx57,		"QM57/QS57"},
    {-1,				NULL}
 };
 
@@ -288,6 +289,7 @@
    {PCI_CHIP_G45_G,		PCI_CHIP_G45_G,		RES_SHARED_VGA},
    {PCI_CHIP_Q45_G,		PCI_CHIP_Q45_G,		RES_SHARED_VGA},
    {PCI_CHIP_G41_G,		PCI_CHIP_G41_G,		RES_SHARED_VGA},
+   {PCI_CHIP_Qx57,		PCI_CHIP_Qx57,		RES_SHARED_VGA},
    {-1,				-1,			RES_UNDEFINED}
 };
 
@@ -1363,6 +1365,9 @@
     case PCI_CHIP_G41_G:
 	chipname = "G41";
 	break;
+    case PCI_CHIP_Qx57:
+	chipname = "QM57/QS57";
+	break;
    default:
 	chipname = "unknown chipset";
 	break;
diff -ru intelorig/i830_quirks.c intelQx57/i830_quirks.c
--- intelorig/i830_quirks.c	2010-10-17 07:31:59.000000000 +0000
+++ intelQx57/i830_quirks.c	2010-10-17 07:35:45.000000000 +0000
@@ -294,6 +294,7 @@
     { PCI_CHIP_I965_GM, 0x1028, 0x0298, quirk_ignore_tv },
     /* Dell Studio Hybrid */
     { PCI_CHIP_I965_GM, 0x1028, 0x0279, quirk_ignore_lvds },
+    { PCI_CHIP_Qx57,    0x1028, 0x0046, quirk_ignore_tv },
 
     /* Lenovo Napa TV (use dmi)*/
     { PCI_CHIP_I945_GM, 0x17aa, SUBSYS_ANY, quirk_lenovo_tv_dmi },