Message ID | 20190313211144.4842-9-rodrigo.vivi@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [1/9] drm/i915/ehl: Add EHL platform info and PCI IDs | expand |
On Wed, 2019-03-13 at 14:11 -0700, Rodrigo Vivi wrote: > From: Anusha Srivatsa <anusha.srivatsa@intel.com> > > EHL uses the same firmware as ICL. Reviewed-by: José Roberto de Souza <jose.souza@intel.com> > > Cc: Bob Paauwe <bob.j.paauwe@intel.com> > Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > --- > drivers/gpu/drm/i915/intel_csr.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_csr.c > b/drivers/gpu/drm/i915/intel_csr.c > index e8ac04c33e29..862a8f686ef5 100644 > --- a/drivers/gpu/drm/i915/intel_csr.c > +++ b/drivers/gpu/drm/i915/intel_csr.c > @@ -486,7 +486,7 @@ void intel_csr_ucode_init(struct drm_i915_private > *dev_priv) > if (INTEL_GEN(dev_priv) >= 12) { > /* Allow to load fw via parameter using the last known > size */ > csr->max_fw_size = GEN12_CSR_MAX_FW_SIZE; > - } else if (IS_ICELAKE(dev_priv)) { > + } else if (IS_GEN(dev_priv, 11)) { > csr->fw_path = ICL_CSR_PATH; > csr->required_version = ICL_CSR_VERSION_REQUIRED; > csr->max_fw_size = ICL_CSR_MAX_FW_SIZE;
On Wed, Mar 13, 2019 at 02:11:44PM -0700, Rodrigo Vivi wrote: >From: Anusha Srivatsa <anusha.srivatsa@intel.com> > >EHL uses the same firmware as ICL. > >Cc: Bob Paauwe <bob.j.paauwe@intel.com> >Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com> >Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> Lucas De Marchi >--- > drivers/gpu/drm/i915/intel_csr.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c >index e8ac04c33e29..862a8f686ef5 100644 >--- a/drivers/gpu/drm/i915/intel_csr.c >+++ b/drivers/gpu/drm/i915/intel_csr.c >@@ -486,7 +486,7 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv) > if (INTEL_GEN(dev_priv) >= 12) { > /* Allow to load fw via parameter using the last known size */ > csr->max_fw_size = GEN12_CSR_MAX_FW_SIZE; >- } else if (IS_ICELAKE(dev_priv)) { >+ } else if (IS_GEN(dev_priv, 11)) { > csr->fw_path = ICL_CSR_PATH; > csr->required_version = ICL_CSR_VERSION_REQUIRED; > csr->max_fw_size = ICL_CSR_MAX_FW_SIZE; >-- >2.20.1 > >_______________________________________________ >Intel-gfx mailing list >Intel-gfx@lists.freedesktop.org >https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c index e8ac04c33e29..862a8f686ef5 100644 --- a/drivers/gpu/drm/i915/intel_csr.c +++ b/drivers/gpu/drm/i915/intel_csr.c @@ -486,7 +486,7 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv) if (INTEL_GEN(dev_priv) >= 12) { /* Allow to load fw via parameter using the last known size */ csr->max_fw_size = GEN12_CSR_MAX_FW_SIZE; - } else if (IS_ICELAKE(dev_priv)) { + } else if (IS_GEN(dev_priv, 11)) { csr->fw_path = ICL_CSR_PATH; csr->required_version = ICL_CSR_VERSION_REQUIRED; csr->max_fw_size = ICL_CSR_MAX_FW_SIZE;