Commit 5de6a3de authored by Madhumitha Tolakanahalli Pradeep's avatar Madhumitha Tolakanahalli Pradeep Committed by Lucas De Marchi
Browse files

drm/i915/dmc: Eliminate remnant GEN<n> references 



Replace GEN<n> with DISPLAY_VER<n>, in line with the naming convention
followed in the i915 driver code.

Signed-off-by: default avatarMadhumitha Tolakanahalli Pradeep <madhumitha.tolakanahalli.pradeep@intel.com>
Reviewed-by: default avatarCaz Yokoyama <caz.yokoyama@intel.com>
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211217034141.198033-1-madhumitha.tolakanahalli.pradeep@intel.com
parent 27535f1d

drivers/gpu/drm/i915/display/intel_dmc.c

+7 −7
Original line number Diff line number Diff line
@@ -43,9 +43,9 @@ 
	__stringify(major) "_"		 \

	__stringify(minor) ".bin"



#define GEN12_DMC_MAX_FW_SIZE		ICL_DMC_MAX_FW_SIZE

#define DISPLAY_VER13_DMC_MAX_FW_SIZE	0x20000



#define GEN13_DMC_MAX_FW_SIZE		0x20000

#define DISPLAY_VER12_DMC_MAX_FW_SIZE	ICL_DMC_MAX_FW_SIZE



#define ADLP_DMC_PATH			DMC_PATH(adlp, 2, 14)

#define ADLP_DMC_VERSION_REQUIRED	DMC_VERSION(2, 14)
@@ -684,23 +684,23 @@ void intel_dmc_ucode_init(struct drm_i915_private *dev_priv) 
	if (IS_ALDERLAKE_P(dev_priv)) {

		dmc->fw_path = ADLP_DMC_PATH;

		dmc->required_version = ADLP_DMC_VERSION_REQUIRED;

		dmc->max_fw_size = GEN13_DMC_MAX_FW_SIZE;

		dmc->max_fw_size = DISPLAY_VER13_DMC_MAX_FW_SIZE;

	} else if (IS_ALDERLAKE_S(dev_priv)) {

		dmc->fw_path = ADLS_DMC_PATH;

		dmc->required_version = ADLS_DMC_VERSION_REQUIRED;

		dmc->max_fw_size = GEN12_DMC_MAX_FW_SIZE;

		dmc->max_fw_size = DISPLAY_VER12_DMC_MAX_FW_SIZE;

	} else if (IS_DG1(dev_priv)) {

		dmc->fw_path = DG1_DMC_PATH;

		dmc->required_version = DG1_DMC_VERSION_REQUIRED;

		dmc->max_fw_size = GEN12_DMC_MAX_FW_SIZE;

		dmc->max_fw_size = DISPLAY_VER12_DMC_MAX_FW_SIZE;

	} else if (IS_ROCKETLAKE(dev_priv)) {

		dmc->fw_path = RKL_DMC_PATH;

		dmc->required_version = RKL_DMC_VERSION_REQUIRED;

		dmc->max_fw_size = GEN12_DMC_MAX_FW_SIZE;

		dmc->max_fw_size = DISPLAY_VER12_DMC_MAX_FW_SIZE;

	} else if (DISPLAY_VER(dev_priv) >= 12) {

		dmc->fw_path = TGL_DMC_PATH;

		dmc->required_version = TGL_DMC_VERSION_REQUIRED;

		dmc->max_fw_size = GEN12_DMC_MAX_FW_SIZE;

		dmc->max_fw_size = DISPLAY_VER12_DMC_MAX_FW_SIZE;

	} else if (DISPLAY_VER(dev_priv) == 11) {

		dmc->fw_path = ICL_DMC_PATH;

		dmc->required_version = ICL_DMC_VERSION_REQUIRED;