From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michel Thierry Subject: Re: [PATCH 1/3] drm/i915/kbl: Adding missing IS_KABYLAKE checks. Date: Thu, 7 Jan 2016 16:14:11 +0000 Message-ID: <568E8ED3.4040600@intel.com> References: <1452129330-3484-1-git-send-email-rodrigo.vivi@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id C897F6E6A5 for ; Thu, 7 Jan 2016 08:14:27 -0800 (PST) In-Reply-To: <1452129330-3484-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: Rodrigo Vivi , "intel-gfx@lists.freedesktop.org" Cc: "Sharp, Sarah A" List-Id: intel-gfx@lists.freedesktop.org T24gMS83LzIwMTYgMToxNSBBTSwgUm9kcmlnbyBWaXZpIHdyb3RlOgo+IFdoZW4gYWRkaW5nIElT X0tBQllMQUtFIGRlZmluaXRpb24gSSBkaWRuJ3QgaW5jbHVkZWQgdGhlCj4gREMgc3RhdGVzIHJl bGF0ZWQgYmVjYXVzZSBJIHdhcyBwbGFuaW5nIHRvIGluY2x1ZGUgdGhlbQo+IHdpdGggdGhlIHBh dGNoIHRoYXQgZml4ZXMgRE1DIGZpcm13YXJlIGxvYWRpbmcsIGJ1dCBJCj4gZm9yZ290IHRoZW0u Cj4KPiBNZWFud2hpbGUgdGhpcyBydW50aW1lIHBtIGNvZGUgY2hhbmdlZCBhIGxvdCBmb3IKPiBT a3lsYWtlLgo+Cj4gV2VsbCwgSSBkaWRuJ3QgZXhwZWN0IHRoYXQgdGhpcyB3b3VsZCBjcmFzaCB0 aGUgbWFjaGluZQo+IGFuZCBJIGp1c3Qgbm90aWNlZCBub3cgdGhhdCBTYXJhaCB3YXJuZWQgbWUg b3VyIGRyaXZlcgo+IHdhc24ndCB3b3JraW5nLiBUaGFua3MgU2FyYWguCj4KPiBDYzogU2FyYWgg U2hhcnAgPHNhcmFoLmEuc2hhcnBAaW50ZWwuY29tPgo+IFNpZ25lZC1vZmYtYnk6IFJvZHJpZ28g Vml2aSA8cm9kcmlnby52aXZpQGludGVsLmNvbT4KPiAtLS0KPiAgIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Nzci5jICAgICAgICB8ICA1ICsrKy0tCj4gICBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9ydW50aW1lX3BtLmMgfCAxOSArKysrKysrKysrKystLS0tLS0tCj4gICAyIGZpbGVz IGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3NyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9jc3IuYwo+IGluZGV4IDliYjYzYTguLjNmNjk4MjkgMTAwNjQ0Cj4gLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3NyLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9jc3IuYwo+IEBAIC0yNzgsNyArMjc4LDggQEAgc3RhdGljIHVpbnQzMl90ICpwYXJz ZV9jc3JfZncoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAo+Cj4gICAJY3NyLT52 ZXJzaW9uID0gY3NzX2hlYWRlci0+dmVyc2lvbjsKPgo+IC0JaWYgKElTX1NLWUxBS0UoZGV2KSAm JiBjc3ItPnZlcnNpb24gPCBTS0xfQ1NSX1ZFUlNJT05fUkVRVUlSRUQpIHsKPiArCWlmICgoSVNf U0tZTEFLRShkZXYpIHx8IElTX0tBQllMQUtFKGRldikpICYmCj4gKwkgICAgIGNzci0+dmVyc2lv biA8IFNLTF9DU1JfVkVSU0lPTl9SRVFVSVJFRCkgewo+ICAgCQlEUk1fSU5GTygiUmVmdXNpbmcg dG8gbG9hZCBvbGQgU2t5bGFrZSBETUMgZmlybXdhcmUgdiV1LiV1LCIKPiAgIAkJCSAiIHBsZWFz ZSB1cGdyYWRlIHRvIHYldS4ldSBvciBsYXRlciIKPiAgIAkJCSAiIFtodHRwczovLzAxLm9yZy9s aW51eGdyYXBoaWNzL2ludGVsLWxpbnV4LWdyYXBoaWNzLWZpcm13YXJlc10uXG4iLAo+IEBAIC00 MjEsNyArNDIyLDcgQEAgdm9pZCBpbnRlbF9jc3JfdWNvZGVfaW5pdChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpCj4gICAJaWYgKCFIQVNfQ1NSKGRldl9wcml2KSkKPiAgIAkJcmV0 dXJuOwo+Cj4gLQlpZiAoSVNfU0tZTEFLRShkZXZfcHJpdikpCj4gKwlpZiAoSVNfU0tZTEFLRShk ZXZfcHJpdikgfHwgSVNfS0FCWUxBS0UoZGV2X3ByaXYpKQo+ICAgCQljc3ItPmZ3X3BhdGggPSBJ OTE1X0NTUl9TS0w7Cj4gICAJZWxzZSBpZiAoSVNfQlJPWFRPTihkZXZfcHJpdikpCj4gICAJCWNz ci0+ZndfcGF0aCA9IEk5MTVfQ1NSX0JYVDsKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcnVudGltZV9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVu dGltZV9wbS5jCj4gaW5kZXggZGRiZGJmZi4uZjViZjU0YyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKPiBAQCAtNTMyLDcgKzUzMiw4IEBAIHN0YXRpYyB2b2lk IGFzc2VydF9jYW5fZW5hYmxlX2RjNShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp Cj4gICAJYm9vbCBwZzJfZW5hYmxlZCA9IGludGVsX2Rpc3BsYXlfcG93ZXJfd2VsbF9pc19lbmFi bGVkKGRldl9wcml2LAo+ICAgCQkJCQlTS0xfRElTUF9QV18yKTsKPgo+IC0JV0FSTl9PTkNFKCFJ U19TS1lMQUtFKGRldiksICJQbGF0Zm9ybSBkb2Vzbid0IHN1cHBvcnQgREM1LlxuIik7Cj4gKwlX QVJOX09OQ0UoIUlTX1NLWUxBS0UoZGV2KSAmJiAhSVNfS0FCWUxBS0UoZGV2KSwKPiArCQkgICJQ bGF0Zm9ybSBkb2Vzbid0IHN1cHBvcnQgREM1LlxuIik7Cj4gICAJV0FSTl9PTkNFKCFIQVNfUlVO VElNRV9QTShkZXYpLCAiUnVudGltZSBQTSBub3QgZW5hYmxlZC5cbiIpOwo+ICAgCVdBUk5fT05D RShwZzJfZW5hYmxlZCwgIlBHMiBub3QgZGlzYWJsZWQgdG8gZW5hYmxlIERDNS5cbiIpOwo+Cj4g QEAgLTU2OCw3ICs1NjksOCBAQCBzdGF0aWMgdm9pZCBhc3NlcnRfY2FuX2VuYWJsZV9kYzYoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQo+ICAgewo+ICAgCXN0cnVjdCBkcm1fZGV2 aWNlICpkZXYgPSBkZXZfcHJpdi0+ZGV2Owo+Cj4gLQlXQVJOX09OQ0UoIUlTX1NLWUxBS0UoZGV2 KSwgIlBsYXRmb3JtIGRvZXNuJ3Qgc3VwcG9ydCBEQzYuXG4iKTsKPiArCVdBUk5fT05DRSghSVNf U0tZTEFLRShkZXYpICYmICFJU19LQUJZTEFLRShkZXYpLAo+ICsJCSAgIlBsYXRmb3JtIGRvZXNu J3Qgc3VwcG9ydCBEQzYuXG4iKTsKPiAgIAlXQVJOX09OQ0UoIUhBU19SVU5USU1FX1BNKGRldiks ICJSdW50aW1lIFBNIG5vdCBlbmFibGVkLlxuIik7Cj4gICAJV0FSTl9PTkNFKEk5MTVfUkVBRChV VElMX1BJTl9DVEwpICYgVVRJTF9QSU5fRU5BQkxFLAo+ICAgCQkgICJCYWNrbGlnaHQgaXMgbm90 IGRpc2FibGVkLlxuIik7Cj4gQEAgLTU5NSw3ICs1OTcsOCBAQCBzdGF0aWMgdm9pZCBnZW45X2Rp c2FibGVfZGM1X2RjNihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCj4gICB7Cj4g ICAJYXNzZXJ0X2Nhbl9kaXNhYmxlX2RjNShkZXZfcHJpdik7Cj4KPiAtCWlmIChJU19TS1lMQUtF KGRldl9wcml2KSAmJiBpOTE1LmVuYWJsZV9kYyAhPSAwICYmIGk5MTUuZW5hYmxlX2RjICE9IDEp Cj4gKwlpZiAoKElTX1NLWUxBS0UoZGV2X3ByaXYpIHx8IElTX0tBQllMQUtFKGRldl9wcml2KSkg JiYKPiArCSAgICBpOTE1LmVuYWJsZV9kYyAhPSAwICYmIGk5MTUuZW5hYmxlX2RjICE9IDEpCj4g ICAJCWFzc2VydF9jYW5fZGlzYWJsZV9kYzYoZGV2X3ByaXYpOwo+Cj4gICAJZ2VuOV9zZXRfZGNf c3RhdGUoZGV2X3ByaXYsIERDX1NUQVRFX0RJU0FCTEUpOwo+IEBAIC03ODMsNyArNzg2LDggQEAg c3RhdGljIHZvaWQgZ2VuOV9kY19vZmZfcG93ZXJfd2VsbF9lbmFibGUoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAo+ICAgc3RhdGljIHZvaWQgZ2VuOV9kY19vZmZfcG93ZXJfd2Vs bF9kaXNhYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKPiAgIAkJCQkJICAg c3RydWN0IGk5MTVfcG93ZXJfd2VsbCAqcG93ZXJfd2VsbCkKPiAgIHsKPiAtCWlmIChJU19TS1lM QUtFKGRldl9wcml2KSAmJiBpOTE1LmVuYWJsZV9kYyAhPSAwICYmIGk5MTUuZW5hYmxlX2RjICE9 IDEpCj4gKwlpZiAoKElTX1NLWUxBS0UoZGV2X3ByaXYpIHx8IElTX0tBQllMQUtFKGRldl9wcml2 KSkgJiYKPiArCSAgICBpOTE1LmVuYWJsZV9kYyAhPSAwICYmIGk5MTUuZW5hYmxlX2RjICE9IDEp Cj4gICAJCXNrbF9lbmFibGVfZGM2KGRldl9wcml2KTsKPiAgIAllbHNlCj4gICAJCWdlbjlfZW5h YmxlX2RjNShkZXZfcHJpdik7Cj4gQEAgLTc5NSw3ICs3OTksOCBAQCBzdGF0aWMgdm9pZCBnZW45 X2RjX29mZl9wb3dlcl93ZWxsX3N5bmNfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2LAo+ICAgCWlmIChwb3dlcl93ZWxsLT5jb3VudCA+IDApIHsKPiAgIAkJZ2VuOV9zZXRfZGNf c3RhdGUoZGV2X3ByaXYsIERDX1NUQVRFX0RJU0FCTEUpOwo+ICAgCX0gZWxzZSB7Cj4gLQkJaWYg KElTX1NLWUxBS0UoZGV2X3ByaXYpICYmIGk5MTUuZW5hYmxlX2RjICE9IDAgJiYKPiArCQlpZiAo KElTX1NLWUxBS0UoZGV2X3ByaXYpIHx8IElTX0tBQllMQUtFKGRldl9wcml2KSkgJiYKPiArCQkg ICAgaTkxNS5lbmFibGVfZGMgIT0gMCAmJgo+ICAgCQkgICAgaTkxNS5lbmFibGVfZGMgIT0gMSkK PiAgIAkJCWdlbjlfc2V0X2RjX3N0YXRlKGRldl9wcml2LCBEQ19TVEFURV9FTl9VUFRPX0RDNik7 Cj4gICAJCWVsc2UKPiBAQCAtMTg1MSw3ICsxODU2LDcgQEAgdm9pZCBza2xfcHcxX21pc2NfaW9f aW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCj4gICB7Cj4gICAJc3RydWN0 IGk5MTVfcG93ZXJfd2VsbCAqd2VsbDsKPgo+IC0JaWYgKCFJU19TS1lMQUtFKGRldl9wcml2KSkK PiArCWlmICghSVNfU0tZTEFLRShkZXZfcHJpdikgJiYgIUlTX0tBQllMQUtFKGRldl9wcml2KSkK PiAgIAkJcmV0dXJuOwo+Cj4gICAJd2VsbCA9IGxvb2t1cF9wb3dlcl93ZWxsKGRldl9wcml2LCBT S0xfRElTUF9QV18xKTsKPiBAQCAtMTg2NSw3ICsxODcwLDcgQEAgdm9pZCBza2xfcHcxX21pc2Nf aW9fZmluaShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCj4gICB7Cj4gICAJc3Ry dWN0IGk5MTVfcG93ZXJfd2VsbCAqd2VsbDsKPgo+IC0JaWYgKCFJU19TS1lMQUtFKGRldl9wcml2 KSkKPiArCWlmICghSVNfU0tZTEFLRShkZXZfcHJpdikgJiYgIUlTX0tBQllMQUtFKGRldl9wcml2 KSkKPiAgIAkJcmV0dXJuOwo+Cj4gICAJd2VsbCA9IGxvb2t1cF9wb3dlcl93ZWxsKGRldl9wcml2 LCBTS0xfRElTUF9QV18xKTsKPgoKSGkgUm9kcmlnbywKCkkgaGFkIHRoZSBzYW1lIGlzc3VlIHdp dGggdGhlIHBvd2VyIHdlbGxzIGFuZCBzZW50IHRoZSBzYW1lIGZpeCAKeWVzdGVyZGF5IAooaHR0 cDovL2NnaXQuZnJlZWRlc2t0b3Aub3JnL2RybS1pbnRlbC9jb21taXQvP2lkPTE2ZmJjMjkxY2I4 N2M3ZGVmY2QxM2FkNzE1ZDNlNGFmMGQ1MjNlNDMpLgoKSSBkaWRuJ3QgdHJ5IHRvIHVzZSBETUMs IHNvIEkgZGlkbid0IGNhdGNoIHRoZSBvdGhlciBwcm9ibGVtLgoKV2l0aG91dCB0aGUgbm93IHJl ZHVuZGFudCBjaGFuZ2VzIGluIHNrbF9wdzFfbWlzY19pb19pbml0L2ZpbmksCgpSZXZpZXdlZC1i eTogTWljaGVsIFRoaWVycnkgPG1pY2hlbC50aGllcnJ5QGludGVsLmNvbT4KCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==