summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-01-15 12:51:50 -0800
committerEric Anholt <eric@anholt.net>2010-02-23 17:09:25 -0800
commit9291828a569a01ed4a6ef71f530b93f8a54c84aa (patch)
treed2a4191ab632cc520cabb4a61236a65743054569
parent3c71f98b9e5262675e61fafb317d0c35e62a873f (diff)
Add new mobile Sandybridge PCI IDs.
-rw-r--r--src/common.h5
-rw-r--r--src/i810_driver.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/src/common.h b/src/common.h
index fc51cdef..bc5d7220 100644
--- a/src/common.h
+++ b/src/common.h
@@ -325,12 +325,14 @@ extern int I810_DEBUG;
#define PCI_CHIP_IGDNG_M_G_BRIDGE 0x0044
#endif
#ifndef PCI_CHIP_SANDYBRIDGE
#define PCI_CHIP_SANDYBRIDGE 0x0102
#define PCI_CHIP_SANDYBRIDGE_BRIDGE 0x0100
+#define PCI_CHIP_SANDYBRIDGE_M 0x0106
+#define PCI_CHIP_SANDYBRIDGE_BRIDGE_M 0x0104
#endif
#define I810_MEMBASE(p,n) (p)->regions[(n)].base_addr
#define VENDOR_ID(p) (p)->vendor_id
#define DEVICE_ID(p) (p)->device_id
#define SUBVENDOR_ID(p) (p)->subvendor_id
@@ -382,13 +384,14 @@ extern int I810_DEBUG;
IS_I945GM(pI810) || \
IS_I965G(pI810) || \
IS_G33CLASS(pI810))
#define IS_I915(pI810) (IS_I915G(pI810) || IS_I915GM(pI810) || IS_I945G(pI810) || IS_I945GM(pI810) || IS_G33CLASS(pI810))
-#define IS_GEN6(pI810) ((pI810)->PciInfo->device_id == PCI_CHIP_SANDYBRIDGE)
+#define IS_GEN6(pI810) ((pI810)->PciInfo->device_id == PCI_CHIP_SANDYBRIDGE || \
+ (pI810)->PciInfo->device_id == PCI_CHIP_SANDYBRIDGE_M)
#define IS_MOBILE(pI810) (IS_I830(pI810) || IS_I85X(pI810) || IS_I915GM(pI810) || IS_I945GM(pI810) || IS_I965GM(pI810) || IS_GM45(pI810) || IS_IGD(pI810) || IS_IGDNG_M(pI810))
/* supports Y tiled surfaces (pre-965 Mesa isn't ready yet) */
#define SUPPORTS_YTILING(pI810) (IS_I965G(intel))
#define GTT_PAGE_SIZE KB(4)
diff --git a/src/i810_driver.c b/src/i810_driver.c
index ba1ded73..31098340 100644
--- a/src/i810_driver.c
+++ b/src/i810_driver.c
@@ -138,12 +138,13 @@ static const struct pci_id_match intel_device_match[] = {
INTEL_DEVICE_MATCH (PCI_CHIP_Q45_G, 0 ),
INTEL_DEVICE_MATCH (PCI_CHIP_G41_G, 0 ),
INTEL_DEVICE_MATCH (PCI_CHIP_B43_G, 0 ),
INTEL_DEVICE_MATCH (PCI_CHIP_IGDNG_D_G, 0 ),
INTEL_DEVICE_MATCH (PCI_CHIP_IGDNG_M_G, 0 ),
INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE, 0 ),
+ INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_M, 0 ),
{ 0, 0, 0 },
};
_X_EXPORT DriverRec I810 = {
I810_VERSION,
I810_DRIVER_NAME,