From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rodrigo Vivi Subject: Re: [PATCH] drm/i915/glk: Disable Guc and HuC on GLK Date: Thu, 4 Jan 2018 14:46:07 -0800 Message-ID: <20180104224607.f67qregs5rfpnkbv@intel.com> References: <1515006225-13003-1-git-send-email-anusha.srivatsa@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id B63A86E251 for ; Thu, 4 Jan 2018 22:46:09 +0000 (UTC) Content-Disposition: inline In-Reply-To: <1515006225-13003-1-git-send-email-anusha.srivatsa@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Anusha Srivatsa Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org T24gV2VkLCBKYW4gMDMsIDIwMTggYXQgMDc6MDM6NDVQTSArMDAwMCwgQW51c2hhIFNyaXZhdHNh IHdyb3RlOgo+IFNpbmNlIHRoZSBmaXJtd2FyZXMgYXJlIG5vdCB5ZXQgcmVsZWFzZWQgdG8gcHVi bGljIHJlcG8sCj4gZGlzYWJsZSB0aGVtIG9uIEdlbWluaWxha2UuCj4gCj4gdjI6IFJlbW92ZSB0 aGUgZmlybXdhcmUgdmVyc2lvbnMgKE1pY2hhbCkKPiAKPiB2MzogUmVtb3ZlIHVud2FudGVkIGRl ZmluZXMgKFJvZHJpZ28pCj4gQ29ycmVjdCBjb21taXQgbWVzc2FnZSAoTWljaGFsKQo+IAo+IENj OiBNaWNoYWwgV2FqZGVjemtvIDxtaWNoYWwud2FqZGVjemtvQGludGVsLmNvbT4KPiBDYzogUm9k cmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgo+IENjOiA8c3RhYmxlQHZnZXIua2Vy bmVsLm9yZz4KPiBTaWduZWQtb2ZmLWJ5OiBBbnVzaGEgU3JpdmF0c2EgPGFudXNoYS5zcml2YXRz YUBpbnRlbC5jb20+Cj4gRml4ZXM6IDkwZjE5MmM4MjQxZSAoImRybS9pOTE1L0d1Qy9HTEs6IExv YWQgR3VDIG9uIEdMSyIpCj4gRml4ZXM6IGRiNWJhMGQ4OTMxZSAoImRybS9pOTE1L0dMSy9IdUM6 IExvYWQgSHVDIG9uIEdMSyIpCj4gUmV2aWV3ZWQtYnk6IE1pY2hhbCBXYWpkZWN6a28gPG1pY2hh bC53YWpkZWN6a29AaW50ZWwuY29tPgoKTm93IG1lcmdlZC4gVGhhbmtzIGZvciB0aGUgcGF0Y2gu Cgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZncuYyB8ICA5IC0tLS0t LS0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuYyAgICB8IDExIC0tLS0tLS0t LS0tCj4gIDIgZmlsZXMgY2hhbmdlZCwgMjAgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19mdy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZ3VjX2Z3LmMKPiBpbmRleCBjYmM1MWM5Li4zYjA5MzI5IDEwMDY0NAo+IC0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19mdy5jCj4gKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3LmMKPiBAQCAtMzksOSArMzksNiBAQAo+ICAjZGVmaW5lIEtC TF9GV19NQUpPUiA5Cj4gICNkZWZpbmUgS0JMX0ZXX01JTk9SIDM5Cj4gIAo+IC0jZGVmaW5lIEdM S19GV19NQUpPUiAxMAo+IC0jZGVmaW5lIEdMS19GV19NSU5PUiA1Ngo+IC0KPiAgI2RlZmluZSBH VUNfRldfUEFUSChwbGF0Zm9ybSwgbWFqb3IsIG1pbm9yKSBcCj4gICAgICAgICAiaTkxNS8iIF9f c3RyaW5naWZ5KHBsYXRmb3JtKSAiX2d1Y192ZXIiIF9fc3RyaW5naWZ5KG1ham9yKSAiXyIgX19z dHJpbmdpZnkobWlub3IpICIuYmluIgo+ICAKPiBAQCAtNTQsOCArNTEsNiBAQCBNT0RVTEVfRklS TVdBUkUoSTkxNV9CWFRfR1VDX1VDT0RFKTsKPiAgI2RlZmluZSBJOTE1X0tCTF9HVUNfVUNPREUg R1VDX0ZXX1BBVEgoa2JsLCBLQkxfRldfTUFKT1IsIEtCTF9GV19NSU5PUikKPiAgTU9EVUxFX0ZJ Uk1XQVJFKEk5MTVfS0JMX0dVQ19VQ09ERSk7Cj4gIAo+IC0jZGVmaW5lIEk5MTVfR0xLX0dVQ19V Q09ERSBHVUNfRldfUEFUSChnbGssIEdMS19GV19NQUpPUiwgR0xLX0ZXX01JTk9SKQo+IC0KPiAg c3RhdGljIHZvaWQgZ3VjX2Z3X3NlbGVjdChzdHJ1Y3QgaW50ZWxfdWNfZncgKmd1Y19mdykKPiAg ewo+ICAJc3RydWN0IGludGVsX2d1YyAqZ3VjID0gY29udGFpbmVyX29mKGd1Y19mdywgc3RydWN0 IGludGVsX2d1YywgZncpOwo+IEBAIC04MiwxMCArNzcsNiBAQCBzdGF0aWMgdm9pZCBndWNfZndf c2VsZWN0KHN0cnVjdCBpbnRlbF91Y19mdyAqZ3VjX2Z3KQo+ICAJCWd1Y19mdy0+cGF0aCA9IEk5 MTVfS0JMX0dVQ19VQ09ERTsKPiAgCQlndWNfZnctPm1ham9yX3Zlcl93YW50ZWQgPSBLQkxfRldf TUFKT1I7Cj4gIAkJZ3VjX2Z3LT5taW5vcl92ZXJfd2FudGVkID0gS0JMX0ZXX01JTk9SOwo+IC0J fSBlbHNlIGlmIChJU19HRU1JTklMQUtFKGRldl9wcml2KSkgewo+IC0JCWd1Y19mdy0+cGF0aCA9 IEk5MTVfR0xLX0dVQ19VQ09ERTsKPiAtCQlndWNfZnctPm1ham9yX3Zlcl93YW50ZWQgPSBHTEtf RldfTUFKT1I7Cj4gLQkJZ3VjX2Z3LT5taW5vcl92ZXJfd2FudGVkID0gR0xLX0ZXX01JTk9SOwo+ ICAJfSBlbHNlIHsKPiAgCQlEUk1fV0FSTigiJXM6IE5vIGZpcm13YXJlIGtub3duIGZvciB0aGlz IHBsYXRmb3JtIVxuIiwKPiAgCQkJIGludGVsX3VjX2Z3X3R5cGVfcmVwcihndWNfZnctPnR5cGUp KTsKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuYwo+IGluZGV4IDk3NGJlM2QuLjhlZDA1MTggMTAw NjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMKPiArKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuYwo+IEBAIC01NCwxMCArNTQsNiBAQAo+ICAjZGVm aW5lIEtCTF9IVUNfRldfTUlOT1IgMDAKPiAgI2RlZmluZSBLQkxfQkxEX05VTSAxODEwCj4gIAo+ IC0jZGVmaW5lIEdMS19IVUNfRldfTUFKT1IgMDIKPiAtI2RlZmluZSBHTEtfSFVDX0ZXX01JTk9S IDAwCj4gLSNkZWZpbmUgR0xLX0JMRF9OVU0gMTc0OAo+IC0KPiAgI2RlZmluZSBIVUNfRldfUEFU SChwbGF0Zm9ybSwgbWFqb3IsIG1pbm9yLCBibGRfbnVtKSBcCj4gIAkiaTkxNS8iIF9fc3RyaW5n aWZ5KHBsYXRmb3JtKSAiX2h1Y192ZXIiIF9fc3RyaW5naWZ5KG1ham9yKSAiXyIgXAo+ICAJX19z dHJpbmdpZnkobWlub3IpICJfIiBfX3N0cmluZ2lmeShibGRfbnVtKSAiLmJpbiIKPiBAQCAtNzQs OSArNzAsNiBAQCBNT0RVTEVfRklSTVdBUkUoSTkxNV9CWFRfSFVDX1VDT0RFKTsKPiAgCUtCTF9I VUNfRldfTUlOT1IsIEtCTF9CTERfTlVNKQo+ICBNT0RVTEVfRklSTVdBUkUoSTkxNV9LQkxfSFVD X1VDT0RFKTsKPiAgCj4gLSNkZWZpbmUgSTkxNV9HTEtfSFVDX1VDT0RFIEhVQ19GV19QQVRIKGds aywgR0xLX0hVQ19GV19NQUpPUiwgXAo+IC0JR0xLX0hVQ19GV19NSU5PUiwgR0xLX0JMRF9OVU0p Cj4gLQo+ICBzdGF0aWMgdm9pZCBodWNfZndfc2VsZWN0KHN0cnVjdCBpbnRlbF91Y19mdyAqaHVj X2Z3KQo+ICB7Cj4gIAlzdHJ1Y3QgaW50ZWxfaHVjICpodWMgPSBjb250YWluZXJfb2YoaHVjX2Z3 LCBzdHJ1Y3QgaW50ZWxfaHVjLCBmdyk7Cj4gQEAgLTEwMywxMCArOTYsNiBAQCBzdGF0aWMgdm9p ZCBodWNfZndfc2VsZWN0KHN0cnVjdCBpbnRlbF91Y19mdyAqaHVjX2Z3KQo+ICAJCWh1Y19mdy0+ cGF0aCA9IEk5MTVfS0JMX0hVQ19VQ09ERTsKPiAgCQlodWNfZnctPm1ham9yX3Zlcl93YW50ZWQg PSBLQkxfSFVDX0ZXX01BSk9SOwo+ICAJCWh1Y19mdy0+bWlub3JfdmVyX3dhbnRlZCA9IEtCTF9I VUNfRldfTUlOT1I7Cj4gLQl9IGVsc2UgaWYgKElTX0dFTUlOSUxBS0UoZGV2X3ByaXYpKSB7Cj4g LQkJaHVjX2Z3LT5wYXRoID0gSTkxNV9HTEtfSFVDX1VDT0RFOwo+IC0JCWh1Y19mdy0+bWFqb3Jf dmVyX3dhbnRlZCA9IEdMS19IVUNfRldfTUFKT1I7Cj4gLQkJaHVjX2Z3LT5taW5vcl92ZXJfd2Fu dGVkID0gR0xLX0hVQ19GV19NSU5PUjsKPiAgCX0gZWxzZSB7Cj4gIAkJRFJNX1dBUk4oIiVzOiBO byBmaXJtd2FyZSBrbm93biBmb3IgdGhpcyBwbGF0Zm9ybSFcbiIsCj4gIAkJCSBpbnRlbF91Y19m d190eXBlX3JlcHIoaHVjX2Z3LT50eXBlKSk7Cj4gLS0gCj4gMi43LjQKPiAKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com ([134.134.136.100]:34346 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753548AbeADWqJ (ORCPT ); Thu, 4 Jan 2018 17:46:09 -0500 Date: Thu, 4 Jan 2018 14:46:07 -0800 From: Rodrigo Vivi To: Anusha Srivatsa Cc: intel-gfx@lists.freedesktop.org, Michal Wajdeczko , stable@vger.kernel.org Subject: Re: [PATCH] drm/i915/glk: Disable Guc and HuC on GLK Message-ID: <20180104224607.f67qregs5rfpnkbv@intel.com> References: <1515006225-13003-1-git-send-email-anusha.srivatsa@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1515006225-13003-1-git-send-email-anusha.srivatsa@intel.com> Sender: stable-owner@vger.kernel.org List-ID: On Wed, Jan 03, 2018 at 07:03:45PM +0000, Anusha Srivatsa wrote: > Since the firmwares are not yet released to public repo, > disable them on Geminilake. > > v2: Remove the firmware versions (Michal) > > v3: Remove unwanted defines (Rodrigo) > Correct commit message (Michal) > > Cc: Michal Wajdeczko > Cc: Rodrigo Vivi > Cc: > Signed-off-by: Anusha Srivatsa > Fixes: 90f192c8241e ("drm/i915/GuC/GLK: Load GuC on GLK") > Fixes: db5ba0d8931e ("drm/i915/GLK/HuC: Load HuC on GLK") > Reviewed-by: Michal Wajdeczko Now merged. Thanks for the patch. > --- > drivers/gpu/drm/i915/intel_guc_fw.c | 9 --------- > drivers/gpu/drm/i915/intel_huc.c | 11 ----------- > 2 files changed, 20 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c > index cbc51c9..3b09329 100644 > --- a/drivers/gpu/drm/i915/intel_guc_fw.c > +++ b/drivers/gpu/drm/i915/intel_guc_fw.c > @@ -39,9 +39,6 @@ > #define KBL_FW_MAJOR 9 > #define KBL_FW_MINOR 39 > > -#define GLK_FW_MAJOR 10 > -#define GLK_FW_MINOR 56 > - > #define GUC_FW_PATH(platform, major, minor) \ > "i915/" __stringify(platform) "_guc_ver" __stringify(major) "_" __stringify(minor) ".bin" > > @@ -54,8 +51,6 @@ MODULE_FIRMWARE(I915_BXT_GUC_UCODE); > #define I915_KBL_GUC_UCODE GUC_FW_PATH(kbl, KBL_FW_MAJOR, KBL_FW_MINOR) > MODULE_FIRMWARE(I915_KBL_GUC_UCODE); > > -#define I915_GLK_GUC_UCODE GUC_FW_PATH(glk, GLK_FW_MAJOR, GLK_FW_MINOR) > - > static void guc_fw_select(struct intel_uc_fw *guc_fw) > { > struct intel_guc *guc = container_of(guc_fw, struct intel_guc, fw); > @@ -82,10 +77,6 @@ static void guc_fw_select(struct intel_uc_fw *guc_fw) > guc_fw->path = I915_KBL_GUC_UCODE; > guc_fw->major_ver_wanted = KBL_FW_MAJOR; > guc_fw->minor_ver_wanted = KBL_FW_MINOR; > - } else if (IS_GEMINILAKE(dev_priv)) { > - guc_fw->path = I915_GLK_GUC_UCODE; > - guc_fw->major_ver_wanted = GLK_FW_MAJOR; > - guc_fw->minor_ver_wanted = GLK_FW_MINOR; > } else { > DRM_WARN("%s: No firmware known for this platform!\n", > intel_uc_fw_type_repr(guc_fw->type)); > diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c > index 974be3d..8ed0518 100644 > --- a/drivers/gpu/drm/i915/intel_huc.c > +++ b/drivers/gpu/drm/i915/intel_huc.c > @@ -54,10 +54,6 @@ > #define KBL_HUC_FW_MINOR 00 > #define KBL_BLD_NUM 1810 > > -#define GLK_HUC_FW_MAJOR 02 > -#define GLK_HUC_FW_MINOR 00 > -#define GLK_BLD_NUM 1748 > - > #define HUC_FW_PATH(platform, major, minor, bld_num) \ > "i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \ > __stringify(minor) "_" __stringify(bld_num) ".bin" > @@ -74,9 +70,6 @@ MODULE_FIRMWARE(I915_BXT_HUC_UCODE); > KBL_HUC_FW_MINOR, KBL_BLD_NUM) > MODULE_FIRMWARE(I915_KBL_HUC_UCODE); > > -#define I915_GLK_HUC_UCODE HUC_FW_PATH(glk, GLK_HUC_FW_MAJOR, \ > - GLK_HUC_FW_MINOR, GLK_BLD_NUM) > - > static void huc_fw_select(struct intel_uc_fw *huc_fw) > { > struct intel_huc *huc = container_of(huc_fw, struct intel_huc, fw); > @@ -103,10 +96,6 @@ static void huc_fw_select(struct intel_uc_fw *huc_fw) > huc_fw->path = I915_KBL_HUC_UCODE; > huc_fw->major_ver_wanted = KBL_HUC_FW_MAJOR; > huc_fw->minor_ver_wanted = KBL_HUC_FW_MINOR; > - } else if (IS_GEMINILAKE(dev_priv)) { > - huc_fw->path = I915_GLK_HUC_UCODE; > - huc_fw->major_ver_wanted = GLK_HUC_FW_MAJOR; > - huc_fw->minor_ver_wanted = GLK_HUC_FW_MINOR; > } else { > DRM_WARN("%s: No firmware known for this platform!\n", > intel_uc_fw_type_repr(huc_fw->type)); > -- > 2.7.4 >