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

Commit 30568c45 authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

drm/i915: Turn HAS_FPGA_DBG_UNCLAIMED into a device_info flag 



Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e76ebff8

drivers/gpu/drm/i915/i915_drv.c

+2 −0
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ static const struct intel_device_info intel_haswell_d_info = { 
	GEN7_FEATURES,

	.is_haswell = 1,

	.has_ddi = 1,

	.has_fpga_dbg = 1,

};



static const struct intel_device_info intel_haswell_m_info = {
@@ -316,6 +317,7 @@ static const struct intel_device_info intel_haswell_m_info = { 
	.is_haswell = 1,

	.is_mobile = 1,

	.has_ddi = 1,

	.has_fpga_dbg = 1,

};



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

drivers/gpu/drm/i915/i915_drv.h

+3 −2
Original line number Diff line number Diff line
@@ -358,7 +358,8 @@ struct drm_i915_gt_funcs { 
	func(has_bsd_ring) sep \

	func(has_blt_ring) sep \

	func(has_llc) sep \

	func(has_ddi)

	func(has_ddi) sep \

	func(has_fpga_dbg)



#define DEFINE_FLAG(name) u8 name:1

#define SEP_SEMICOLON ;
@@ -1370,7 +1371,7 @@ struct drm_i915_file_private { 


#define HAS_DDI(dev)		(INTEL_INFO(dev)->has_ddi)

#define HAS_POWER_WELL(dev)	(IS_HASWELL(dev))

#define HAS_FPGA_DBG_UNCLAIMED(dev)	(IS_HASWELL(dev))

#define HAS_FPGA_DBG_UNCLAIMED(dev)	(INTEL_INFO(dev)->has_fpga_dbg)



#define INTEL_PCH_DEVICE_ID_MASK		0xff00

#define INTEL_PCH_IBX_DEVICE_ID_TYPE		0x3b00