Commit c14f5286 authored by Eugeni Dodonov's avatar Eugeni Dodonov Committed by Daniel Vetter
Browse files

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: default avatarEugeni Dodonov <eugeni.dodonov@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 72662e10

drivers/char/agp/intel-agp.c

+4 −0
Original line number Diff line number Diff line
@@ -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),

	{ }

};

drivers/gpu/drm/i915/i915_drv.c

+7 −0
Original line number Diff line number Diff line
@@ -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}

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE