drm/i915: hook Haswell devices in place

This patch enables i915 driver to handle Haswell devices. It should go in
last, when things are working stable enough.

Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

2 files changed, 11 insertions, 0 deletions

diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 74c2d9274c53..764f70c5e690 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -908,6 +908,10 @@ static struct pci_device_id agp_intel_pci_table[] = {
         ID(PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_HB),
         ID(PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_HB),
         ID(PCI_DEVICE_ID_INTEL_VALLEYVIEW_HB),
+        ID(PCI_DEVICE_ID_INTEL_HASWELL_HB),
+        ID(PCI_DEVICE_ID_INTEL_HASWELL_M_HB),
+        ID(PCI_DEVICE_ID_INTEL_HASWELL_S_HB),
+        ID(PCI_DEVICE_ID_INTEL_HASWELL_E_HB),
         { }
 };
 
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 88d329088927..f0763f29aef8 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -345,6 +345,13 @@ static const struct pci_device_id pciidlist[] = {		/* aka */
         INTEL_VGA_DEVICE(0x0162, &intel_ivybridge_d_info), /* GT2 desktop */
         INTEL_VGA_DEVICE(0x015a, &intel_ivybridge_d_info), /* GT1 server */
         INTEL_VGA_DEVICE(0x016a, &intel_ivybridge_d_info), /* GT2 server */
+        INTEL_VGA_DEVICE(0x0402, &intel_haswell_d_info), /* GT1 desktop */
+        INTEL_VGA_DEVICE(0x0412, &intel_haswell_d_info), /* GT2 desktop */
+        INTEL_VGA_DEVICE(0x040a, &intel_haswell_d_info), /* GT1 server */
+        INTEL_VGA_DEVICE(0x041a, &intel_haswell_d_info), /* GT2 server */
+        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 */
         {0, 0, 0}
 };