From: Tvrtko Ursulin Subject: [PATCH] drm/i915: Consolidate checks for engine stats availability Date: Wed, 22 Nov 2017 12:05:18 +0000 Message-ID: <20171122120518.11561-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-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 32DEE6E635 for ; Wed, 22 Nov 2017 12:05:28 +0000 (UTC) Received: by mail-wr0-x244.google.com with SMTP id 11so10955542wrb.6 for ; Wed, 22 Nov 2017 04:05:28 -0800 (PST) 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 aW5lLmggb3Igc29tZXRoaW5nLgoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRr by51cnN1bGluQGludGVsLmNvbT4KU3VnZ2VzdGVkLWJ5OiBTYWdhciBBcnVuIEthbWJsZSA8c2Fn YXIuYS5rYW1ibGVAaW50ZWwuY29tPgpDYzogU2FnYXIgQXJ1biBLYW1ibGUgPHNhZ2FyLmEua2Ft YmxlQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BtdS5jICAgICAg ICAgfCA5ICsrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMg IHwgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggfCAyICsr CiAzIGZpbGVzIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BtdS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9wbXUuYwppbmRleCAxMDcxOTM1YmZhNjcuLjExMjI0MzcyMGZmMyAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X3BtdS5jCkBAIC05MCwxMSArOTAsNiBAQCBzdGF0aWMgdW5zaWduZWQgaW50 IGV2ZW50X2VuYWJsZWRfYml0KHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCkKIAlyZXR1cm4gY29u ZmlnX2VuYWJsZWRfYml0KGV2ZW50LT5hdHRyLmNvbmZpZyk7CiB9CiAKLXN0YXRpYyBib29sIHN1 cHBvcnRzX2J1c3lfc3RhdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCi17Ci0JcmV0 dXJuIElOVEVMX0dFTihpOTE1KSA+PSA4OwotfQotCiBzdGF0aWMgYm9vbCBwbXVfbmVlZHNfdGlt ZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsIGJvb2wgZ3B1X2FjdGl2ZSkKIHsKIAl1 NjQgZW5hYmxlOwpAQCAtMTI0LDcgKzExOSw3IEBAIHN0YXRpYyBib29sIHBtdV9uZWVkc190aW1l cihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwgYm9vbCBncHVfYWN0aXZlKQogCSAqIEFs c28gdGhlcmUgaXMgc29mdHdhcmUgYnVzeW5lc3MgdHJhY2tpbmcgYXZhaWxhYmxlIHdlIGRvIG5v dAogCSAqIG5lZWQgdGhlIHRpbWVyIGZvciBJOTE1X1NBTVBMRV9CVVNZIGNvdW50ZXIuCiAJICov Ci0JZWxzZSBpZiAoc3VwcG9ydHNfYnVzeV9zdGF0cyhpOTE1KSkKKwllbHNlIGlmIChpbnRlbF9z dXBwb3J0c19lbmdpbmVfc3RhdHMoaTkxNSkpCiAJCWVuYWJsZSAmPSB+QklUKEk5MTVfU0FNUExF X0JVU1kpOwogCiAJLyoKQEAgLTQ2Myw3ICs0NTgsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X3BtdV9l dmVudF9yZWFkKHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCkKIAogc3RhdGljIGJvb2wgZW5naW5l X25lZWRzX2J1c3lfc3RhdHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewotCXJl dHVybiBzdXBwb3J0c19idXN5X3N0YXRzKGVuZ2luZS0+aTkxNSkgJiYKKwlyZXR1cm4gaW50ZWxf c3VwcG9ydHNfZW5naW5lX3N0YXRzKGVuZ2luZS0+aTkxNSkgJiYKIAkgICAgICAgKGVuZ2luZS0+ cG11LmVuYWJsZSAmIEJJVChJOTE1X1NBTVBMRV9CVVNZKSk7CiB9CiAKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZW5naW5lX2NzLmMKaW5kZXggZmVkZTYyZGFmM2UxLi5kNTM2ODBjMDhjYjAgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jCkBAIC0xODYzLDcgKzE4NjMsNyBA QCBpbnQgaW50ZWxfZW5hYmxlX2VuZ2luZV9zdGF0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpl bmdpbmUpCiB7CiAJdW5zaWduZWQgbG9uZyBmbGFnczsKIAotCWlmIChJTlRFTF9HRU4oZW5naW5l LT5pOTE1KSA8IDgpCisJaWYgKCFpbnRlbF9zdXBwb3J0c19lbmdpbmVfc3RhdHMoZW5naW5lLT5p OTE1KSkKIAkJcmV0dXJuIC1FTk9ERVY7CiAKIAlzcGluX2xvY2tfaXJxc2F2ZSgmZW5naW5lLT5z dGF0cy5sb2NrLCBmbGFncyk7CkBAIC0xOTI0LDcgKzE5MjQsNyBAQCB2b2lkIGludGVsX2Rpc2Fi bGVfZW5naW5lX3N0YXRzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKIAl1bnNp Z25lZCBsb25nIGZsYWdzOwogCi0JaWYgKElOVEVMX0dFTihlbmdpbmUtPmk5MTUpIDwgOCkKKwlp ZiAoIWludGVsX3N1cHBvcnRzX2VuZ2luZV9zdGF0cyhlbmdpbmUtPmk5MTUpKQogCQlyZXR1cm47 CiAKIAlzcGluX2xvY2tfaXJxc2F2ZSgmZW5naW5lLT5zdGF0cy5sb2NrLCBmbGFncyk7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggM2JkMzBkMDExODY2Li4zN2Ez ODlmZjAzMWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZm ZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTEw NTQsNiArMTA1NCw4IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBpbnRlbF9lbmdpbmVfY29udGV4dF9v dXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCXNwaW5fdW5sb2NrX2lycXJlc3Rv cmUoJmVuZ2luZS0+c3RhdHMubG9jaywgZmxhZ3MpOwogfQogCisjZGVmaW5lIGludGVsX3N1cHBv cnRzX2VuZ2luZV9zdGF0cyhpOTE1KSAoSU5URUxfR0VOKGk5MTUpID49IDgpCisKIGludCBpbnRl bF9lbmFibGVfZW5naW5lX3N0YXRzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7CiB2 b2lkIGludGVsX2Rpc2FibGVfZW5naW5lX3N0YXRzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZSk7CiAKLS0gCjIuMTQuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4Cg==