Commit e26700fc authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: move has_dmc to runtime info 



If it's modified runtime, it's runtime info.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarMaarten Lankhort <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/b8f69cd1b6114295826c1f88be27e867c91f7df4.1660910433.git.jani.nikula@intel.com
parent 7578fc4d

drivers/gpu/drm/i915/i915_drv.h

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


#define HAS_RPS(dev_priv)	(INTEL_INFO(dev_priv)->has_rps)



#define HAS_DMC(dev_priv)	(INTEL_INFO(dev_priv)->display.has_dmc)

#define HAS_DMC(dev_priv)	(RUNTIME_INFO(dev_priv)->has_dmc)



#define HAS_HECI_PXP(dev_priv) \

	(INTEL_INFO(dev_priv)->has_heci_pxp)

drivers/gpu/drm/i915/i915_pci.c

+3 −3
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ static const struct intel_device_info chv_info = { 
	GEN8_FEATURES, \

	GEN(9), \

	GEN9_DEFAULT_PAGE_SIZES, \

	.display.has_dmc = 1, \

	.__runtime.has_dmc = 1, \

	.has_gt_uc = 1, \

	.__runtime.has_hdcp = 1, \

	.display.has_ipc = 1, \
@@ -712,7 +712,7 @@ static const struct intel_device_info skl_gt4_info = { 
	.display.has_psr = 1, \

	.display.has_psr_hw_tracking = 1, \

	.has_runtime_pm = 1, \

	.display.has_dmc = 1, \

	.__runtime.has_dmc = 1, \

	.has_rc6 = 1, \

	.has_rps = true, \

	.display.has_dp_mst = 1, \
@@ -952,7 +952,7 @@ static const struct intel_device_info adl_s_info = { 
	.display.dbuf.slice_mask = BIT(DBUF_S1) | BIT(DBUF_S2) | BIT(DBUF_S3) |	\

		BIT(DBUF_S4),							\

	.display.has_ddi = 1,							\

	.display.has_dmc = 1,							\

	.__runtime.has_dmc = 1,							\

	.display.has_dp_mst = 1,						\

	.display.has_dsb = 1,							\

	.display.has_dsc = 1,							\

drivers/gpu/drm/i915/intel_device_info.c

+2 −1
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ void intel_device_info_print(const struct intel_device_info *info, 
#undef PRINT_FLAG



	drm_printf(p, "has_hdcp: %s\n", str_yes_no(runtime->has_hdcp));

	drm_printf(p, "has_dmc: %s\n", str_yes_no(runtime->has_dmc));



	drm_printf(p, "rawclk rate: %u kHz\n", runtime->rawclk_freq);

}
@@ -403,7 +404,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv) 
			runtime->fbc_mask = 0;



		if (DISPLAY_VER(dev_priv) >= 11 && (dfsm & ICL_DFSM_DMC_DISABLE))

			info->display.has_dmc = 0;

			runtime->has_dmc = 0;



		if (DISPLAY_VER(dev_priv) >= 10 &&

		    (dfsm & GLK_DFSM_DISPLAY_DSC_DISABLE))

drivers/gpu/drm/i915/intel_device_info.h

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ enum intel_ppgtt_type { 
	/* Keep in alphabetical order */ \

	func(cursor_needs_physical); \

	func(has_cdclk_crawl); \

	func(has_dmc); \

	func(has_ddi); \

	func(has_dp_mst); \

	func(has_dsb); \
@@ -241,6 +240,7 @@ struct intel_runtime_info { 
		u8 fbc_mask;



		bool has_hdcp;

		bool has_dmc;

	};

};