From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/i915: Restore DMC required version for Skylake (1.26) Date: Wed, 10 Aug 2016 10:55:42 +0300 Message-ID: <87r39xvz0h.fsf@intel.com> References: <1470808665-32757-1-git-send-email-rodrigo.vivi@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 1461B6E4CF for ; Wed, 10 Aug 2016 07:56:00 +0000 (UTC) In-Reply-To: <1470808665-32757-1-git-send-email-rodrigo.vivi@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Daniel Vetter , stable@vger.kernel.org, Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org T24gV2VkLCAxMCBBdWcgMjAxNiwgUm9kcmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29t PiB3cm90ZToKPiBXaXRoIGNvbW1pdCA0YWE3ZmI5YyAoImRybS9pOTE1L2RtYzogU3RlcCBhd2F5 IGZyb20gc3ltYm9saWMKPiBsaW5rcyIpIHdlIHN0YXJ0ZWQgbG9hZGluZyB0aGUgZmlybXdhcmUg dmVyc2lvbiBkaXJlY3RseQo+IGluc3RlYWQgb2Ygc3ltYm9saWMgbGlua3MuCj4KPiBXaXRoIHRo aXMgVkVSU0lPTl9SRVFVSVJFRCB2YXJpYWJsZXMgY2hhbmdlZCB0aGUgbWVhbmluZwo+IGZyb20g bWluaW1hbCByZXF1aXJlZCB0byBleGFjdCB2ZXJzaW9uIHJlcXVpcmVkLiBBbG9uZwo+IHdpdGgg dGhpcyBjaGFuZ2Ugd2Ugc3RhcnRlZCB1c2luZyB0aGUgbGF0ZXN0IHN0YWJsZQo+IERNQyBmaXJt d2FyZSBhcyB0aGUgcmVxdWlyZWQgb25lIDEuMjYuCj4KPiBUaGlzIHBhdGNoIGlzIGNvcnJlY3Qu IEhvd2V2ZXIgaW4gc29tZSBtZXJnZSB0aGlzCj4gY2hhbmdlIGdvdCBtaXNzZWQgYW5kIGl0IHdh cyBvdmVyd3JpdHRlbiBieSB0aGUgb2xkCj4gdmVyc2lvbi4KPgo+IDEuMjMgaXMgdW5zdGFibGUg YW5kIGNhbiBjYXVzZSBibGFuayBzY3JlZW5zIHNvIGxldCdzCj4gYXZvaWQgaXQuCj4KPiBDYzog c3RhYmxlQHZnZXIua2VybmVsLm9yZwoKTm8uIDRhYTdmYjljIGlzIG5vdCBpbiBhIHN0YWJsZSBy ZWxlYXNlZCBrZXJuZWwuIFBsZWFzZSB0cnkgJ2RpbSBmaXhlcwo0YWE3ZmI5YycuCgpJIGd1ZXNz IDRhYTdmYjljICpub3QqIGhhdmluZyBiZWVuIHJlbGVhc2VkIHNhdmVzIHVzIGZyb20gcmVzdG9y aW5nIDEuMjMKdG8gbGludXgtZmlybXdhcmUuIEhvd2V2ZXIsIHY0LjgtcmMxIHdpbGwgc3RpbGwg YmUgYnVzdGVkIGlmIDEuMjMgaXNuJ3QKcmVzdG9yZWQgdG8gbGludXgtZmlybXdhcmUuCgpCUiwK SmFuaS4KCgoKPiBDYzogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGludGVsLmNvbT4KPiBDYzog RGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KPiBDYzogUGF0cmlrIEpha29i c3NvbiA8cGF0cmlrLmpha29ic3NvbkBsaW51eC5pbnRlbC5jb20+Cj4gQ2M6IE1hdHRoZXcgQXR3 b29kIDxtYXR0aGV3LnMuYXR3b29kQGludGVsLmNvbT4KPiBCdWd6aWxsYTogaHR0cHM6Ly9idWdz LmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTcxODIKPiBTaWduZWQtb2ZmLWJ5OiBS b2RyaWdvIFZpdmkgPHJvZHJpZ28udml2aUBpbnRlbC5jb20+Cj4gLS0tCj4gIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Nzci5jIHwgMiArLQo+ICAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRp b24oKyksIDEgZGVsZXRpb24oLSkKPgo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9jc3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Nzci5jCj4gaW5kZXgg ZmIyN2QxOC4uMGVmY2UzZiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9jc3IuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Nzci5jCj4gQEAgLTQw LDcgKzQwLDcgQEAgTU9EVUxFX0ZJUk1XQVJFKEk5MTVfQ1NSX0tCTCk7Cj4gIAo+ICAjZGVmaW5l IEk5MTVfQ1NSX1NLTCAiaTkxNS9za2xfZG1jX3ZlcjEuYmluIgo+ICBNT0RVTEVfRklSTVdBUkUo STkxNV9DU1JfU0tMKTsKPiAtI2RlZmluZSBTS0xfQ1NSX1ZFUlNJT05fUkVRVUlSRUQJQ1NSX1ZF UlNJT04oMSwgMjMpCj4gKyNkZWZpbmUgU0tMX0NTUl9WRVJTSU9OX1JFUVVJUkVECUNTUl9WRVJT SU9OKDEsIDI2KQo+ICAKPiAgI2RlZmluZSBJOTE1X0NTUl9CWFQgImk5MTUvYnh0X2RtY192ZXIx LmJpbiIKPiAgTU9EVUxFX0ZJUk1XQVJFKEk5MTVfQ1NSX0JYVCk7CgotLSAKSmFuaSBOaWt1bGEs IEludGVsIE9wZW4gU291cmNlIFRlY2hub2xvZ3kgQ2VudGVyCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo= 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