Commit 123f62de authored by Matt Roper's avatar Matt Roper Committed by Lucas De Marchi
Browse files

drm/i915/rkl: Add RKL platform info and PCI ids 



Introduce the basic platform definition, macros, and PCI IDs.

Bspec: 44501
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Caz Yokoyama <caz.yokoyama@intel.com>
Cc: Aditya Swarup <aditya.swarup@intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Acked-by: default avatarCaz Yokoyama <caz.yokoyama@intel.com>
Reviewed-by: default avatarAnusha Srivatsa <anusha.srivatsa@intel.com>
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200504225227.464666-2-matthew.d.roper@intel.com
parent 6ad249ba

drivers/gpu/drm/i915/i915_drv.h

+8 −0
Original line number Diff line number Diff line
@@ -1414,6 +1414,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, 
#define IS_ICELAKE(dev_priv)	IS_PLATFORM(dev_priv, INTEL_ICELAKE)

#define IS_ELKHARTLAKE(dev_priv)	IS_PLATFORM(dev_priv, INTEL_ELKHARTLAKE)

#define IS_TIGERLAKE(dev_priv)	IS_PLATFORM(dev_priv, INTEL_TIGERLAKE)

#define IS_ROCKETLAKE(dev_priv)	IS_PLATFORM(dev_priv, INTEL_ROCKETLAKE)

#define IS_HSW_EARLY_SDV(dev_priv) (IS_HASWELL(dev_priv) && \

				    (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00)

#define IS_BDW_ULT(dev_priv) \
@@ -1527,6 +1528,13 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, 
#define IS_TGL_REVID(p, since, until) \

	(IS_TIGERLAKE(p) && IS_REVID(p, since, until))



#define RKL_REVID_A0		0x0

#define RKL_REVID_B0		0x1

#define RKL_REVID_C0		0x4



#define IS_RKL_REVID(p, since, until) \

	(IS_ROCKETLAKE(p) && IS_REVID(p, since, until))



#define IS_LP(dev_priv)	(INTEL_INFO(dev_priv)->is_lp)

#define IS_GEN9_LP(dev_priv)	(IS_GEN(dev_priv, 9) && IS_LP(dev_priv))

#define IS_GEN9_BC(dev_priv)	(IS_GEN(dev_priv, 9) && !IS_LP(dev_priv))

drivers/gpu/drm/i915/i915_pci.c

+10 −0
Original line number Diff line number Diff line
@@ -863,6 +863,15 @@ static const struct intel_device_info tgl_info = { 
		BIT(RCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VCS0) | BIT(VCS2),

};



static const struct intel_device_info rkl_info = {

	GEN12_FEATURES,

	PLATFORM(INTEL_ROCKETLAKE),

	.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B) | BIT(PIPE_C),

	.require_force_probe = 1,

	.engine_mask =

		BIT(RCS0) | BIT(BCS0) | BIT(VECS0) | BIT(VCS0),

};



#define GEN12_DGFX_FEATURES \

	GEN12_FEATURES, \

	.is_dgfx = 1
@@ -941,6 +950,7 @@ static const struct pci_device_id pciidlist[] = { 
	INTEL_ICL_11_IDS(&icl_info),

	INTEL_EHL_IDS(&ehl_info),

	INTEL_TGL_12_IDS(&tgl_info),

	INTEL_RKL_IDS(&rkl_info),

	{0, 0, 0}

};

MODULE_DEVICE_TABLE(pci, pciidlist);

drivers/gpu/drm/i915/intel_device_info.c

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ static const char * const platform_names[] = { 
	PLATFORM_NAME(ICELAKE),

	PLATFORM_NAME(ELKHARTLAKE),

	PLATFORM_NAME(TIGERLAKE),

	PLATFORM_NAME(ROCKETLAKE),

};

#undef PLATFORM_NAME

drivers/gpu/drm/i915/intel_device_info.h

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ enum intel_platform { 
	INTEL_ELKHARTLAKE,

	/* gen12 */

	INTEL_TIGERLAKE,

	INTEL_ROCKETLAKE,

	INTEL_MAX_PLATFORMS

};

include/drm/i915_pciids.h

+9 −0
Original line number Diff line number Diff line
@@ -605,4 +605,13 @@ 
	INTEL_VGA_DEVICE(0x9AD9, info), \

	INTEL_VGA_DEVICE(0x9AF8, info)



/* RKL */

#define INTEL_RKL_IDS(info) \

	INTEL_VGA_DEVICE(0x4C80, info), \

	INTEL_VGA_DEVICE(0x4C8A, info), \

	INTEL_VGA_DEVICE(0x4C8B, info), \

	INTEL_VGA_DEVICE(0x4C8C, info), \

	INTEL_VGA_DEVICE(0x4C90, info), \

	INTEL_VGA_DEVICE(0x4C9A, info)



#endif /* _I915_PCIIDS_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE