drm/i915/DMC/CNL: Load DMC on CNL

This patch loads the DMC on CNL.The firmware version
is 1.04.

v2: (Rodrigo) Remove MODULE_FIRMWARE.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Animesh Manna <animesh.manna@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1497047175-27250-13-git-send-email-rodrigo.vivi@intel.com

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 03b5fe3e303602bd69fa0f482d3f00b6938a0532..506ec32b9e53d68ca22cb8c0144d7a096b331c29 100644 (file)
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -445,6 +445,7 @@ static const struct intel_device_info intel_cannonlake_info = {
        .platform = INTEL_CANNONLAKE,
        .gen = 10,
        .ddb_size = 1024,
+       .has_csr = 1,
 };
 
 /*

diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index fb6af0bcdf8fe8ce1664d8a7d486dae90fdb556c..dedc5dff9fd3a2d9bee93eb72250c29387494053 100644 (file)
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -37,6 +37,9 @@
 #define I915_CSR_GLK "i915/glk_dmc_ver1_04.bin"
 #define GLK_CSR_VERSION_REQUIRED       CSR_VERSION(1, 4)
 
+#define I915_CSR_CNL "i915/cnl_dmc_ver1_04.bin"
+#define CNL_CSR_VERSION_REQUIRED       CSR_VERSION(1, 4)
+
 #define I915_CSR_KBL "i915/kbl_dmc_ver1_01.bin"
 MODULE_FIRMWARE(I915_CSR_KBL);
 #define KBL_CSR_VERSION_REQUIRED       CSR_VERSION(1, 1)
@@ -289,7 +292,9 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
 
        csr->version = css_header->version;
 
-       if (IS_GEMINILAKE(dev_priv)) {
+       if (IS_CANNONLAKE(dev_priv)) {
+               required_version = CNL_CSR_VERSION_REQUIRED;
+       } else if (IS_GEMINILAKE(dev_priv)) {
                required_version = GLK_CSR_VERSION_REQUIRED;
        } else if (IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv)) {
                required_version = KBL_CSR_VERSION_REQUIRED;
@@ -438,7 +443,9 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
        if (!HAS_CSR(dev_priv))
                return;
 
-       if (IS_GEMINILAKE(dev_priv))
+       if (IS_CANNONLAKE(dev_priv))
+               csr->fw_path = I915_CSR_CNL;
+       else if (IS_GEMINILAKE(dev_priv))
                csr->fw_path = I915_CSR_GLK;
        else if (IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv))
                csr->fw_path = I915_CSR_KBL;