drm/i915/cfl: Coffee Lake reuses Kabylake DMC.

both platforms. We haven't recieved any separated release
specifically for Coffee Lake so let's just re-use what
is already there for Kabylake.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1497038550-30910-1-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 e38ff1436d83e777aadd0c8e6439481f543b1f81..03b5fe3e303602bd69fa0f482d3f00b6938a0532 100644 (file)
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -426,6 +426,7 @@ static const struct intel_device_info intel_kabylake_gt3_info = {
        BDW_FEATURES, \
        .gen = 9, \
        .platform = INTEL_COFFEELAKE, \
+       .has_csr = 1, \
        .has_guc = 1, \
        .ddb_size = 896
 

diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index 1575bde0cf909cc6f73838b5eced4db230ede929..fb6af0bcdf8fe8ce1664d8a7d486dae90fdb556c 100644 (file)
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -291,7 +291,7 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
 
        if (IS_GEMINILAKE(dev_priv)) {
                required_version = GLK_CSR_VERSION_REQUIRED;
-       } else if (IS_KABYLAKE(dev_priv)) {
+       } else if (IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv)) {
                required_version = KBL_CSR_VERSION_REQUIRED;
        } else if (IS_SKYLAKE(dev_priv)) {
                required_version = SKL_CSR_VERSION_REQUIRED;
@@ -440,7 +440,7 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
 
        if (IS_GEMINILAKE(dev_priv))
                csr->fw_path = I915_CSR_GLK;
-       else if (IS_KABYLAKE(dev_priv))
+       else if (IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv))
                csr->fw_path = I915_CSR_KBL;
        else if (IS_SKYLAKE(dev_priv))
                csr->fw_path = I915_CSR_SKL;