[Intel-gfx] [PATCH] drm/i915: Restore DMC required version for Skylake (1.26)

[Imre Deak]

On ke, 2016-08-10 at 12:26 +0100, Dave Gordon wrote:
> On 10/08/16 06:57, Rodrigo Vivi wrote:
> > With commit 4aa7fb9c ("drm/i915/dmc: Step away from symbolic
> > links") we started loading the firmware version directly
> > instead of symbolic links.
> 
> However the pathnames in the patch context below are still the
> symlink 
> names -- is this correct? Or did some merge effectively revert
> Patrik's 
> changes by accident?

Yes, looks like 94558e265b95 reverted partially his changes.

> 
> > With this VERSION_REQUIRED variables changed the meaning
> > from minimal required to exact version required. Along
> > with this change we started using the latest stable
> > DMC firmware as the required one 1.26.
> > 
> > This patch is correct. However in some merge this
> > change got missed and it was overwritten by the old
> > version.
> > 
> > 1.23 is unstable and can cause blank screens so let's
> > avoid it.
> > 
> > Cc: stable at vger.kernel.org
> > Cc: Jani Nikula <jani.nikula at intel.com>
> > Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
> > Cc: Patrik Jakobsson <patrik.jakobsson at linux.intel.com>
> > Cc: Matthew Atwood <matthew.s.atwood at intel.com>
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97182
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi at 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 fb27d18..0efce3f 100644
> > --- a/drivers/gpu/drm/i915/intel_csr.c
> > +++ b/drivers/gpu/drm/i915/intel_csr.c
> > @@ -40,7 +40,7 @@ MODULE_FIRMWARE(I915_CSR_KBL);
> > 
> >  #define I915_CSR_SKL "i915/skl_dmc_ver1.bin"
> 
> Major version only here?
> 
> >  MODULE_FIRMWARE(I915_CSR_SKL);
> > -#define SKL_CSR_VERSION_REQUIRED	CSR_VERSION(1, 23)
> > +#define SKL_CSR_VERSION_REQUIRED	CSR_VERSION(1, 26)
> > 
> >  #define I915_CSR_BXT "i915/bxt_dmc_ver1.bin"
> 
> And here too.
> 
> >  MODULE_FIRMWARE(I915_CSR_BXT);
> 
> .Dave.
> 
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx