From: Tvrtko Ursulin Subject: [PATCH v5 2/2] drm/i915: Consolidate checks for engine stats availability Date: Wed, 29 Nov 2017 08:24:50 +0000 Message-ID: <20171129082450.18278-1-tvrtko.ursulin@linux.intel.com> References: <20171124112121.31855-2-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-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 43E176E84D for ; Wed, 29 Nov 2017 08:25:01 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id v19so4138287wmh.5 for ; Wed, 29 Nov 2017 00:25:00 -0800 (PST) In-Reply-To: <20171124112121.31855-2-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 KQp2MzogUmViYXNlIGFuZCBtYXJrIEd1QyBhcyBub3QgeWV0IHN1cHBvcnRlZC4gKENocmlzIFdp bHNvbikKdjQ6IE1vdmUgZmxhZyBzZXR0aW5nIHRvIGludGVsX2VuZ2luZXNfcmVzZXRfZGVmYXVs dF9zdWJtaXNzaW9uLgogICAgKENocmlzIFdpbHNvbikKdjU6IE1vdmUgZmxhZyBzZXR0aW5nIHRv IGxvZ2ljYWxfcmluZ19zZXR1cC4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0 a28udXJzdWxpbkBpbnRlbC5jb20+ClN1Z2dlc3RlZC1ieTogU2FnYXIgQXJ1biBLYW1ibGUgPHNh Z2FyLmEua2FtYmxlQGludGVsLmNvbT4KQ2M6IFNhZ2FyIEFydW4gS2FtYmxlIDxzYWdhci5hLmth bWJsZUBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdp bHNvbi5jby51az4gKHYyKQotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcG11LmMgICAg ICAgICAgICAgfCAxMSArKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5n aW5lX2NzLmMgICAgICB8ICA4ICsrKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n dWNfc3VibWlzc2lvbi5jIHwgIDIgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5j ICAgICAgICAgICAgfCAgMiArKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5oICAgICB8ICA2ICsrKysrKwogNSBmaWxlcyBjaGFuZ2VkLCAxOSBpbnNlcnRpb25zKCspLCAx MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Bt dS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUuYwppbmRleCAxYzBlZTlkNjhiMDQu LmU4ZTJmYWY0OTgyZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BtdS5jCkBAIC05MCwxMSArOTAsNiBA QCBzdGF0aWMgdW5zaWduZWQgaW50IGV2ZW50X2VuYWJsZWRfYml0KHN0cnVjdCBwZXJmX2V2ZW50 ICpldmVudCkKIAlyZXR1cm4gY29uZmlnX2VuYWJsZWRfYml0KGV2ZW50LT5hdHRyLmNvbmZpZyk7 CiB9CiAKLXN0YXRpYyBib29sIHN1cHBvcnRzX2J1c3lfc3RhdHMoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmk5MTUpCi17Ci0JcmV0dXJuIElOVEVMX0dFTihpOTE1KSA+PSA4OwotfQotCiBzdGF0 aWMgYm9vbCBwbXVfbmVlZHNfdGltZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsIGJv b2wgZ3B1X2FjdGl2ZSkKIHsKIAl1NjQgZW5hYmxlOwpAQCAtMTIzLDggKzExOCwxMCBAQCBzdGF0 aWMgYm9vbCBwbXVfbmVlZHNfdGltZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsIGJv b2wgZ3B1X2FjdGl2ZSkKIAkvKgogCSAqIEFsc28gdGhlcmUgaXMgc29mdHdhcmUgYnVzeW5lc3Mg dHJhY2tpbmcgYXZhaWxhYmxlIHdlIGRvIG5vdAogCSAqIG5lZWQgdGhlIHRpbWVyIGZvciBJOTE1 X1NBTVBMRV9CVVNZIGNvdW50ZXIuCisJICoKKwkgKiBVc2UgUkNTIGFzIHByb3h5IGZvciBhbGwg ZW5naW5lcy4KIAkgKi8KLQllbHNlIGlmIChzdXBwb3J0c19idXN5X3N0YXRzKGk5MTUpKQorCWVs c2UgaWYgKGludGVsX2VuZ2luZV9zdXBwb3J0c19zdGF0cyhpOTE1LT5lbmdpbmVbUkNTXSkpCiAJ CWVuYWJsZSAmPSB+QklUKEk5MTVfU0FNUExFX0JVU1kpOwogCiAJLyoKQEAgLTQ0Nyw3ICs0NDQs NyBAQCBzdGF0aWMgdm9pZCBpOTE1X3BtdV9ldmVudF9yZWFkKHN0cnVjdCBwZXJmX2V2ZW50ICpl dmVudCkKIAogc3RhdGljIGJvb2wgZW5naW5lX25lZWRzX2J1c3lfc3RhdHMoc3RydWN0IGludGVs X2VuZ2luZV9jcyAqZW5naW5lKQogewotCXJldHVybiBzdXBwb3J0c19idXN5X3N0YXRzKGVuZ2lu ZS0+aTkxNSkgJiYKKwlyZXR1cm4gaW50ZWxfZW5naW5lX3N1cHBvcnRzX3N0YXRzKGVuZ2luZSkg JiYKIAkgICAgICAgKGVuZ2luZS0+cG11LmVuYWJsZSAmIEJJVChJOTE1X1NBTVBMRV9CVVNZKSk7 CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMKaW5kZXggZmVkZTYyZGFm M2UxLi4zMTQzYjhlZDdhMGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2VuZ2luZV9jcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5j CkBAIC0xNTYxLDggKzE1NjEsMTAgQEAgdm9pZCBpbnRlbF9lbmdpbmVzX3Jlc2V0X2RlZmF1bHRf c3VibWlzc2lvbihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIAlzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmU7CiAJZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQ7CiAKLQlmb3JfZWFj aF9lbmdpbmUoZW5naW5lLCBpOTE1LCBpZCkKKwlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBpOTE1 LCBpZCkgewogCQllbmdpbmUtPnNldF9kZWZhdWx0X3N1Ym1pc3Npb24oZW5naW5lKTsKKwkJZW5n aW5lLT5mbGFncyB8PSBJOTE1X0VOR0lORV9TVVBQT1JUU19TVEFUUzsKKwl9CiB9CiAKIC8qKgpA QCAtMTg2Myw3ICsxODY1LDcgQEAgaW50IGludGVsX2VuYWJsZV9lbmdpbmVfc3RhdHMoc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewogCXVuc2lnbmVkIGxvbmcgZmxhZ3M7CiAKLQlp ZiAoSU5URUxfR0VOKGVuZ2luZS0+aTkxNSkgPCA4KQorCWlmICghaW50ZWxfZW5naW5lX3N1cHBv cnRzX3N0YXRzKGVuZ2luZSkpCiAJCXJldHVybiAtRU5PREVWOwogCiAJc3Bpbl9sb2NrX2lycXNh dmUoJmVuZ2luZS0+c3RhdHMubG9jaywgZmxhZ3MpOwpAQCAtMTkyNCw3ICsxOTI2LDcgQEAgdm9p ZCBpbnRlbF9kaXNhYmxlX2VuZ2luZV9zdGF0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdp bmUpCiB7CiAJdW5zaWduZWQgbG9uZyBmbGFnczsKIAotCWlmIChJTlRFTF9HRU4oZW5naW5lLT5p OTE1KSA8IDgpCisJaWYgKCFpbnRlbF9lbmdpbmVfc3VwcG9ydHNfc3RhdHMoZW5naW5lKSkKIAkJ cmV0dXJuOwogCiAJc3Bpbl9sb2NrX2lycXNhdmUoJmVuZ2luZS0+c3RhdHMubG9jaywgZmxhZ3Mp OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX3N1Ym1pc3Npb24u YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19zdWJtaXNzaW9uLmMKaW5kZXggY2Yx Y2MyY2I2NzIyLi45MTJmZjE0M2Q1MzEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Z3VjX3N1Ym1pc3Npb24uYwpAQCAtMTQ1Myw2ICsxNDUzLDggQEAgaW50IGludGVsX2d1Y19zdWJt aXNzaW9uX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJCWV4ZWNsaXN0cy0+dGFza2xl dC5mdW5jID0gZ3VjX3N1Ym1pc3Npb25fdGFza2xldDsKIAkJZW5naW5lLT5wYXJrID0gZ3VjX3N1 Ym1pc3Npb25fcGFyazsKIAkJZW5naW5lLT51bnBhcmsgPSBndWNfc3VibWlzc2lvbl91bnBhcms7 CisKKwkJZW5naW5lLT5mbGFncyAmPSB+STkxNV9FTkdJTkVfU1VQUE9SVFNfU1RBVFM7CiAJfQog CiAJcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDU3MDg2NDU4M2UyOC4u OTA0ZDlmODIxYzJmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtMTk2Myw2ICsxOTYz LDggQEAgbG9naWNhbF9yaW5nX3NldHVwKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkK IAkvKiBJbnRlbnRpb25hbGx5IGxlZnQgYmxhbmsuICovCiAJZW5naW5lLT5idWZmZXIgPSBOVUxM OwogCisJZW5naW5lLT5mbGFncyB8PSBJOTE1X0VOR0lORV9TVVBQT1JUU19TVEFUUzsKKwogCWZ3 X2RvbWFpbnMgPSBpbnRlbF91bmNvcmVfZm9yY2V3YWtlX2Zvcl9yZWcoZGV2X3ByaXYsCiAJCQkJ CQkgICAgUklOR19FTFNQKGVuZ2luZSksCiAJCQkJCQkgICAgRldfUkVHX1dSSVRFKTsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCBhOTFjZTYzYjg4YjYuLmM2OGFi M2VhZDgzYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAtNTQw LDYgKzU0MCw3IEBAIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgewogCXN0cnVjdCBpbnRlbF9lbmdp bmVfaGFuZ2NoZWNrIGhhbmdjaGVjazsKIAogI2RlZmluZSBJOTE1X0VOR0lORV9ORUVEU19DTURf UEFSU0VSIEJJVCgwKQorI2RlZmluZSBJOTE1X0VOR0lORV9TVVBQT1JUU19TVEFUUyAgIEJJVCgx KQogCXVuc2lnbmVkIGludCBmbGFnczsKIAogCS8qCkBAIC02MDQsNiArNjA1LDExIEBAIHN0YXRp YyBpbmxpbmUgYm9vbCBpbnRlbF9lbmdpbmVfbmVlZHNfY21kX3BhcnNlcihzdHJ1Y3QgaW50ZWxf ZW5naW5lX2NzICplbmdpbmUpCiAJcmV0dXJuIGVuZ2luZS0+ZmxhZ3MgJiBJOTE1X0VOR0lORV9O RUVEU19DTURfUEFSU0VSOwogfQogCitzdGF0aWMgaW5saW5lIGJvb2wgaW50ZWxfZW5naW5lX3N1 cHBvcnRzX3N0YXRzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3sKKwlyZXR1cm4g ZW5naW5lLT5mbGFncyAmIEk5MTVfRU5HSU5FX1NVUFBPUlRTX1NUQVRTOworfQorCiBzdGF0aWMg aW5saW5lIHZvaWQKIGV4ZWNsaXN0c19zZXRfYWN0aXZlKHN0cnVjdCBpbnRlbF9lbmdpbmVfZXhl Y2xpc3RzICpleGVjbGlzdHMsCiAJCSAgICAgdW5zaWduZWQgaW50IGJpdCkKLS0gCjIuMTQuMQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==