drm/i915: Add support for mobile Haswell SDVs.
diff mbox

Message ID 1343088706-15830-1-git-send-email-sarvatt@ubuntu.com
State New, archived
Headers show

Commit Message

Robert Hooker July 24, 2012, 12:11 a.m. UTC
From: Robert Hooker <robert.hooker@canonical.com>

Mobile variants have a different pci id. Add it, and mark the previous
pci id as a desktop variant.

Signed-off-by: Robert Hooker <robert.hooker@canonical.com>
---
 drivers/char/agp/intel-agp.h    |    3 ++-
 drivers/char/agp/intel-gtt.c    |    4 +++-
 drivers/gpu/drm/i915/i915_drv.c |    1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

Comments

Robert Hooker July 24, 2012, 4:46 a.m. UTC | #1
it seems this is wrong and desktop haswell SDPs are 8086:0c02, low end
mobile (?) is 8086:0c16 (which is currently in there marked as a
desktop version) and 8086:0c26 is high end mobile parts. can anyone
confirm that? I've only seen 8086:0c02 and 8086:0c26 versions and was
just assuming 8086:0c16 was desktop because it was marked as such but
that doesn't fit with the previous naming convention.

Patch
diff mbox

diff --git a/drivers/char/agp/intel-agp.h b/drivers/char/agp/intel-agp.h
index 8e2d914..1fcd728 100644
--- a/drivers/char/agp/intel-agp.h
+++ b/drivers/char/agp/intel-agp.h
@@ -248,7 +248,8 @@ 
 #define PCI_DEVICE_ID_INTEL_HASWELL_S_HB			0x0408 /* Server */
 #define PCI_DEVICE_ID_INTEL_HASWELL_S_GT1_IG		0x040a
 #define PCI_DEVICE_ID_INTEL_HASWELL_S_GT2_IG		0x041a
-#define PCI_DEVICE_ID_INTEL_HASWELL_SDV		0x0c16 /* SDV */
+#define PCI_DEVICE_ID_INTEL_HASWELL_D_SDV		0x0c16 /* Desktop SDV */
+#define PCI_DEVICE_ID_INTEL_HASWELL_M_SDV		0x0c26 /* Mobile SDV */
 #define PCI_DEVICE_ID_INTEL_HASWELL_E_HB			0x0c04
 
 int intel_gmch_probe(struct pci_dev *pdev,
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 1237e75..1f756dc 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -1501,7 +1501,9 @@  static const struct intel_gtt_driver_description {
 	    "Haswell", &sandybridge_gtt_driver },
 	{ PCI_DEVICE_ID_INTEL_HASWELL_S_GT2_IG,
 	    "Haswell", &sandybridge_gtt_driver },
-	{ PCI_DEVICE_ID_INTEL_HASWELL_SDV,
+	{ PCI_DEVICE_ID_INTEL_HASWELL_D_SDV,
+	    "Haswell", &sandybridge_gtt_driver },
+	{ PCI_DEVICE_ID_INTEL_HASWELL_M_SDV,
 	    "Haswell", &sandybridge_gtt_driver },
 	{ 0, NULL, NULL }
 };
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 9fe9ebe..f4fe01c 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -358,6 +358,7 @@  static const struct pci_device_id pciidlist[] = {		/* aka */
 	INTEL_VGA_DEVICE(0x0406, &intel_haswell_m_info), /* GT1 mobile */
 	INTEL_VGA_DEVICE(0x0416, &intel_haswell_m_info), /* GT2 mobile */
 	INTEL_VGA_DEVICE(0x0c16, &intel_haswell_d_info), /* SDV */
+	INTEL_VGA_DEVICE(0x0c26, &intel_haswell_m_info), /* Mobile SDV */
 	{0, 0, 0}
 };