drm/i915/DMC/GLK: Load DMC on GLK
authorAnusha Srivatsa <anusha.srivatsa@intel.com>
Fri, 16 Dec 2016 15:42:24 +0000 (17:42 +0200)
committerAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Tue, 10 Jan 2017 09:03:56 +0000 (11:03 +0200)
This patch loads the DMC on GLK. There is a single
firmware image for all steppings on a GLK.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1481902946-18593-1-git-send-email-ander.conselvan.de.oliveira@intel.com
drivers/gpu/drm/i915/intel_csr.c

index 9cbb8d8363b4486cdb57d05f0c3e3c4b8db5d103..0085bc745f6aa5256cf21c1ae76dd2cbce80e387 100644 (file)
  * low-power state and comes back to normal.
  */
 
+#define I915_CSR_GLK "i915/glk_dmc_ver1_01.bin"
+MODULE_FIRMWARE(I915_CSR_GLK);
+#define GLK_CSR_VERSION_REQUIRED       CSR_VERSION(1, 1)
+
 #define I915_CSR_KBL "i915/kbl_dmc_ver1_01.bin"
 MODULE_FIRMWARE(I915_CSR_KBL);
 #define KBL_CSR_VERSION_REQUIRED       CSR_VERSION(1, 1)
@@ -286,7 +290,9 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
 
        csr->version = css_header->version;
 
-       if (IS_KABYLAKE(dev_priv)) {
+       if (IS_GEMINILAKE(dev_priv)) {
+               required_version = GLK_CSR_VERSION_REQUIRED;
+       } else if (IS_KABYLAKE(dev_priv)) {
                required_version = KBL_CSR_VERSION_REQUIRED;
        } else if (IS_SKYLAKE(dev_priv)) {
                required_version = SKL_CSR_VERSION_REQUIRED;
@@ -435,7 +441,9 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
        if (!HAS_CSR(dev_priv))
                return;
 
-       if (IS_KABYLAKE(dev_priv))
+       if (IS_GEMINILAKE(dev_priv))
+               csr->fw_path = I915_CSR_GLK;
+       else if (IS_KABYLAKE(dev_priv))
                csr->fw_path = I915_CSR_KBL;
        else if (IS_SKYLAKE(dev_priv))
                csr->fw_path = I915_CSR_SKL;