Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72bbf0af authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

drm/i915/skl: Add the Skylake PCI ids 



v2: Squash in 2nd patch from Damien for more ids (Daniel)
v3: info->has*ring -> info->ring_mask conversion. Also add VEBOX support.
v4: Fold in update from Damien
v5: Rebase and add GEN_DEFAULT_PIPEOFFSETS
v6: Add more PCI ID (Vandana)
v7: Rebase and add IVB_CURSOR_OFFSETS
v8: Renamed the macro from _PCI_IDS to _IDS for consistency

Reviewed-by: default avatarThomas Wood <thomas.wood@intel.com>
Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarVandana Kannan <vandana.kannan@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent d743ecf3

drivers/gpu/drm/i915/i915_drv.c

+13 −1
Original line number Diff line number Diff line
@@ -356,6 +356,17 @@ static const struct intel_device_info intel_cherryview_info = { 
	CURSOR_OFFSETS,

};



static const struct intel_device_info intel_skylake_info = {

	.is_preliminary = 1,

	.gen = 9, .num_pipes = 3,

	.need_gfx_hws = 1, .has_hotplug = 1,

	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING,

	.has_llc = 1,

	.has_ddi = 1,

	GEN_DEFAULT_PIPEOFFSETS,

	IVB_CURSOR_OFFSETS,

};



/*

 * Make sure any device matches here are from most specific to most

 * general.  For example, since the Quanta match is based on the subsystem
@@ -392,7 +403,8 @@ static const struct intel_device_info intel_cherryview_info = { 
	INTEL_BDW_GT12D_IDS(&intel_broadwell_d_info),	\

	INTEL_BDW_GT3M_IDS(&intel_broadwell_gt3m_info),	\

	INTEL_BDW_GT3D_IDS(&intel_broadwell_gt3d_info), \

	INTEL_CHV_IDS(&intel_cherryview_info)

	INTEL_CHV_IDS(&intel_cherryview_info),	\

	INTEL_SKL_IDS(&intel_skylake_info)



static const struct pci_device_id pciidlist[] = {		/* aka */

	INTEL_PCI_IDS,

include/drm/i915_pciids.h

+17 −0
Original line number Diff line number Diff line
@@ -259,4 +259,21 @@ 
	INTEL_VGA_DEVICE(0x22b2, info), \

	INTEL_VGA_DEVICE(0x22b3, info)



#define INTEL_SKL_IDS(info) \

	INTEL_VGA_DEVICE(0x1916, info), /* ULT GT2 */ \

	INTEL_VGA_DEVICE(0x1906, info), /* ULT GT1 */ \

	INTEL_VGA_DEVICE(0x1926, info), /* ULT GT3 */ \

	INTEL_VGA_DEVICE(0x1921, info), /* ULT GT2F */ \

	INTEL_VGA_DEVICE(0x190E, info), /* ULX GT1 */ \

	INTEL_VGA_DEVICE(0x191E, info), /* ULX GT2 */ \

	INTEL_VGA_DEVICE(0x1912, info), /* DT  GT2 */ \

	INTEL_VGA_DEVICE(0x1902, info), /* DT  GT1 */ \

	INTEL_VGA_DEVICE(0x191B, info), /* Halo GT2 */ \

	INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3 */ \

	INTEL_VGA_DEVICE(0x190B, info), /* Halo GT1 */ \

	INTEL_VGA_DEVICE(0x191A, info), /* SRV GT2 */ \

	INTEL_VGA_DEVICE(0x192A, info), /* SRV GT3 */ \

	INTEL_VGA_DEVICE(0x190A, info), /* SRV GT1 */ \

	INTEL_VGA_DEVICE(0x191D, info)  /* WKS GT2 */



#endif /* _I915_PCIIDS_H */