[Intel-gfx] [PATCH] drm/i915/cfl: Coffee Lake reuses Kabylake DMC.

[Rodrigo Vivi]

patch merged to dinq.
Thanks for the review.

On Fri, Jun 9, 2017 at 1:02 PM, Rodrigo Vivi <rodrigo.vivi at intel.com> wrote:
> 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 at intel.com>
> Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_pci.c  | 1 +
>  drivers/gpu/drm/i915/intel_csr.c | 4 ++--
>  2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index e38ff14..03b5fe3 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -426,6 +426,7 @@
>         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 1575bde..fb6af0b 100644
> --- 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;
> --
> 1.9.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Rodrigo Vivi
Blog: http://blog.vivi.eng.br