From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rodrigo Vivi Subject: [PATCH] drm/i915: Simplify has_sagv Date: Mon, 22 Oct 2018 09:57:44 -0700 Message-ID: <20181022165744.11788-1-rodrigo.vivi@intel.com> References: <874ldeh4vi.fsf@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 73E6989CD5 for ; Mon, 22 Oct 2018 16:57:48 +0000 (UTC) In-Reply-To: <874ldeh4vi.fsf@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: Jani Nikula , Lucas De Marchi , Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org TGV0J3MgYWRkIGEgcGxhdGZvcm0gaGFzX3NhZ3YgaW5zdGVhZCBvZiBoYXZpbmcgYSBmdWxsCmZ1 bmN0aW9uIHRoYXQgaGFuZGxlIHBsYXRmb3JtIGJ5IHBsYXRmb3JtLgoKVGhlIHNwZWNpYWxseSBj YXNlIGZvciBTS0wgZm9yIG5vdCBjb250cm9sbGVkIHNhZ3YKaXMgYWxyZWFkeSB0YWtlbiBjYXJl IGluc2lkZSBpbnRlbF9lbmFibGVfc2Fndiwgc28gdGhlcmUncwpubyBuZWVkIHRvIGR1cGxpY2F0 ZSB0aGUgY2hlY2sgaGVyZS4KCnYyOiBHbyBvbmUgc3RlcCBmdXJ0aGVyIGFuZCByZW1vdmUgc2ts IHNwZWNpYWwgY2FzZS4gKEphbmkpCgp2MzogU2VwYXJhdGUgcnVudGltZSBzdGF0dXMgaGFuZGxl IGZyb20gaGFzX3NhZ3YgZmxhZy4gKEphbmkpCgpDYzogSmFuaSBOaWt1bGEgPGphbmkubmlrdWxh QGludGVsLmNvbT4KQ2M6IEx1Y2FzIERlIE1hcmNoaSA8bHVjYXMuZGVtYXJjaGlAaW50ZWwuY29t PgpTaWduZWQtb2ZmLWJ5OiBSb2RyaWdvIFZpdmkgPHJvZHJpZ28udml2aUBpbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgICB8ICAxICsKIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfcGNpLmMgICAgICAgICAgfCAgMSArCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kZXZpY2VfaW5mby5oIHwgIDEgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcG0uYyAgICAgICAgICB8IDI5ICsrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogNCBmaWxl cyBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCAxOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaAppbmRleCAzMDE3ZWYwMzdmZWQuLjliOThjZWIyZDAyOSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCkBAIC0yNjUwLDYgKzI2NTAsNyBAQCBpbnRlbF9pbmZvKGNvbnN0IHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKICNkZWZpbmUgSEFTX0RESShkZXZfcHJpdikJ CSAoKGRldl9wcml2KS0+aW5mby5oYXNfZGRpKQogI2RlZmluZSBIQVNfRlBHQV9EQkdfVU5DTEFJ TUVEKGRldl9wcml2KSAoKGRldl9wcml2KS0+aW5mby5oYXNfZnBnYV9kYmcpCiAjZGVmaW5lIEhB U19QU1IoZGV2X3ByaXYpCQkgKChkZXZfcHJpdiktPmluZm8uaGFzX3BzcikKKyNkZWZpbmUgSEFT X1NBR1YoZGV2X3ByaXYpCQkgKChkZXZfcHJpdiktPmluZm8uaGFzX3NhZ3YpCiAKICNkZWZpbmUg SEFTX1JDNihkZXZfcHJpdikJCSAoKGRldl9wcml2KS0+aW5mby5oYXNfcmM2KQogI2RlZmluZSBI QVNfUkM2cChkZXZfcHJpdikJCSAoKGRldl9wcml2KS0+aW5mby5oYXNfcmM2cCkKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGNpLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3BjaS5jCmluZGV4IDQ0ZTc0NTkyMWFjMS4uMGIwOTE1NWVhYjYyIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BjaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfcGNpLmMKQEAgLTQ2NSw2ICs0NjUsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGlu dGVsX2RldmljZV9pbmZvIGludGVsX2NoZXJyeXZpZXdfaW5mbyA9IHsKIAkuaGFzX2NzciA9IDEs IFwKIAkuaGFzX2d1YyA9IDEsIFwKIAkuaGFzX2lwYyA9IDEsIFwKKwkuaGFzX3NhZ3YgPSAxLCBc CiAJLmRkYl9zaXplID0gODk2CiAKICNkZWZpbmUgU0tMX1BMQVRGT1JNIFwKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RldmljZV9pbmZvLmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kZXZpY2VfaW5mby5oCmluZGV4IGFmNzAwMjY0MGNkZi4uZTc3YzhiNjI3 ODNmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZXZpY2VfaW5mby5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RldmljZV9pbmZvLmgKQEAgLTExNyw2 ICsxMTcsNyBAQCBlbnVtIGludGVsX3BwZ3R0IHsKIAlmdW5jKGh3c19uZWVkc19waHlzaWNhbCk7 IFwKIAlmdW5jKG92ZXJsYXlfbmVlZHNfcGh5c2ljYWwpOyBcCiAJZnVuYyhzdXBwb3J0c190dik7 IFwKKwlmdW5jKGhhc19zYWd2KTsgXAogCWZ1bmMoaGFzX2lwYyk7CiAKICNkZWZpbmUgR0VOX01B WF9TTElDRVMJCSg2KSAvKiBDTkwgdXBwZXIgYm91bmQgKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5j CmluZGV4IDY3YTRkMDczNTI5MS4uN2UzOGVkODQyMWM3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt LmMKQEAgLTM2MDksMjAgKzM2MDksNiBAQCBzdGF0aWMgYm9vbCBza2xfbmVlZHNfbWVtb3J5X2J3 X3dhKHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlKQogCXJldHVybiBmYWxzZTsKIH0K IAotc3RhdGljIGJvb2wKLWludGVsX2hhc19zYWd2KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKLXsKLQlpZiAoSVNfS0FCWUxBS0UoZGV2X3ByaXYpIHx8IElTX0NPRkZFRUxBS0Uo ZGV2X3ByaXYpIHx8Ci0JICAgIElTX0NBTk5PTkxBS0UoZGV2X3ByaXYpIHx8IElTX0lDRUxBS0Uo ZGV2X3ByaXYpKQotCQlyZXR1cm4gdHJ1ZTsKLQotCWlmIChJU19TS1lMQUtFKGRldl9wcml2KSAm JgotCSAgICBkZXZfcHJpdi0+c2Fndl9zdGF0dXMgIT0gSTkxNV9TQUdWX05PVF9DT05UUk9MTEVE KQotCQlyZXR1cm4gdHJ1ZTsKLQotCXJldHVybiBmYWxzZTsKLX0KLQogLyoKICAqIFNBR1YgZHlu YW1pY2FsbHkgYWRqdXN0cyB0aGUgc3lzdGVtIGFnZW50IHZvbHRhZ2UgYW5kIGNsb2NrIGZyZXF1 ZW5jaWVzCiAgKiBkZXBlbmRpbmcgb24gcG93ZXIgYW5kIHBlcmZvcm1hbmNlIHJlcXVpcmVtZW50 cy4gVGhlIGRpc3BsYXkgZW5naW5lIGFjY2VzcwpAQCAtMzYzOSwxMCArMzYyNSwxMSBAQCBpbnRl bF9lbmFibGVfc2FndihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJaW50 IHJldDsKIAotCWlmICghaW50ZWxfaGFzX3NhZ3YoZGV2X3ByaXYpKQorCWlmICghSEFTX1NBR1Yo ZGV2X3ByaXYpKQogCQlyZXR1cm4gMDsKIAotCWlmIChkZXZfcHJpdi0+c2Fndl9zdGF0dXMgPT0g STkxNV9TQUdWX0VOQUJMRUQpCisJaWYgKGRldl9wcml2LT5zYWd2X3N0YXR1cyA9PSBJOTE1X1NB R1ZfRU5BQkxFRCB8fAorCSAgICBkZXZfcHJpdi0+c2Fndl9zdGF0dXMgPT0gSTkxNV9TQUdWX05P VF9DT05UUk9MTEVEKQogCQlyZXR1cm4gMDsKIAogCURSTV9ERUJVR19LTVMoIkVuYWJsaW5nIHRo ZSBTQUdWXG4iKTsKQEAgLTM2NzYsMTAgKzM2NjMsMTEgQEAgaW50ZWxfZGlzYWJsZV9zYWd2KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlpbnQgcmV0OwogCi0JaWYgKCFp bnRlbF9oYXNfc2FndihkZXZfcHJpdikpCisJaWYgKCFIQVNfU0FHVihkZXZfcHJpdikpCiAJCXJl dHVybiAwOwogCi0JaWYgKGRldl9wcml2LT5zYWd2X3N0YXR1cyA9PSBJOTE1X1NBR1ZfRElTQUJM RUQpCisJaWYgKGRldl9wcml2LT5zYWd2X3N0YXR1cyA9PSBJOTE1X1NBR1ZfRElTQUJMRUQgfHwK KwkgICAgZGV2X3ByaXYtPnNhZ3Zfc3RhdHVzID09IEk5MTVfU0FHVl9OT1RfQ09OVFJPTExFRCkK IAkJcmV0dXJuIDA7CiAKIAlEUk1fREVCVUdfS01TKCJEaXNhYmxpbmcgdGhlIFNBR1ZcbiIpOwpA QCAtMzcyMSw3ICszNzA5LDEwIEBAIGJvb2wgaW50ZWxfY2FuX2VuYWJsZV9zYWd2KHN0cnVjdCBk cm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAlpbnQgbGV2ZWwsIGxhdGVuY3k7CiAJaW50IHNhZ3Zf YmxvY2tfdGltZV91czsKIAotCWlmICghaW50ZWxfaGFzX3NhZ3YoZGV2X3ByaXYpKQorCWlmICgh SEFTX1NBR1YoZGV2X3ByaXYpKQorCQlyZXR1cm4gZmFsc2U7CisKKwlpZiAoZGV2X3ByaXYtPnNh Z3Zfc3RhdHVzID09IEk5MTVfU0FHVl9OT1RfQ09OVFJPTExFRCkKIAkJcmV0dXJuIGZhbHNlOwog CiAJaWYgKElTX0dFTjkoZGV2X3ByaXYpKQotLSAKMi4xOS4xCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK