From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/i915/kbl: Adding missing IS_KABYLAKE checks. Date: Mon, 29 Feb 2016 16:35:17 +0200 Message-ID: <87a8mjtwii.fsf@intel.com> References: <568E8ED3.4040600@intel.com> <1452214179-22361-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 04520893A3 for ; Mon, 29 Feb 2016 14:35:20 +0000 (UTC) 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: Rodrigo Vivi , Rodrigo Vivi Cc: Daniel Vetter , intel-gfx List-Id: intel-gfx@lists.freedesktop.org T24gRnJpLCAyNiBGZWIgMjAxNiwgUm9kcmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAZ21haWwuY29t PiB3cm90ZToKPiBIaSBKYW5pIGFuZCBEYW5pZWwsCj4KPiBJIGJlbGlldmUgSSBmb3Jnb3QgdG8g Y2M6c3RhYmxlIG9uIHRoaXMgb25lIGFuZCB0aGlzIGlzIG1pc3Npbmcgb24KPiBtb3N0IGJyYW5j aGVzIG91dCB0aGVyZSBpbmNsdWRpbmcgTGludXMgNC41LXI1Lgo+IElzIHRoZXJlIGFueSBjaGFu Y2UgdG8gZ2V0IHRoaXMgcGF0Y2ggaW4gZm9yIDQuNT8gd2l0aG91dCB0aGlzIGk5MTUgaXMKPiBu b3Qgd29ya2luZyBvbiBLQkwuCgpJcyB0aGUgcmVmZXJlbmNlZCBjb21taXQgYnkgTWljaGVsIGFs c28gcmVxdWlyZWQ/CgogICAgTWljaGVsIGhhZCBmb3VuZCB0aGUgbWFpbiBlcnJvciBmaXJzdCBh bmQgaGlzCiAgICBmaXggaGFkIGJldHRlciBkZXRhaWxzIG9uIHRoZSBoaXN0b3J5IGFuZCBnb3QK ICAgIG1lcmdlZCBhbHJlYWR5OgogICAgCiAgICBjb21taXQgMTZmYmMyOTFjYjg3YzdkZWZjZDEz YWQ3MTVkM2U0YWYwZDUyM2U0MwogICAgQXV0aG9yOiBNaWNoZWwgVGhpZXJyeSA8bWljaGVsLnRo aWVycnlAaW50ZWwuY29tPgogICAgRGF0ZTogICBXZWQgSmFuIDYgMTI6MDg6MzYgMjAxNiArMDAw MAogICAgCiAgICAgICAgZHJtL2k5MTUva2JsOiBFbmFibGUgUFcxIGFuZCBNaXNjIEkvTyBwb3dl ciB3ZWxscwoKSWYgdGhhdCdzIG5lZWRlZCwgd2hhdCBlbHNlIGlzIG5lZWRlZD8gV2hlcmUgZG9l cyB0aGUgcmFiYml0IGhvbGUgZW5kPwoKPiBHb29kIHRoaW5nIGlzIHRoYXQgdGhpcyBwbGF0Zm9y bSBpcyBzdGlsbCBwcm90ZWN0ZWQgYnkgcHJlbGltaW5hcnlfaHdfc3VwcG9ydC4KCldlIGRvIG5v dCBiYWNrcG9ydCBjYzogc3RhYmxlIGZpeGVzIGZvciBwbGF0Zm9ybXMgdGhhdCBvbmx5IGhhdmUK cHJlbGltaW5hcnkgaHcgc3VwcG9ydC4KCnY0LjUgaXMgbm90IHJlbGVhc2VkIHlldCwgYW5kIGFs dGhvdWdoIHRvd2FyZHMgdGhlIGxhdGVyIC1yYydzIHRoZSBydWxlcwphcmUgcHJldHR5IG11Y2gg dGhlIHNhbWUgYXMgZm9yIHN0YWJsZSBrZXJuZWxzLCBJIG1pZ2h0IGNvbnNpZGVyCmNoZXJyeS1w aWNraW5nIGtibCBmaXhlcyB0aGF0IG1ha2UgcGxhdGZvcm0gZW5hYmxpbmcgb3IgZWFybHkgYWRv cHRpb24KZWFzaWVyLgoKQlIsCkphbmkuCgoKPgo+IFRoYW5rcywKPiBSb2RyaWdvLgo+Cj4gT24g VGh1LCBKYW4gNywgMjAxNiBhdCA0OjQ5IFBNLCBSb2RyaWdvIFZpdmkgPHJvZHJpZ28udml2aUBp bnRlbC5jb20+IHdyb3RlOgo+PiBXaGVuIGFkZGluZyBJU19LQUJZTEFLRSBkZWZpbml0aW9uIEkg ZGlkbid0IGluY2x1ZGVkIHRoZQo+PiBEQyBzdGF0ZXMgcmVsYXRlZCBiZWNhdXNlIEkgd2FzIHBs YW5pbmcgdG8gaW5jbHVkZSB0aGVtCj4+IHdpdGggdGhlIHBhdGNoIHRoYXQgZml4ZXMgRE1DIGZp cm13YXJlIGxvYWRpbmcsIGJ1dCBJCj4+IGZvcmdvdCB0aGVtLgo+Pgo+PiBNZWFud2hpbGUgdGhp cyBydW50aW1lIHBtIGNvZGUgY2hhbmdlZCBhIGxvdCBmb3IKPj4gU2t5bGFrZS4KPj4KPj4gV2Vs bCwgSSBkaWRuJ3QgZXhwZWN0IHRoYXQgdGhpcyB3b3VsZCBjcmFzaCB0aGUgbWFjaGluZQo+PiBh bmQgSSBqdXN0IG5vdGljZWQgbm93IHRoYXQgU2FyYWggd2FybmVkIG1lIG91ciBkcml2ZXIKPj4g d2Fzbid0IHdvcmtpbmcuIFRoYW5rcyBTYXJhaC4KPj4KPj4gTWljaGVsIGhhZCBmb3VuZCB0aGUg bWFpbiBlcnJvciBmaXJzdCBhbmQgaGlzCj4+IGZpeCBoYWQgYmV0dGVyIGRldGFpbHMgb24gdGhl IGhpc3RvcnkgYW5kIGdvdAo+PiBtZXJnZWQgYWxyZWFkeToKPj4KPj4gY29tbWl0IDE2ZmJjMjkx Y2I4N2M3ZGVmY2QxM2FkNzE1ZDNlNGFmMGQ1MjNlNDMKPj4gQXV0aG9yOiBNaWNoZWwgVGhpZXJy eSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29tPgo+PiBEYXRlOiAgIFdlZCBKYW4gNiAxMjowODoz NiAyMDE2ICswMDAwCj4+Cj4+ICAgICBkcm0vaTkxNS9rYmw6IEVuYWJsZSBQVzEgYW5kIE1pc2Mg SS9PIHBvd2VyIHdlbGxzCj4+Cj4+IFRoaXMgb25lIGlzIGEgZm9sbG93LXVwIGFkZGluZyB0aGUg b3RoZXIgcmVtYWluaW5nCj4+IG1pc3NpbmcgcGllY2VzLgo+Pgo+PiB2MjogUmViYXNlZCBvbiB0 b3Agb2YgTWljaGVsJ3MgcGF0Y2ggYXMgZXhwbGFpbmVkIGFib3ZlLgo+Pgo+PiBDYzogU2FyYWgg U2hhcnAgPHNhcmFoLmEuc2hhcnBAaW50ZWwuY29tPgo+PiBTaWduZWQtb2ZmLWJ5OiBSb2RyaWdv IFZpdmkgPHJvZHJpZ28udml2aUBpbnRlbC5jb20+Cj4+IFJldmlld2VkLWJ5OiBNaWNoZWwgVGhp ZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29tPgo+PiBTaWduZWQtb2ZmLWJ5OiBSb2RyaWdv IFZpdmkgPHJvZHJpZ28udml2aUBpbnRlbC5jb20+Cj4+IC0tLQo+PiAgZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfY3NyLmMgICAgICAgIHwgIDUgKysrLS0KPj4gIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3J1bnRpbWVfcG0uYyB8IDE1ICsrKysrKysrKystLS0tLQo+PiAgMiBmaWxlcyBj aGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQo+Pgo+PiBkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3NyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9jc3IuYwo+PiBpbmRleCA5YmI2M2E4Li4zZjY5ODI5IDEwMDY0NAo+PiAtLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jc3IuYwo+PiArKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9jc3IuYwo+PiBAQCAtMjc4LDcgKzI3OCw4IEBAIHN0YXRpYyB1aW50MzJfdCAq cGFyc2VfY3NyX2Z3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKPj4KPj4gICAg ICAgICBjc3ItPnZlcnNpb24gPSBjc3NfaGVhZGVyLT52ZXJzaW9uOwo+Pgo+PiAtICAgICAgIGlm IChJU19TS1lMQUtFKGRldikgJiYgY3NyLT52ZXJzaW9uIDwgU0tMX0NTUl9WRVJTSU9OX1JFUVVJ UkVEKSB7Cj4+ICsgICAgICAgaWYgKChJU19TS1lMQUtFKGRldikgfHwgSVNfS0FCWUxBS0UoZGV2 KSkgJiYKPj4gKyAgICAgICAgICAgIGNzci0+dmVyc2lvbiA8IFNLTF9DU1JfVkVSU0lPTl9SRVFV SVJFRCkgewo+PiAgICAgICAgICAgICAgICAgRFJNX0lORk8oIlJlZnVzaW5nIHRvIGxvYWQgb2xk IFNreWxha2UgRE1DIGZpcm13YXJlIHYldS4ldSwiCj4+ICAgICAgICAgICAgICAgICAgICAgICAg ICAiIHBsZWFzZSB1cGdyYWRlIHRvIHYldS4ldSBvciBsYXRlciIKPj4gICAgICAgICAgICAgICAg ICAgICAgICAgICIgW2h0dHBzOi8vMDEub3JnL2xpbnV4Z3JhcGhpY3MvaW50ZWwtbGludXgtZ3Jh cGhpY3MtZmlybXdhcmVzXS5cbiIsCj4+IEBAIC00MjEsNyArNDIyLDcgQEAgdm9pZCBpbnRlbF9j c3JfdWNvZGVfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCj4+ICAgICAg ICAgaWYgKCFIQVNfQ1NSKGRldl9wcml2KSkKPj4gICAgICAgICAgICAgICAgIHJldHVybjsKPj4K Pj4gLSAgICAgICBpZiAoSVNfU0tZTEFLRShkZXZfcHJpdikpCj4+ICsgICAgICAgaWYgKElTX1NL WUxBS0UoZGV2X3ByaXYpIHx8IElTX0tBQllMQUtFKGRldl9wcml2KSkKPj4gICAgICAgICAgICAg ICAgIGNzci0+ZndfcGF0aCA9IEk5MTVfQ1NSX1NLTDsKPj4gICAgICAgICBlbHNlIGlmIChJU19C Uk9YVE9OKGRldl9wcml2KSkKPj4gICAgICAgICAgICAgICAgIGNzci0+ZndfcGF0aCA9IEk5MTVf Q1NSX0JYVDsKPj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRp bWVfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYwo+PiBpbmRl eCA0YjQ0ZTY4Li44OWE3ZGQ4IDEwMDY0NAo+PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9ydW50aW1lX3BtLmMKPj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVu dGltZV9wbS5jCj4+IEBAIC01MzIsNyArNTMyLDggQEAgc3RhdGljIHZvaWQgYXNzZXJ0X2Nhbl9l bmFibGVfZGM1KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKPj4gICAgICAgICBi b29sIHBnMl9lbmFibGVkID0gaW50ZWxfZGlzcGxheV9wb3dlcl93ZWxsX2lzX2VuYWJsZWQoZGV2 X3ByaXYsCj4+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBTS0xfRElT UF9QV18yKTsKPj4KPj4gLSAgICAgICBXQVJOX09OQ0UoIUlTX1NLWUxBS0UoZGV2KSwgIlBsYXRm b3JtIGRvZXNuJ3Qgc3VwcG9ydCBEQzUuXG4iKTsKPj4gKyAgICAgICBXQVJOX09OQ0UoIUlTX1NL WUxBS0UoZGV2KSAmJiAhSVNfS0FCWUxBS0UoZGV2KSwKPj4gKyAgICAgICAgICAgICAgICAgIlBs YXRmb3JtIGRvZXNuJ3Qgc3VwcG9ydCBEQzUuXG4iKTsKPj4gICAgICAgICBXQVJOX09OQ0UoIUhB U19SVU5USU1FX1BNKGRldiksICJSdW50aW1lIFBNIG5vdCBlbmFibGVkLlxuIik7Cj4+ICAgICAg ICAgV0FSTl9PTkNFKHBnMl9lbmFibGVkLCAiUEcyIG5vdCBkaXNhYmxlZCB0byBlbmFibGUgREM1 LlxuIik7Cj4+Cj4+IEBAIC01NjgsNyArNTY5LDggQEAgc3RhdGljIHZvaWQgYXNzZXJ0X2Nhbl9l bmFibGVfZGM2KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKPj4gIHsKPj4gICAg ICAgICBzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gZGV2X3ByaXYtPmRldjsKPj4KPj4gLSAgICAg ICBXQVJOX09OQ0UoIUlTX1NLWUxBS0UoZGV2KSwgIlBsYXRmb3JtIGRvZXNuJ3Qgc3VwcG9ydCBE QzYuXG4iKTsKPj4gKyAgICAgICBXQVJOX09OQ0UoIUlTX1NLWUxBS0UoZGV2KSAmJiAhSVNfS0FC WUxBS0UoZGV2KSwKPj4gKyAgICAgICAgICAgICAgICAgIlBsYXRmb3JtIGRvZXNuJ3Qgc3VwcG9y dCBEQzYuXG4iKTsKPj4gICAgICAgICBXQVJOX09OQ0UoIUhBU19SVU5USU1FX1BNKGRldiksICJS dW50aW1lIFBNIG5vdCBlbmFibGVkLlxuIik7Cj4+ICAgICAgICAgV0FSTl9PTkNFKEk5MTVfUkVB RChVVElMX1BJTl9DVEwpICYgVVRJTF9QSU5fRU5BQkxFLAo+PiAgICAgICAgICAgICAgICAgICAi QmFja2xpZ2h0IGlzIG5vdCBkaXNhYmxlZC5cbiIpOwo+PiBAQCAtNTk1LDcgKzU5Nyw4IEBAIHN0 YXRpYyB2b2lkIGdlbjlfZGlzYWJsZV9kYzVfZGM2KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKPj4gIHsKPj4gICAgICAgICBhc3NlcnRfY2FuX2Rpc2FibGVfZGM1KGRldl9wcml2 KTsKPj4KPj4gLSAgICAgICBpZiAoSVNfU0tZTEFLRShkZXZfcHJpdikgJiYgaTkxNS5lbmFibGVf ZGMgIT0gMCAmJiBpOTE1LmVuYWJsZV9kYyAhPSAxKQo+PiArICAgICAgIGlmICgoSVNfU0tZTEFL RShkZXZfcHJpdikgfHwgSVNfS0FCWUxBS0UoZGV2X3ByaXYpKSAmJgo+PiArICAgICAgICAgICBp OTE1LmVuYWJsZV9kYyAhPSAwICYmIGk5MTUuZW5hYmxlX2RjICE9IDEpCj4+ICAgICAgICAgICAg ICAgICBhc3NlcnRfY2FuX2Rpc2FibGVfZGM2KGRldl9wcml2KTsKPj4KPj4gICAgICAgICBnZW45 X3NldF9kY19zdGF0ZShkZXZfcHJpdiwgRENfU1RBVEVfRElTQUJMRSk7Cj4+IEBAIC03ODMsNyAr Nzg2LDggQEAgc3RhdGljIHZvaWQgZ2VuOV9kY19vZmZfcG93ZXJfd2VsbF9lbmFibGUoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAo+PiAgc3RhdGljIHZvaWQgZ2VuOV9kY19vZmZf cG93ZXJfd2VsbF9kaXNhYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKPj4g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0cnVjdCBpOTE1X3Bv d2VyX3dlbGwgKnBvd2VyX3dlbGwpCj4+ICB7Cj4+IC0gICAgICAgaWYgKElTX1NLWUxBS0UoZGV2 X3ByaXYpICYmIGk5MTUuZW5hYmxlX2RjICE9IDAgJiYgaTkxNS5lbmFibGVfZGMgIT0gMSkKPj4g KyAgICAgICBpZiAoKElTX1NLWUxBS0UoZGV2X3ByaXYpIHx8IElTX0tBQllMQUtFKGRldl9wcml2 KSkgJiYKPj4gKyAgICAgICAgICAgaTkxNS5lbmFibGVfZGMgIT0gMCAmJiBpOTE1LmVuYWJsZV9k YyAhPSAxKQo+PiAgICAgICAgICAgICAgICAgc2tsX2VuYWJsZV9kYzYoZGV2X3ByaXYpOwo+PiAg ICAgICAgIGVsc2UKPj4gICAgICAgICAgICAgICAgIGdlbjlfZW5hYmxlX2RjNShkZXZfcHJpdik7 Cj4+IEBAIC03OTUsNyArNzk5LDggQEAgc3RhdGljIHZvaWQgZ2VuOV9kY19vZmZfcG93ZXJfd2Vs bF9zeW5jX2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKPj4gICAgICAgICBp ZiAocG93ZXJfd2VsbC0+Y291bnQgPiAwKSB7Cj4+ICAgICAgICAgICAgICAgICBnZW45X3NldF9k Y19zdGF0ZShkZXZfcHJpdiwgRENfU1RBVEVfRElTQUJMRSk7Cj4+ICAgICAgICAgfSBlbHNlIHsK Pj4gLSAgICAgICAgICAgICAgIGlmIChJU19TS1lMQUtFKGRldl9wcml2KSAmJiBpOTE1LmVuYWJs ZV9kYyAhPSAwICYmCj4+ICsgICAgICAgICAgICAgICBpZiAoKElTX1NLWUxBS0UoZGV2X3ByaXYp IHx8IElTX0tBQllMQUtFKGRldl9wcml2KSkgJiYKPj4gKyAgICAgICAgICAgICAgICAgICBpOTE1 LmVuYWJsZV9kYyAhPSAwICYmCj4+ICAgICAgICAgICAgICAgICAgICAgaTkxNS5lbmFibGVfZGMg IT0gMSkKPj4gICAgICAgICAgICAgICAgICAgICAgICAgZ2VuOV9zZXRfZGNfc3RhdGUoZGV2X3By aXYsIERDX1NUQVRFX0VOX1VQVE9fREM2KTsKPj4gICAgICAgICAgICAgICAgIGVsc2UKPj4gLS0K Pj4gMi40LjMKPj4KPj4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KPj4gSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdAo+PiBJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCj4+IGh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngKCi0tIApKYW5pIE5pa3VsYSwgSW50ZWwgT3BlbiBTb3VyY2UgVGVjaG5vbG9n eSBDZW50ZXIKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==