From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH v4 3/4] drm/i915: Consolidate checks for engine stats availability Date: Tue, 28 Nov 2017 13:04:21 +0000 Message-ID: <20171128130421.4827-1-tvrtko.ursulin@linux.intel.com> References: <151187399227.22640.8125964627929393921@mail.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8954D6E5FC for ; Tue, 28 Nov 2017 13:04:32 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id r68so1701209wmr.3 for ; Tue, 28 Nov 2017 05:04:32 -0800 (PST) In-Reply-To: <151187399227.22640.8125964627929393921@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 dF9zdWJtaXNzaW9uLgogICAgKENocmlzIFdpbHNvbikKClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBV cnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+ClN1Z2dlc3RlZC1ieTogU2FnYXIgQXJ1 biBLYW1ibGUgPHNhZ2FyLmEua2FtYmxlQGludGVsLmNvbT4KQ2M6IFNhZ2FyIEFydW4gS2FtYmxl IDxzYWdhci5hLmthbWJsZUBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNo cmlzQGNocmlzLXdpbHNvbi5jby51az4gKHYyKQotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfcG11LmMgICAgICAgICAgICAgfCAxMSArKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZW5naW5lX2NzLmMgICAgICB8ICA4ICsrKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ndWNfc3VibWlzc2lvbi5jIHwgIDIgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5jICAgICAgICAgICAgfCAgMiArKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcmluZ2J1ZmZlci5oICAgICB8ICA2ICsrKysrKwogNSBmaWxlcyBjaGFuZ2VkLCAxOSBpbnNl cnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X3BtdS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUuYwppbmRleCAz MzU3YjY5MGNlOTAuLmMzYzY0MWVjOTYyYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9wbXUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BtdS5jCkBAIC05 MCwxMSArOTAsNiBAQCBzdGF0aWMgdW5zaWduZWQgaW50IGV2ZW50X2VuYWJsZWRfYml0KHN0cnVj dCBwZXJmX2V2ZW50ICpldmVudCkKIAlyZXR1cm4gY29uZmlnX2VuYWJsZWRfYml0KGV2ZW50LT5h dHRyLmNvbmZpZyk7CiB9CiAKLXN0YXRpYyBib29sIHN1cHBvcnRzX2J1c3lfc3RhdHMoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCi17Ci0JcmV0dXJuIElOVEVMX0dFTihpOTE1KSA+PSA4 OwotfQotCiBzdGF0aWMgYm9vbCBwbXVfbmVlZHNfdGltZXIoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmk5MTUsIGJvb2wgZ3B1X2FjdGl2ZSkKIHsKIAl1NjQgZW5hYmxlOwpAQCAtMTIzLDggKzEx OCwxMCBAQCBzdGF0aWMgYm9vbCBwbXVfbmVlZHNfdGltZXIoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmk5MTUsIGJvb2wgZ3B1X2FjdGl2ZSkKIAkvKgogCSAqIEFsc28gdGhlcmUgaXMgc29mdHdh cmUgYnVzeW5lc3MgdHJhY2tpbmcgYXZhaWxhYmxlIHdlIGRvIG5vdAogCSAqIG5lZWQgdGhlIHRp bWVyIGZvciBJOTE1X1NBTVBMRV9CVVNZIGNvdW50ZXIuCisJICoKKwkgKiBVc2UgUkNTIGFzIHBy b3h5IGZvciBhbGwgZW5naW5lcy4KIAkgKi8KLQllbHNlIGlmIChzdXBwb3J0c19idXN5X3N0YXRz KGk5MTUpKQorCWVsc2UgaWYgKGludGVsX2VuZ2luZV9zdXBwb3J0c19zdGF0cyhpOTE1LT5lbmdp bmVbUkNTXSkpCiAJCWVuYWJsZSAmPSB+QklUKEk5MTVfU0FNUExFX0JVU1kpOwogCiAJLyoKQEAg LTQ0Nyw3ICs0NDQsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X3BtdV9ldmVudF9yZWFkKHN0cnVjdCBw ZXJmX2V2ZW50ICpldmVudCkKIAogc3RhdGljIGJvb2wgZW5naW5lX25lZWRzX2J1c3lfc3RhdHMo c3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewotCXJldHVybiBzdXBwb3J0c19idXN5 X3N0YXRzKGVuZ2luZS0+aTkxNSkgJiYKKwlyZXR1cm4gaW50ZWxfZW5naW5lX3N1cHBvcnRzX3N0 YXRzKGVuZ2luZSkgJiYKIAkgICAgICAgKGVuZ2luZS0+cG11LmVuYWJsZSAmIEJJVChJOTE1X1NB TVBMRV9CVVNZKSk7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2VuZ2luZV9jcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMKaW5k ZXggZDI3ZTEyNGQ4MjZhLi5hMzVmOGQzYTU1ZmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2VuZ2luZV9jcy5jCkBAIC0xNTI3LDggKzE1MjcsMTAgQEAgdm9pZCBpbnRlbF9lbmdpbmVzX3Jl c2V0X2RlZmF1bHRfc3VibWlzc2lvbihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIAlz dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmU7CiAJZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQ7 CiAKLQlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBpOTE1LCBpZCkKKwlmb3JfZWFjaF9lbmdpbmUo ZW5naW5lLCBpOTE1LCBpZCkgewogCQllbmdpbmUtPnNldF9kZWZhdWx0X3N1Ym1pc3Npb24oZW5n aW5lKTsKKwkJZW5naW5lLT5mbGFncyB8PSBJOTE1X0VOR0lORV9TVVBQT1JUU19TVEFUUzsKKwl9 CiB9CiAKIC8qKgpAQCAtMTgyOSw3ICsxODMxLDcgQEAgaW50IGludGVsX2VuYWJsZV9lbmdpbmVf c3RhdHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewogCXVuc2lnbmVkIGxvbmcg ZmxhZ3M7CiAKLQlpZiAoSU5URUxfR0VOKGVuZ2luZS0+aTkxNSkgPCA4KQorCWlmICghaW50ZWxf ZW5naW5lX3N1cHBvcnRzX3N0YXRzKGVuZ2luZSkpCiAJCXJldHVybiAtRU5PREVWOwogCiAJc3Bp bl9sb2NrX2lycXNhdmUoJmVuZ2luZS0+c3RhdHMubG9jaywgZmxhZ3MpOwpAQCAtMTg5MCw3ICsx ODkyLDcgQEAgdm9pZCBpbnRlbF9kaXNhYmxlX2VuZ2luZV9zdGF0cyhzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICplbmdpbmUpCiB7CiAJdW5zaWduZWQgbG9uZyBmbGFnczsKIAotCWlmIChJTlRFTF9H RU4oZW5naW5lLT5pOTE1KSA8IDgpCisJaWYgKCFpbnRlbF9lbmdpbmVfc3VwcG9ydHNfc3RhdHMo ZW5naW5lKSkKIAkJcmV0dXJuOwogCiAJc3Bpbl9sb2NrX2lycXNhdmUoJmVuZ2luZS0+c3RhdHMu bG9jaywgZmxhZ3MpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3Vj X3N1Ym1pc3Npb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19zdWJtaXNzaW9u LmMKaW5kZXggY2YxY2MyY2I2NzIyLi45MTJmZjE0M2Q1MzEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2d1Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZ3VjX3N1Ym1pc3Npb24uYwpAQCAtMTQ1Myw2ICsxNDUzLDggQEAgaW50IGlu dGVsX2d1Y19zdWJtaXNzaW9uX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJCWV4ZWNs aXN0cy0+dGFza2xldC5mdW5jID0gZ3VjX3N1Ym1pc3Npb25fdGFza2xldDsKIAkJZW5naW5lLT5w YXJrID0gZ3VjX3N1Ym1pc3Npb25fcGFyazsKIAkJZW5naW5lLT51bnBhcmsgPSBndWNfc3VibWlz c2lvbl91bnBhcms7CisKKwkJZW5naW5lLT5mbGFncyAmPSB+STkxNV9FTkdJTkVfU1VQUE9SVFNf U1RBVFM7CiAJfQogCiAJcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IDQ3 OWY4ODBjMGYyZi4uYjgxMWY3Y2RkZDdlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAt MTk4Myw2ICsxOTgzLDggQEAgaW50ZWxfZW5naW5lX3NldHVwX2V4ZWNsaXN0KHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZSkKIAogCWV4ZWNsaXN0cy0+cXVldWUgPSBSQl9ST09UOwogCWV4 ZWNsaXN0cy0+Zmlyc3QgPSBOVUxMOworCisJZW5naW5lLT5mbGFncyB8PSBJOTE1X0VOR0lORV9T VVBQT1JUU19TVEFUUzsKIH0KIAogc3RhdGljIHZvaWQKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3JpbmdidWZmZXIuaAppbmRleCBhOTFjZTYzYjg4YjYuLmM2OGFiM2VhZDgzYyAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAtNTQwLDYgKzU0MCw3IEBAIHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfaGFuZ2NoZWNrIGhhbmdj aGVjazsKIAogI2RlZmluZSBJOTE1X0VOR0lORV9ORUVEU19DTURfUEFSU0VSIEJJVCgwKQorI2Rl ZmluZSBJOTE1X0VOR0lORV9TVVBQT1JUU19TVEFUUyAgIEJJVCgxKQogCXVuc2lnbmVkIGludCBm bGFnczsKIAogCS8qCkBAIC02MDQsNiArNjA1LDExIEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpbnRl bF9lbmdpbmVfbmVlZHNfY21kX3BhcnNlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUp CiAJcmV0dXJuIGVuZ2luZS0+ZmxhZ3MgJiBJOTE1X0VOR0lORV9ORUVEU19DTURfUEFSU0VSOwog fQogCitzdGF0aWMgaW5saW5lIGJvb2wgaW50ZWxfZW5naW5lX3N1cHBvcnRzX3N0YXRzKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3sKKwlyZXR1cm4gZW5naW5lLT5mbGFncyAmIEk5 MTVfRU5HSU5FX1NVUFBPUlRTX1NUQVRTOworfQorCiBzdGF0aWMgaW5saW5lIHZvaWQKIGV4ZWNs aXN0c19zZXRfYWN0aXZlKHN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3RzICpleGVjbGlzdHMs CiAJCSAgICAgdW5zaWduZWQgaW50IGJpdCkKLS0gCjIuMTQuMQoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==