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

Commit 7d87a7f7 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

srm/i915/chv: Add Cherryview PCI IDs 



v2: Update to also fill in the new num_pipes field.

v3: Rebase on top of the pciid extraction.

v4: Switch from info->has*ring to info->ring mask. Also add VEBOX support whiel
at it.

v5: s/CHV_PCI_IDS/CHV_IDS/, and drop the trailing '\'

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent a4565da8

drivers/gpu/drm/i915/i915_drv.c

+11 −1
Original line number Diff line number Diff line
@@ -299,6 +299,15 @@ static const struct intel_device_info intel_broadwell_gt3m_info = { 
	GEN_DEFAULT_PIPEOFFSETS,

};



static const struct intel_device_info intel_cherryview_info = {

	.is_preliminary = 1,

	.gen = 8, .num_pipes = 2,

	.need_gfx_hws = 1, .has_hotplug = 1,

	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING,

	.is_valleyview = 1,

	.display_mmio_offset = VLV_DISPLAY_BASE,

};



/*

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

 * general.  For example, since the Quanta match is based on the subsystem
@@ -334,7 +343,8 @@ static const struct intel_device_info intel_broadwell_gt3m_info = { 
	INTEL_BDW_GT12M_IDS(&intel_broadwell_m_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_BDW_GT3D_IDS(&intel_broadwell_gt3d_info), \

	INTEL_CHV_IDS(&intel_cherryview_info)



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

	INTEL_PCI_IDS,

include/drm/i915_pciids.h

+6 −0
Original line number Diff line number Diff line
@@ -245,4 +245,10 @@ 
	INTEL_BDW_GT12D_IDS(info), \

	INTEL_BDW_GT3D_IDS(info)



#define INTEL_CHV_IDS(info) \

	INTEL_VGA_DEVICE(0x22b0, info), \

	INTEL_VGA_DEVICE(0x22b1, info), \

	INTEL_VGA_DEVICE(0x22b2, info), \

	INTEL_VGA_DEVICE(0x22b3, info)



#endif /* _I915_PCIIDS_H */