From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from mga11.intel.com ([192.55.52.93]:14152 "EHLO mga11.intel.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753013AbcHJSJm (ORCPT <rfc822;stable@vger.kernel.org>);
	Wed, 10 Aug 2016 14:09:42 -0400
Message-ID: <1470832880.16187.1.camel@intel.com>
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Restore DMC required version for
 Skylake (1.26)
From: Imre Deak <imre.deak@intel.com>
Reply-To: imre.deak@intel.com
To: Dave Gordon <david.s.gordon@intel.com>,
	Rodrigo Vivi <rodrigo.vivi@intel.com>,
	intel-gfx@lists.freedesktop.org
Cc: Jani Nikula <jani.nikula@intel.com>,
	Daniel Vetter <daniel.vetter@ffwll.ch>, stable@vger.kernel.org
Date: Wed, 10 Aug 2016 15:41:20 +0300
In-Reply-To: <2814bc5a-9a8c-cd08-f65b-81fa94fbe379@intel.com>
References: <1470808665-32757-1-git-send-email-rodrigo.vivi@intel.com>
	 <2814bc5a-9a8c-cd08-f65b-81fa94fbe379@intel.com>
Content-Type: text/plain; charset="UTF-8"
Mime-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

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@vger.kernel.org
> > Cc: Jani Nikula <jani.nikula@intel.com>
> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> > Cc: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
> > Cc: Matthew Atwood <matthew.s.atwood@intel.com>
> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97182
> > 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 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@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx