drm/i915/rkl: Load DMC firmware for Rocket Lake

Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200504225227.464666-5-matthew.d.roper@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_csr.c b/drivers/gpu/drm/i915/display/intel_csr.c
index 3112572cfb7dbc3875c12305f7d1cb5458280043..319932b03e8838869b84e3ba39b15daa9e0a75d4 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_csr.c
+++ b/drivers/gpu/drm/i915/display/intel_csr.c
@@ -40,6 +40,10 @@
 
 #define GEN12_CSR_MAX_FW_SIZE          ICL_CSR_MAX_FW_SIZE
 
+#define RKL_CSR_PATH                   "i915/rkl_dmc_ver2_01.bin"
+#define RKL_CSR_VERSION_REQUIRED       CSR_VERSION(2, 1)
+MODULE_FIRMWARE(RKL_CSR_PATH);
+
 #define TGL_CSR_PATH                   "i915/tgl_dmc_ver2_06.bin"
 #define TGL_CSR_VERSION_REQUIRED       CSR_VERSION(2, 6)
 #define TGL_CSR_MAX_FW_SIZE            0x6000
@@ -682,7 +686,11 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
         */
        intel_csr_runtime_pm_get(dev_priv);
 
-       if (INTEL_GEN(dev_priv) >= 12) {
+       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 */