From: Tvrtko Ursulin Subject: [PATCH 2/2] drm/i915: Consolidate checks for engine stats availability Date: Fri, 24 Nov 2017 11:21:21 +0000 Message-ID: <20171124112121.31855-2-tvrtko.ursulin@linux.intel.com> References: <20171124112121.31855-1-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 932F96E928 for ; Fri, 24 Nov 2017 11:21:33 +0000 (UTC) Received: by mail-wr0-x241.google.com with SMTP id 55so3786611wrx.0 for ; Fri, 24 Nov 2017 03:21:33 -0800 (PST) In-Reply-To: <20171124112121.31855-1-tvrtko.ursulin@linux.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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNhZ2FyIG5v dGljZWQgdGhlIGNoZWNrIGNhbiBiZSBjb25zb2xpZGF0ZWQgYmV0d2VlbiB0aGUgZW5naW5lIHN0 YXRzCmltcGxlbWVudGF0aW9uIGFuZCB0aGUgUE1VLgoKTXkgZmlyc3QgY2hvaWNlIHdhcyBhIHN0 YXRpYyBpbmxpbmUgaGVscGVyIGJ1dCB0aGF0IGdvdCBpbnRvIGluY2x1ZGUKb3JkZXJpbmcgbWVz cyBxdWlja2x5IGZhc3Qgc28gSSB3ZW50IHdpdGggYSBtYWNybyBpbnN0ZWFkLiBBdCBzb21lIHBv aW50CndlIHNob3VsZCBwZXJoYXBzIGxvb2tpbmcgaW50byB0YWtpbmcgb3V0IHRoZSBub24tcmlu Z3ViZmZlciBiaXRzIGZyb20KaW50ZWxfcmluZ2J1ZmZlci5oIGludG8gYSBuZXcgaW50ZWxfZW5n aW5lLmggb3Igc29tZXRoaW5nLgoKdjI6IFVzZSBlbmdpbmUtPmZsYWdzLiAoQ2hyaXMgV2lsc29u KQoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNv bT4KU3VnZ2VzdGVkLWJ5OiBTYWdhciBBcnVuIEthbWJsZSA8c2FnYXIuYS5rYW1ibGVAaW50ZWwu Y29tPgpDYzogU2FnYXIgQXJ1biBLYW1ibGUgPHNhZ2FyLmEua2FtYmxlQGludGVsLmNvbT4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BtdS5jICAgICAgICAgfCAxMSArKysrLS0tLS0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMgIHwgIDcgKysrKystLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIHwgIDYgKysrKysrCiAzIGZp bGVzIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfcG11LmMKaW5kZXggNjg1YWVmMWQ4MWI5Li5jY2NlOWM4NGFkZDEgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcG11LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9wbXUuYwpAQCAtOTAsMTEgKzkwLDYgQEAgc3RhdGljIHVuc2lnbmVkIGludCBldmVu dF9lbmFibGVkX2JpdChzdHJ1Y3QgcGVyZl9ldmVudCAqZXZlbnQpCiAJcmV0dXJuIGNvbmZpZ19l bmFibGVkX2JpdChldmVudC0+YXR0ci5jb25maWcpOwogfQogCi1zdGF0aWMgYm9vbCBzdXBwb3J0 c19idXN5X3N0YXRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQotewotCXJldHVybiBJ TlRFTF9HRU4oaTkxNSkgPj0gODsKLX0KLQogc3RhdGljIGJvb2wgcG11X25lZWRzX3RpbWVyKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LCBib29sIGdwdV9hY3RpdmUpCiB7CiAJdTY0IGVu YWJsZTsKQEAgLTEyMyw4ICsxMTgsMTAgQEAgc3RhdGljIGJvb2wgcG11X25lZWRzX3RpbWVyKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LCBib29sIGdwdV9hY3RpdmUpCiAJLyoKIAkgKiBB bHNvIHRoZXJlIGlzIHNvZnR3YXJlIGJ1c3luZXNzIHRyYWNraW5nIGF2YWlsYWJsZSB3ZSBkbyBu b3QKIAkgKiBuZWVkIHRoZSB0aW1lciBmb3IgSTkxNV9TQU1QTEVfQlVTWSBjb3VudGVyLgorCSAq CisJICogVXNlIFJDUyBhcyBwcm94eSBmb3IgYWxsIGVuZ2luZXMuCiAJICovCi0JZWxzZSBpZiAo c3VwcG9ydHNfYnVzeV9zdGF0cyhpOTE1KSkKKwllbHNlIGlmIChpbnRlbF9lbmdpbmVfc3VwcG9y dHNfc3RhdHMoaTkxNS0+ZW5naW5lW1JDU10pKQogCQllbmFibGUgJj0gfkJJVChJOTE1X1NBTVBM RV9CVVNZKTsKIAogCS8qCkBAIC00NTgsNyArNDU1LDcgQEAgc3RhdGljIHZvaWQgaTkxNV9wbXVf ZXZlbnRfcmVhZChzdHJ1Y3QgcGVyZl9ldmVudCAqZXZlbnQpCiAKIHN0YXRpYyBib29sIGVuZ2lu ZV9uZWVkc19idXN5X3N0YXRzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKLQly ZXR1cm4gc3VwcG9ydHNfYnVzeV9zdGF0cyhlbmdpbmUtPmk5MTUpICYmCisJcmV0dXJuIGludGVs X2VuZ2luZV9zdXBwb3J0c19zdGF0cyhlbmdpbmUpICYmCiAJICAgICAgIChlbmdpbmUtPnBtdS5l bmFibGUgJiBCSVQoSTkxNV9TQU1QTEVfQlVTWSkpOwogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2VuZ2luZV9jcy5jCmluZGV4IGZlZGU2MmRhZjNlMS4uMWVlOGM4ZGNjMmM3IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfY3MuYwpAQCAtNDIwLDYgKzQyMCw5IEBAIHN0YXRp YyB2b2lkIGludGVsX2VuZ2luZV9pbml0X2V4ZWNsaXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KmVuZ2luZSkKIAogCWV4ZWNsaXN0cy0+cXVldWUgPSBSQl9ST09UOwogCWV4ZWNsaXN0cy0+Zmly c3QgPSBOVUxMOworCisJaWYgKElOVEVMX0dFTihlbmdpbmUtPmk5MTUpID49OCkKKwkJZW5naW5l LT5mbGFncyB8PSBJOTE1X0VOR0lORV9TVVBQT1JUU19TVEFUUzsKIH0KIAogLyoqCkBAIC0xODYz LDcgKzE4NjYsNyBAQCBpbnQgaW50ZWxfZW5hYmxlX2VuZ2luZV9zdGF0cyhzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmUpCiB7CiAJdW5zaWduZWQgbG9uZyBmbGFnczsKIAotCWlmIChJTlRF TF9HRU4oZW5naW5lLT5pOTE1KSA8IDgpCisJaWYgKCFpbnRlbF9lbmdpbmVfc3VwcG9ydHNfc3Rh dHMoZW5naW5lKSkKIAkJcmV0dXJuIC1FTk9ERVY7CiAKIAlzcGluX2xvY2tfaXJxc2F2ZSgmZW5n aW5lLT5zdGF0cy5sb2NrLCBmbGFncyk7CkBAIC0xOTI0LDcgKzE5MjcsNyBAQCB2b2lkIGludGVs X2Rpc2FibGVfZW5naW5lX3N0YXRzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsK IAl1bnNpZ25lZCBsb25nIGZsYWdzOwogCi0JaWYgKElOVEVMX0dFTihlbmdpbmUtPmk5MTUpIDwg OCkKKwlpZiAoIWludGVsX2VuZ2luZV9zdXBwb3J0c19zdGF0cyhlbmdpbmUpKQogCQlyZXR1cm47 CiAKIAlzcGluX2xvY2tfaXJxc2F2ZSgmZW5naW5lLT5zdGF0cy5sb2NrLCBmbGFncyk7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggYTkxY2U2M2I4OGI2Li5jNjhh YjNlYWQ4M2MgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZm ZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTU0 MCw2ICs1NDAsNyBAQCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzIHsKIAlzdHJ1Y3QgaW50ZWxfZW5n aW5lX2hhbmdjaGVjayBoYW5nY2hlY2s7CiAKICNkZWZpbmUgSTkxNV9FTkdJTkVfTkVFRFNfQ01E X1BBUlNFUiBCSVQoMCkKKyNkZWZpbmUgSTkxNV9FTkdJTkVfU1VQUE9SVFNfU1RBVFMgICBCSVQo MSkKIAl1bnNpZ25lZCBpbnQgZmxhZ3M7CiAKIAkvKgpAQCAtNjA0LDYgKzYwNSwxMSBAQCBzdGF0 aWMgaW5saW5lIGJvb2wgaW50ZWxfZW5naW5lX25lZWRzX2NtZF9wYXJzZXIoc3RydWN0IGludGVs X2VuZ2luZV9jcyAqZW5naW5lKQogCXJldHVybiBlbmdpbmUtPmZsYWdzICYgSTkxNV9FTkdJTkVf TkVFRFNfQ01EX1BBUlNFUjsKIH0KIAorc3RhdGljIGlubGluZSBib29sIGludGVsX2VuZ2luZV9z dXBwb3J0c19zdGF0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCit7CisJcmV0dXJu IGVuZ2luZS0+ZmxhZ3MgJiBJOTE1X0VOR0lORV9TVVBQT1JUU19TVEFUUzsKK30KKwogc3RhdGlj IGlubGluZSB2b2lkCiBleGVjbGlzdHNfc2V0X2FjdGl2ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2V4 ZWNsaXN0cyAqZXhlY2xpc3RzLAogCQkgICAgIHVuc2lnbmVkIGludCBiaXQpCi0tIAoyLjE0LjEK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=