[Intel-gfx] [PATCH 2/2] drm/i915: Downgrade unknown CSR firmware warnings

[Lucas De Marchi]

On Wed, Nov 21, 2018 at 11:29:02AM +0200, Jani Nikula wrote:
> On Fri, 16 Nov 2018, Lucas De Marchi <lucas.demarchi at intel.com> wrote:
> > Like it was done in commit 9e180d9991dc ("drm/i915: Downgrade unknown
> > firmware warnings") for huc and guc: downgrade CSR firmware warnings. If
> > we have released no firmware yet for a platform, stop scaring the
> > consumer and merely note its expected absence.
> >
> > By simply removing the warning and early return we hit the condition
> > with the appropriate message.
> >
> > Cc: Chris Wilson <chris at chris-wilson.co.uk>
> > Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> > Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> 
> *sigh*
> 
> This patch would not have been needed at all with patch 1/2.
> 
> The point was that we shouldn't proceed without the max fw size
> set. Even with the module parameter. Because that would fail at the
> firmware loading stage later.
> 
> If the warn was such a big deal, it should've been changed to a debug
> message with an early return, not removed.

This was only done to make the code similar to the huc/guc. As I see
this would only be a problem in case we did pass a firmware via param
and not being gen >= 12.

Otherwise the warning (for !alpha) and debug message is unified in a
single place, down a few lines in the same function.

Lucas De Marchi

> 
> BR,
> Jani.
> 
> 
> > ---
> >  drivers/gpu/drm/i915/intel_csr.c | 3 ---
> >  1 file changed, 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
> > index b4476d891fa3..a516697bf57d 100644
> > --- a/drivers/gpu/drm/i915/intel_csr.c
> > +++ b/drivers/gpu/drm/i915/intel_csr.c
> > @@ -496,9 +496,6 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
> >  		csr->fw_path = BXT_CSR_PATH;
> >  		csr->required_version = BXT_CSR_VERSION_REQUIRED;
> >  		csr->max_fw_size = BXT_CSR_MAX_FW_SIZE;
> > -	} else {
> > -		MISSING_CASE(INTEL_REVID(dev_priv));
> > -		return;
> >  	}
> >  
> >  	if (i915_modparams.dmc_firmware_path) {
> 
> -- 
> Jani Nikula, Intel Open Source Graphics Center