From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com ([134.134.136.24]:6267 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934253AbcHJSWa (ORCPT ); Wed, 10 Aug 2016 14:22:30 -0400 From: Jani Nikula To: Rodrigo Vivi , intel-gfx@lists.freedesktop.org Cc: Rodrigo Vivi , stable@vger.kernel.org, Daniel Vetter , Patrik Jakobsson , Matthew Atwood Subject: Re: [PATCH] drm/i915: Restore DMC required version for Skylake (1.26) In-Reply-To: <1470808665-32757-1-git-send-email-rodrigo.vivi@intel.com> References: <1470808665-32757-1-git-send-email-rodrigo.vivi@intel.com> Date: Wed, 10 Aug 2016 10:55:42 +0300 Message-ID: <87r39xvz0h.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: stable-owner@vger.kernel.org List-ID: On Wed, 10 Aug 2016, 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. > > 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 No. 4aa7fb9c is not in a stable released kernel. Please try 'dim fixes 4aa7fb9c'. I guess 4aa7fb9c *not* having been released saves us from restoring 1.23 to linux-firmware. However, v4.8-rc1 will still be busted if 1.23 isn't restored to linux-firmware. BR, Jani. > Cc: Jani Nikula > Cc: Daniel Vetter > Cc: Patrik Jakobsson > Cc: Matthew Atwood > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97182 > Signed-off-by: Rodrigo Vivi > --- > 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" > 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" > MODULE_FIRMWARE(I915_CSR_BXT); -- Jani Nikula, Intel Open Source Technology Center