Commit e91eec91 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

Revert "drm/i915: Drop has_dp_mst from device info" 



This reverts commit eb86f645.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Acked-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220519090802.1294691-3-tvrtko.ursulin@linux.intel.com
parent 9602efab

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -1289,13 +1289,13 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, 


#define HAS_IPS(dev_priv)	(IS_HSW_ULT(dev_priv) || IS_BROADWELL(dev_priv))



#define HAS_DP_MST(dev_priv)	(INTEL_INFO(dev_priv)->display.has_dp_mst)

#define HAS_DP20(dev_priv)	(IS_DG2(dev_priv))



#define HAS_CDCLK_CRAWL(dev_priv)	 (INTEL_INFO(dev_priv)->display.has_cdclk_crawl)

#define HAS_DDI(dev_priv)		 (DISPLAY_VER(dev_priv) >= 9 || \

					  IS_BROADWELL(dev_priv) || \

					  IS_HASWELL(dev_priv))

#define HAS_DP_MST(dev_priv)		 (HAS_DDI(dev_priv))

#define HAS_FPGA_DBG_UNCLAIMED(dev_priv) (INTEL_INFO(dev_priv)->display.has_fpga_dbg)

#define HAS_PSR(dev_priv)		 (INTEL_INFO(dev_priv)->display.has_psr)

#define HAS_PSR_HW_TRACKING(dev_priv) \

drivers/gpu/drm/i915/i915_pci.c

+3 −0
Original line number Diff line number Diff line
@@ -536,6 +536,7 @@ static const struct intel_device_info vlv_info = { 
	.display.cpu_transcoder_mask = BIT(TRANSCODER_A) | BIT(TRANSCODER_B) | \

		BIT(TRANSCODER_C) | BIT(TRANSCODER_EDP), \

	.display.has_fpga_dbg = 1, \

	.display.has_dp_mst = 1, \

	.has_rc6p = 0 /* RC6p removed-by HSW */, \

	HSW_PIPE_OFFSETS, \

	.has_runtime_pm = 1
@@ -689,6 +690,7 @@ static const struct intel_device_info skl_gt4_info = { 
	.has_runtime_pm = 1, \

	.display.has_dmc = 1, \

	.has_rps = true, \

	.display.has_dp_mst = 1, \

	.has_logical_ring_contexts = 1, \

	.dma_mask_size = 39, \

	.ppgtt_type = INTEL_PPGTT_FULL, \
@@ -929,6 +931,7 @@ static const struct intel_device_info adl_s_info = { 
	.dbuf.slice_mask = BIT(DBUF_S1) | BIT(DBUF_S2) | BIT(DBUF_S3) |		\

		BIT(DBUF_S4),							\

	.display.has_dmc = 1,							\

	.display.has_dp_mst = 1,						\

	.display.has_dsb = 1,							\

	.display.has_dsc = 1,							\

	.display.fbc_mask = BIT(INTEL_FBC_A),					\

drivers/gpu/drm/i915/intel_device_info.h

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ enum intel_ppgtt_type { 
	func(cursor_needs_physical); \

	func(has_cdclk_crawl); \

	func(has_dmc); \

	func(has_dp_mst); \

	func(has_dsb); \

	func(has_dsc); \

	func(has_fpga_dbg); \