aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_csr.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/i915/intel_csr.c')
-rw-r--r--drivers/gpu/drm/i915/intel_csr.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index 14cf4c367e36..4aa8f3d6b64c 100644
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -34,6 +34,9 @@
34 * low-power state and comes back to normal. 34 * low-power state and comes back to normal.
35 */ 35 */
36 36
37#define I915_CSR_ICL "i915/icl_dmc_ver1_07.bin"
38#define ICL_CSR_VERSION_REQUIRED CSR_VERSION(1, 7)
39
37#define I915_CSR_GLK "i915/glk_dmc_ver1_04.bin" 40#define I915_CSR_GLK "i915/glk_dmc_ver1_04.bin"
38MODULE_FIRMWARE(I915_CSR_GLK); 41MODULE_FIRMWARE(I915_CSR_GLK);
39#define GLK_CSR_VERSION_REQUIRED CSR_VERSION(1, 4) 42#define GLK_CSR_VERSION_REQUIRED CSR_VERSION(1, 4)
@@ -304,6 +307,8 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
304 if (csr->fw_path == i915_modparams.dmc_firmware_path) { 307 if (csr->fw_path == i915_modparams.dmc_firmware_path) {
305 /* Bypass version check for firmware override. */ 308 /* Bypass version check for firmware override. */
306 required_version = csr->version; 309 required_version = csr->version;
310 } else if (IS_ICELAKE(dev_priv)) {
311 required_version = ICL_CSR_VERSION_REQUIRED;
307 } else if (IS_CANNONLAKE(dev_priv)) { 312 } else if (IS_CANNONLAKE(dev_priv)) {
308 required_version = CNL_CSR_VERSION_REQUIRED; 313 required_version = CNL_CSR_VERSION_REQUIRED;
309 } else if (IS_GEMINILAKE(dev_priv)) { 314 } else if (IS_GEMINILAKE(dev_priv)) {
@@ -471,6 +476,8 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
471 476
472 if (i915_modparams.dmc_firmware_path) 477 if (i915_modparams.dmc_firmware_path)
473 csr->fw_path = i915_modparams.dmc_firmware_path; 478 csr->fw_path = i915_modparams.dmc_firmware_path;
479 else if (IS_ICELAKE(dev_priv))
480 csr->fw_path = I915_CSR_ICL;
474 else if (IS_CANNONLAKE(dev_priv)) 481 else if (IS_CANNONLAKE(dev_priv))
475 csr->fw_path = I915_CSR_CNL; 482 csr->fw_path = I915_CSR_CNL;
476 else if (IS_GEMINILAKE(dev_priv)) 483 else if (IS_GEMINILAKE(dev_priv))