From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH] drm/i915: Mark AML 0x87CA as ULX Date: Mon, 25 Mar 2019 09:03:44 +0200 Message-ID: <20190325070344.GO3888@intel.com> References: <20190322204944.23613-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0DDC36E651 for ; Mon, 25 Mar 2019 07:03:48 +0000 (UTC) Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: "Souza, Jose" Cc: "intel-gfx@lists.freedesktop.org" , "stable@vger.kernel.org" List-Id: intel-gfx@lists.freedesktop.org T24gRnJpLCBNYXIgMjIsIDIwMTkgYXQgMDk6Mzc6NDhQTSArMDAwMCwgU291emEsIEpvc2Ugd3Jv dGU6Cj4gT24gRnJpLCAyMDE5LTAzLTIyIGF0IDIyOjQ5ICswMjAwLCBWaWxsZSBTeXJqYWxhIHdy b3RlOgo+ID4gRnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVs LmNvbT4KPiA+IAo+ID4gSWYgSSdtIHJlYWRpbmcgdGhlIHNwZWMgcmlnaHQgQU1MIDB4ODdDQSBp cyBhIFkgU0tVLCBzbyBpdAo+ID4gc2hvdWxkIGJlIG1hcmtlZCBhcyBVTFggaW4gb3VyIG9sZCBz dHlsZSB0ZXJtaW5vbG9neS4KPiAKPiBZb3UgYXJlIHJpZ2h0LCBvbmx5IHRoZSBDUFUgaXMgYmFz ZWQgb24gQ0ZMLgo+IAo+IFJldmlld2VkLWJ5OiBKb3PDqSBSb2JlcnRvIGRlIFNvdXphIDxqb3Nl LnNvdXphQGludGVsLmNvbT4KClRoYW5rcy4gUHVzaGVkLgoKPiAKPiA+IAo+ID4gQ2M6IHN0YWJs ZUB2Z2VyLmtlcm5lbC5vcmcKPiA+IENjOiBKb3PDqSBSb2JlcnRvIGRlIFNvdXphIDxqb3NlLnNv dXphQGludGVsLmNvbT4KPiA+IENjOiBSb2RyaWdvIFZpdmkgPHJvZHJpZ28udml2aUBpbnRlbC5j b20+Cj4gPiBDYzogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KPiA+ IEZpeGVzOiBjMGM0NmNhNDYxZjEgKCJkcm0vaTkxNS9hbWw6IEFkZCBuZXcgQW1iZXIgTGFrZSBQ Q0kgSUQiKQo+ID4gU2lnbmVkLW9mZi1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxh QGxpbnV4LmludGVsLmNvbT4KPiA+IC0tLQo+ID4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmggfCAzICsrLQo+ID4gIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDEgZGVs ZXRpb24oLSkKPiA+IAo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmgKPiA+IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAo+ID4gaW5kZXggZjcy M2IxNTUyN2Y4Li40MjgyNzlmZDg4YTAgMTAwNjQ0Cj4gPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCj4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o Cj4gPiBAQCAtMjM2MSw3ICsyMzYxLDggQEAgc3RhdGljIGlubGluZSB1bnNpZ25lZCBpbnQKPiA+ IGk5MTVfc2dfc2VnbWVudF9zaXplKHZvaWQpCj4gPiAgCQkJCSBJTlRFTF9ERVZJRChkZXZfcHJp dikgPT0gMHg1OTE1IHx8IFwKPiA+ICAJCQkJIElOVEVMX0RFVklEKGRldl9wcml2KSA9PSAweDU5 MUUpCj4gPiAgI2RlZmluZSBJU19BTUxfVUxYKGRldl9wcml2KQkoSU5URUxfREVWSUQoZGV2X3By aXYpID09IDB4NTkxQyB8fCBcCj4gPiAtCQkJCSBJTlRFTF9ERVZJRChkZXZfcHJpdikgPT0gMHg4 N0MwKQo+ID4gKwkJCQkgSU5URUxfREVWSUQoZGV2X3ByaXYpID09IDB4ODdDMCB8fCBcCj4gPiAr CQkJCSBJTlRFTF9ERVZJRChkZXZfcHJpdikgPT0gMHg4N0NBKQo+ID4gICNkZWZpbmUgSVNfU0tM X0dUMihkZXZfcHJpdikJKElTX1NLWUxBS0UoZGV2X3ByaXYpICYmIFwKPiA+ICAJCQkJIElOVEVM X0lORk8oZGV2X3ByaXYpLT5ndCA9PSAyKQo+ID4gICNkZWZpbmUgSVNfU0tMX0dUMyhkZXZfcHJp dikJKElTX1NLWUxBS0UoZGV2X3ByaXYpICYmIFwKCgoKLS0gClZpbGxlIFN5cmrDpGzDpApJbnRl bApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ADD04C43381 for ; Mon, 25 Mar 2019 07:03:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 769212085A for ; Mon, 25 Mar 2019 07:03:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729373AbfCYHDs (ORCPT ); Mon, 25 Mar 2019 03:03:48 -0400 Received: from mga12.intel.com ([192.55.52.136]:44286 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729230AbfCYHDr (ORCPT ); Mon, 25 Mar 2019 03:03:47 -0400 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Mar 2019 00:03:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,256,1549958400"; d="scan'208";a="134460921" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by fmsmga008.fm.intel.com with SMTP; 25 Mar 2019 00:03:44 -0700 Received: by stinkbox (sSMTP sendmail emulation); Mon, 25 Mar 2019 09:03:44 +0200 Date: Mon, 25 Mar 2019 09:03:44 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: "Souza, Jose" Cc: "intel-gfx@lists.freedesktop.org" , "Vivi, Rodrigo" , "stable@vger.kernel.org" , "Ursulin, Tvrtko" Subject: Re: [PATCH] drm/i915: Mark AML 0x87CA as ULX Message-ID: <20190325070344.GO3888@intel.com> References: <20190322204944.23613-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Fri, Mar 22, 2019 at 09:37:48PM +0000, Souza, Jose wrote: > On Fri, 2019-03-22 at 22:49 +0200, Ville Syrjala wrote: > > From: Ville Syrjälä > > > > If I'm reading the spec right AML 0x87CA is a Y SKU, so it > > should be marked as ULX in our old style terminology. > > You are right, only the CPU is based on CFL. > > Reviewed-by: José Roberto de Souza Thanks. Pushed. > > > > > Cc: stable@vger.kernel.org > > Cc: José Roberto de Souza > > Cc: Rodrigo Vivi > > Cc: Tvrtko Ursulin > > Fixes: c0c46ca461f1 ("drm/i915/aml: Add new Amber Lake PCI ID") > > Signed-off-by: Ville Syrjälä > > --- > > drivers/gpu/drm/i915/i915_drv.h | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_drv.h > > b/drivers/gpu/drm/i915/i915_drv.h > > index f723b15527f8..428279fd88a0 100644 > > --- a/drivers/gpu/drm/i915/i915_drv.h > > +++ b/drivers/gpu/drm/i915/i915_drv.h > > @@ -2361,7 +2361,8 @@ static inline unsigned int > > i915_sg_segment_size(void) > > INTEL_DEVID(dev_priv) == 0x5915 || \ > > INTEL_DEVID(dev_priv) == 0x591E) > > #define IS_AML_ULX(dev_priv) (INTEL_DEVID(dev_priv) == 0x591C || \ > > - INTEL_DEVID(dev_priv) == 0x87C0) > > + INTEL_DEVID(dev_priv) == 0x87C0 || \ > > + INTEL_DEVID(dev_priv) == 0x87CA) > > #define IS_SKL_GT2(dev_priv) (IS_SKYLAKE(dev_priv) && \ > > INTEL_INFO(dev_priv)->gt == 2) > > #define IS_SKL_GT3(dev_priv) (IS_SKYLAKE(dev_priv) && \ -- Ville Syrjälä Intel