Commit bb4c3cf8 authored by Matt Atwood's avatar Matt Atwood Committed by Lucas De Marchi
Browse files

drm/i915/dg1: Load DMC 



Add support to load DMC v2.0.2 on DG1

While we're at it, make TGL use the same GEN12 firmware size definition
and remove obsolete comment.

Bpec: 49230

v2: do not replace GEN12_CSR_MAX_FW_SIZE (from José)
    and replace stale comment

Cc: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarMatt Atwood <matthew.s.atwood@intel.com>
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201014191937.1266226-7-lucas.demarchi@intel.com
parent 0dac17af

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

+9 −3
Original line number Diff line number Diff line
@@ -40,13 +40,16 @@ 


#define GEN12_CSR_MAX_FW_SIZE		ICL_CSR_MAX_FW_SIZE



#define DG1_CSR_PATH			"i915/dg1_dmc_ver2_02.bin"

#define DG1_CSR_VERSION_REQUIRED	CSR_VERSION(2, 2)

MODULE_FIRMWARE(DG1_CSR_PATH);



#define RKL_CSR_PATH			"i915/rkl_dmc_ver2_02.bin"

#define RKL_CSR_VERSION_REQUIRED	CSR_VERSION(2, 2)

MODULE_FIRMWARE(RKL_CSR_PATH);



#define TGL_CSR_PATH			"i915/tgl_dmc_ver2_08.bin"

#define TGL_CSR_VERSION_REQUIRED	CSR_VERSION(2, 8)

#define TGL_CSR_MAX_FW_SIZE		0x6000

MODULE_FIRMWARE(TGL_CSR_PATH);



#define ICL_CSR_PATH			"i915/icl_dmc_ver1_09.bin"
@@ -686,14 +689,17 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv) 
	 */

	intel_csr_runtime_pm_get(dev_priv);



	if (IS_ROCKETLAKE(dev_priv)) {

	if (IS_DG1(dev_priv)) {

		csr->fw_path = DG1_CSR_PATH;

		csr->required_version = DG1_CSR_VERSION_REQUIRED;

		csr->max_fw_size = GEN12_CSR_MAX_FW_SIZE;

	} else if (IS_ROCKETLAKE(dev_priv)) {

		csr->fw_path = RKL_CSR_PATH;

		csr->required_version = RKL_CSR_VERSION_REQUIRED;

		csr->max_fw_size = GEN12_CSR_MAX_FW_SIZE;

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

		csr->fw_path = TGL_CSR_PATH;

		csr->required_version = TGL_CSR_VERSION_REQUIRED;

		/* Allow to load fw via parameter using the last known size */

		csr->max_fw_size = GEN12_CSR_MAX_FW_SIZE;

	} else if (IS_GEN(dev_priv, 11)) {

		csr->fw_path = ICL_CSR_PATH;

CRA Git | Maintained and supported by SUSTech CRA and CCSE