From: Tvrtko Ursulin Subject: [PATCH v7 2/2] drm/i915: Consolidate checks for engine stats availability Date: Wed, 29 Nov 2017 10:28:05 +0000 Message-ID: <20171129102805.22690-1-tvrtko.ursulin@linux.intel.com> References: <151195105181.10143.9851519684372725712@mail.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 010876E8B2 for ; Wed, 29 Nov 2017 10:28:15 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id v19so4853898wmh.5 for ; Wed, 29 Nov 2017 02:28:15 -0800 (PST) In-Reply-To: <151195105181.10143.9851519684372725712@mail.alporthouse.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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNhZ2FyIG5v dGljZWQgdGhlIGNoZWNrIGNhbiBiZSBjb25zb2xpZGF0ZWQgYmV0d2VlbiB0aGUgZW5naW5lIHN0 YXRzCmltcGxlbWVudGF0aW9uIGFuZCB0aGUgUE1VLgoKTXkgZmlyc3QgY2hvaWNlIHdhcyBhIHN0 YXRpYyBpbmxpbmUgaGVscGVyIGJ1dCB0aGF0IGdvdCBpbnRvIGluY2x1ZGUKb3JkZXJpbmcgbWVz cyBxdWlja2x5IGZhc3Qgc28gSSB3ZW50IHdpdGggYSBtYWNybyBpbnN0ZWFkLiBBdCBzb21lIHBv aW50CndlIHNob3VsZCBwZXJoYXBzIGxvb2tpbmcgaW50byB0YWtpbmcgb3V0IHRoZSBub24tcmlu Z3ViZmZlciBiaXRzIGZyb20KaW50ZWxfcmluZ2J1ZmZlci5oIGludG8gYSBuZXcgaW50ZWxfZW5n aW5lLmggb3Igc29tZXRoaW5nLgoKdjI6IFVzZSBlbmdpbmUtPmZsYWdzLiAoQ2hyaXMgV2lsc29u KQp2MzogUmViYXNlIGFuZCBtYXJrIEd1QyBhcyBub3QgeWV0IHN1cHBvcnRlZC4gKENocmlzIFdp bHNvbikKdjQ6IE1vdmUgZmxhZyBzZXR0aW5nIHRvIGludGVsX2VuZ2luZXNfcmVzZXRfZGVmYXVs dF9zdWJtaXNzaW9uLgogICAgKENocmlzIFdpbHNvbikKdjU6IE1vdmUgZmxhZyBzZXR0aW5nIHRv IGxvZ2ljYWxfcmluZ19zZXR1cC4KdjY6IGludGVsX2VuZ2luZXNfcmVzZXRfZGVmYXVsdF9zdWJt aXNzaW9uIGlzIHRoZSB3cm9uZyBwbGFjZSB0byBzZXQgdGhlCiAgICBmbGFnIC0gaXQgbmVlZHMg dG8gYmUgaW4gZXhlY2xpc3RzX3NldF9kZWZhdWx0X3N1Ym1pc3Npb24uIChTYWdhcikKdjc6IEZs YWcgc2V0dGluZyBpbiBsb2dpY2FsX3Jpbmdfc2V0dXAgaXMgbm90IHJlcXVpcmVkLiAoQ2hyaXMp CgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29t PgpTdWdnZXN0ZWQtYnk6IFNhZ2FyIEFydW4gS2FtYmxlIDxzYWdhci5hLmthbWJsZUBpbnRlbC5j b20+CkNjOiBTYWdhciBBcnVuIEthbWJsZSA8c2FnYXIuYS5rYW1ibGVAaW50ZWwuY29tPgpSZXZp ZXdlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ClJldmlld2Vk LWJ5OiBTYWdhciBBcnVuIEthbWJsZSA8c2FnYXIuYS5rYW1ibGVAaW50ZWwuY29tPiAodjYpCi0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUuYyAgICAgICAgICAgICB8IDExICsrKyst LS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYyAgICAgIHwgIDQg KystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX3N1Ym1pc3Npb24uYyB8ICAyICsr CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgICAgIHwgIDIgKysKIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCAgICAgfCAgNiArKysrKysKIDUg ZmlsZXMgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BtdS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9wbXUuYwppbmRleCAxYzBlZTlkNjhiMDQuLmU4ZTJmYWY0OTgyZiAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X3BtdS5jCkBAIC05MCwxMSArOTAsNiBAQCBzdGF0aWMgdW5zaWduZWQgaW50IGV2 ZW50X2VuYWJsZWRfYml0KHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCkKIAlyZXR1cm4gY29uZmln X2VuYWJsZWRfYml0KGV2ZW50LT5hdHRyLmNvbmZpZyk7CiB9CiAKLXN0YXRpYyBib29sIHN1cHBv cnRzX2J1c3lfc3RhdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCi17Ci0JcmV0dXJu IElOVEVMX0dFTihpOTE1KSA+PSA4OwotfQotCiBzdGF0aWMgYm9vbCBwbXVfbmVlZHNfdGltZXIo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsIGJvb2wgZ3B1X2FjdGl2ZSkKIHsKIAl1NjQg ZW5hYmxlOwpAQCAtMTIzLDggKzExOCwxMCBAQCBzdGF0aWMgYm9vbCBwbXVfbmVlZHNfdGltZXIo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsIGJvb2wgZ3B1X2FjdGl2ZSkKIAkvKgogCSAq IEFsc28gdGhlcmUgaXMgc29mdHdhcmUgYnVzeW5lc3MgdHJhY2tpbmcgYXZhaWxhYmxlIHdlIGRv IG5vdAogCSAqIG5lZWQgdGhlIHRpbWVyIGZvciBJOTE1X1NBTVBMRV9CVVNZIGNvdW50ZXIuCisJ ICoKKwkgKiBVc2UgUkNTIGFzIHByb3h5IGZvciBhbGwgZW5naW5lcy4KIAkgKi8KLQllbHNlIGlm IChzdXBwb3J0c19idXN5X3N0YXRzKGk5MTUpKQorCWVsc2UgaWYgKGludGVsX2VuZ2luZV9zdXBw b3J0c19zdGF0cyhpOTE1LT5lbmdpbmVbUkNTXSkpCiAJCWVuYWJsZSAmPSB+QklUKEk5MTVfU0FN UExFX0JVU1kpOwogCiAJLyoKQEAgLTQ0Nyw3ICs0NDQsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X3Bt dV9ldmVudF9yZWFkKHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCkKIAogc3RhdGljIGJvb2wgZW5n aW5lX25lZWRzX2J1c3lfc3RhdHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewot CXJldHVybiBzdXBwb3J0c19idXN5X3N0YXRzKGVuZ2luZS0+aTkxNSkgJiYKKwlyZXR1cm4gaW50 ZWxfZW5naW5lX3N1cHBvcnRzX3N0YXRzKGVuZ2luZSkgJiYKIAkgICAgICAgKGVuZ2luZS0+cG11 LmVuYWJsZSAmIEJJVChJOTE1X1NBTVBMRV9CVVNZKSk7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZW5naW5lX2NzLmMKaW5kZXggZmVkZTYyZGFmM2UxLi5jZmZkMGM4MTJiN2UgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jCkBAIC0xODYzLDcgKzE4NjMsNyBAQCBp bnQgaW50ZWxfZW5hYmxlX2VuZ2luZV9zdGF0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUpCiB7CiAJdW5zaWduZWQgbG9uZyBmbGFnczsKIAotCWlmIChJTlRFTF9HRU4oZW5naW5lLT5p OTE1KSA8IDgpCisJaWYgKCFpbnRlbF9lbmdpbmVfc3VwcG9ydHNfc3RhdHMoZW5naW5lKSkKIAkJ cmV0dXJuIC1FTk9ERVY7CiAKIAlzcGluX2xvY2tfaXJxc2F2ZSgmZW5naW5lLT5zdGF0cy5sb2Nr LCBmbGFncyk7CkBAIC0xOTI0LDcgKzE5MjQsNyBAQCB2b2lkIGludGVsX2Rpc2FibGVfZW5naW5l X3N0YXRzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKIAl1bnNpZ25lZCBsb25n IGZsYWdzOwogCi0JaWYgKElOVEVMX0dFTihlbmdpbmUtPmk5MTUpIDwgOCkKKwlpZiAoIWludGVs X2VuZ2luZV9zdXBwb3J0c19zdGF0cyhlbmdpbmUpKQogCQlyZXR1cm47CiAKIAlzcGluX2xvY2tf aXJxc2F2ZSgmZW5naW5lLT5zdGF0cy5sb2NrLCBmbGFncyk7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZ3VjX3N1Ym1pc3Npb24uYwppbmRleCBjZjFjYzJjYjY3MjIuLjkxMmZmMTQzZDUz MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX3N1Ym1pc3Npb24u YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfc3VibWlzc2lvbi5jCkBAIC0x NDUzLDYgKzE0NTMsOCBAQCBpbnQgaW50ZWxfZ3VjX3N1Ym1pc3Npb25fZW5hYmxlKHN0cnVjdCBp bnRlbF9ndWMgKmd1YykKIAkJZXhlY2xpc3RzLT50YXNrbGV0LmZ1bmMgPSBndWNfc3VibWlzc2lv bl90YXNrbGV0OwogCQllbmdpbmUtPnBhcmsgPSBndWNfc3VibWlzc2lvbl9wYXJrOwogCQllbmdp bmUtPnVucGFyayA9IGd1Y19zdWJtaXNzaW9uX3VucGFyazsKKworCQllbmdpbmUtPmZsYWdzICY9 IH5JOTE1X0VOR0lORV9TVVBQT1JUU19TVEFUUzsKIAl9CiAKIAlyZXR1cm4gMDsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmMKaW5kZXggNTcwODY0NTgzZTI4Li4yYTgxNjBmNjAzYWIgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5jCkBAIC0xOTE5LDYgKzE5MTksOCBAQCBzdGF0aWMgdm9pZCBleGVj bGlzdHNfc2V0X2RlZmF1bHRfc3VibWlzc2lvbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUpCiAKIAllbmdpbmUtPnBhcmsgPSBOVUxMOwogCWVuZ2luZS0+dW5wYXJrID0gTlVMTDsKKwor CWVuZ2luZS0+ZmxhZ3MgfD0gSTkxNV9FTkdJTkVfU1VQUE9SVFNfU1RBVFM7CiB9CiAKIHN0YXRp YyB2b2lkCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggYTkxY2U2 M2I4OGI2Li5jNjhhYjNlYWQ4M2MgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm ZmVyLmgKQEAgLTU0MCw2ICs1NDAsNyBAQCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzIHsKIAlzdHJ1 Y3QgaW50ZWxfZW5naW5lX2hhbmdjaGVjayBoYW5nY2hlY2s7CiAKICNkZWZpbmUgSTkxNV9FTkdJ TkVfTkVFRFNfQ01EX1BBUlNFUiBCSVQoMCkKKyNkZWZpbmUgSTkxNV9FTkdJTkVfU1VQUE9SVFNf U1RBVFMgICBCSVQoMSkKIAl1bnNpZ25lZCBpbnQgZmxhZ3M7CiAKIAkvKgpAQCAtNjA0LDYgKzYw NSwxMSBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaW50ZWxfZW5naW5lX25lZWRzX2NtZF9wYXJzZXIo c3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCXJldHVybiBlbmdpbmUtPmZsYWdzICYg STkxNV9FTkdJTkVfTkVFRFNfQ01EX1BBUlNFUjsKIH0KIAorc3RhdGljIGlubGluZSBib29sIGlu dGVsX2VuZ2luZV9zdXBwb3J0c19zdGF0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUp Cit7CisJcmV0dXJuIGVuZ2luZS0+ZmxhZ3MgJiBJOTE1X0VOR0lORV9TVVBQT1JUU19TVEFUUzsK K30KKwogc3RhdGljIGlubGluZSB2b2lkCiBleGVjbGlzdHNfc2V0X2FjdGl2ZShzdHJ1Y3QgaW50 ZWxfZW5naW5lX2V4ZWNsaXN0cyAqZXhlY2xpc3RzLAogCQkgICAgIHVuc2lnbmVkIGludCBiaXQp Ci0tIAoyLjE0LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=