From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 3/4] drm/i915: Consolidate checks for engine stats availability Date: Tue, 28 Nov 2017 12:41:29 +0000 Message-ID: <20171128124130.4128-3-tvrtko.ursulin@linux.intel.com> References: <20171128124130.4128-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-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id ED19F6E2FA for ; Tue, 28 Nov 2017 12:41:42 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id 124so1573618wmv.1 for ; Tue, 28 Nov 2017 04:41:42 -0800 (PST) In-Reply-To: <20171128124130.4128-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 KQp2MzogUmViYXNlIGFuZCBtYXJrIEd1QyBhcyBub3QgeWV0IHN1cHBvcnRlZC4gKENocmlzIFdp bHNvbikKClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRl bC5jb20+ClN1Z2dlc3RlZC1ieTogU2FnYXIgQXJ1biBLYW1ibGUgPHNhZ2FyLmEua2FtYmxlQGlu dGVsLmNvbT4KQ2M6IFNhZ2FyIEFydW4gS2FtYmxlIDxzYWdhci5hLmthbWJsZUBpbnRlbC5jb20+ ClJldmlld2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4gKHYy KQotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcG11LmMgICAgICAgICAgICAgfCAxMSAr KysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMgICAgICB8 ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19zdWJtaXNzaW9uLmMgfCAg NyArKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgICAgIHwg IDIgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCAgICAgfCAgNiAr KysrKysKIDUgZmlsZXMgY2hhbmdlZCwgMjEgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BtdS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9wbXUuYwppbmRleCAzMzU3YjY5MGNlOTAuLmMzYzY0MWVjOTYyYiAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X3BtdS5jCkBAIC05MCwxMSArOTAsNiBAQCBzdGF0aWMgdW5zaWdu ZWQgaW50IGV2ZW50X2VuYWJsZWRfYml0KHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCkKIAlyZXR1 cm4gY29uZmlnX2VuYWJsZWRfYml0KGV2ZW50LT5hdHRyLmNvbmZpZyk7CiB9CiAKLXN0YXRpYyBi b29sIHN1cHBvcnRzX2J1c3lfc3RhdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCi17 Ci0JcmV0dXJuIElOVEVMX0dFTihpOTE1KSA+PSA4OwotfQotCiBzdGF0aWMgYm9vbCBwbXVfbmVl ZHNfdGltZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsIGJvb2wgZ3B1X2FjdGl2ZSkK IHsKIAl1NjQgZW5hYmxlOwpAQCAtMTIzLDggKzExOCwxMCBAQCBzdGF0aWMgYm9vbCBwbXVfbmVl ZHNfdGltZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsIGJvb2wgZ3B1X2FjdGl2ZSkK IAkvKgogCSAqIEFsc28gdGhlcmUgaXMgc29mdHdhcmUgYnVzeW5lc3MgdHJhY2tpbmcgYXZhaWxh YmxlIHdlIGRvIG5vdAogCSAqIG5lZWQgdGhlIHRpbWVyIGZvciBJOTE1X1NBTVBMRV9CVVNZIGNv dW50ZXIuCisJICoKKwkgKiBVc2UgUkNTIGFzIHByb3h5IGZvciBhbGwgZW5naW5lcy4KIAkgKi8K LQllbHNlIGlmIChzdXBwb3J0c19idXN5X3N0YXRzKGk5MTUpKQorCWVsc2UgaWYgKGludGVsX2Vu Z2luZV9zdXBwb3J0c19zdGF0cyhpOTE1LT5lbmdpbmVbUkNTXSkpCiAJCWVuYWJsZSAmPSB+QklU KEk5MTVfU0FNUExFX0JVU1kpOwogCiAJLyoKQEAgLTQ0Nyw3ICs0NDQsNyBAQCBzdGF0aWMgdm9p ZCBpOTE1X3BtdV9ldmVudF9yZWFkKHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCkKIAogc3RhdGlj IGJvb2wgZW5naW5lX25lZWRzX2J1c3lfc3RhdHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lKQogewotCXJldHVybiBzdXBwb3J0c19idXN5X3N0YXRzKGVuZ2luZS0+aTkxNSkgJiYKKwly ZXR1cm4gaW50ZWxfZW5naW5lX3N1cHBvcnRzX3N0YXRzKGVuZ2luZSkgJiYKIAkgICAgICAgKGVu Z2luZS0+cG11LmVuYWJsZSAmIEJJVChJOTE1X1NBTVBMRV9CVVNZKSk7CiB9CiAKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMKaW5kZXggZDI3ZTEyNGQ4MjZhLi5iNTg5MTVlYTc1 NTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jCkBAIC0xODI5LDcgKzE4 MjksNyBAQCBpbnQgaW50ZWxfZW5hYmxlX2VuZ2luZV9zdGF0cyhzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICplbmdpbmUpCiB7CiAJdW5zaWduZWQgbG9uZyBmbGFnczsKIAotCWlmIChJTlRFTF9HRU4o ZW5naW5lLT5pOTE1KSA8IDgpCisJaWYgKCFpbnRlbF9lbmdpbmVfc3VwcG9ydHNfc3RhdHMoZW5n aW5lKSkKIAkJcmV0dXJuIC1FTk9ERVY7CiAKIAlzcGluX2xvY2tfaXJxc2F2ZSgmZW5naW5lLT5z dGF0cy5sb2NrLCBmbGFncyk7CkBAIC0xODkwLDcgKzE4OTAsNyBAQCB2b2lkIGludGVsX2Rpc2Fi bGVfZW5naW5lX3N0YXRzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKIAl1bnNp Z25lZCBsb25nIGZsYWdzOwogCi0JaWYgKElOVEVMX0dFTihlbmdpbmUtPmk5MTUpIDwgOCkKKwlp ZiAoIWludGVsX2VuZ2luZV9zdXBwb3J0c19zdGF0cyhlbmdpbmUpKQogCQlyZXR1cm47CiAKIAlz cGluX2xvY2tfaXJxc2F2ZSgmZW5naW5lLT5zdGF0cy5sb2NrLCBmbGFncyk7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjX3N1Ym1pc3Npb24uYwppbmRleCBjZjFjYzJjYjY3MjIuLmE4 ZTYzNzc5ZGU3OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX3N1 Ym1pc3Npb24uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfc3VibWlzc2lv bi5jCkBAIC0xNDUzLDYgKzE0NTMsOCBAQCBpbnQgaW50ZWxfZ3VjX3N1Ym1pc3Npb25fZW5hYmxl KHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIAkJZXhlY2xpc3RzLT50YXNrbGV0LmZ1bmMgPSBndWNf c3VibWlzc2lvbl90YXNrbGV0OwogCQllbmdpbmUtPnBhcmsgPSBndWNfc3VibWlzc2lvbl9wYXJr OwogCQllbmdpbmUtPnVucGFyayA9IGd1Y19zdWJtaXNzaW9uX3VucGFyazsKKworCQllbmdpbmUt PmZsYWdzICY9IH5JOTE1X0VOR0lORV9TVVBQT1JUU19TVEFUUzsKIAl9CiAKIAlyZXR1cm4gMDsK QEAgLTE0NjUsNiArMTQ2Nyw4IEBAIGludCBpbnRlbF9ndWNfc3VibWlzc2lvbl9lbmFibGUoc3Ry dWN0IGludGVsX2d1YyAqZ3VjKQogdm9pZCBpbnRlbF9ndWNfc3VibWlzc2lvbl9kaXNhYmxlKHN0 cnVjdCBpbnRlbF9ndWMgKmd1YykKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSBndWNfdG9faTkxNShndWMpOworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsK KwllbnVtIGludGVsX2VuZ2luZV9pZCBpZDsKIAogCUdFTV9CVUdfT04oZGV2X3ByaXYtPmd0LmF3 YWtlKTsgLyogR1Qgc2hvdWxkIGJlIHBhcmtlZCBmaXJzdCAqLwogCkBAIC0xNDczLDYgKzE0Nzcs OSBAQCB2b2lkIGludGVsX2d1Y19zdWJtaXNzaW9uX2Rpc2FibGUoc3RydWN0IGludGVsX2d1YyAq Z3VjKQogCS8qIFJldmVydCBiYWNrIHRvIG1hbnVhbCBFTFNQIHN1Ym1pc3Npb24gKi8KIAlpbnRl bF9lbmdpbmVzX3Jlc2V0X2RlZmF1bHRfc3VibWlzc2lvbihkZXZfcHJpdik7CiAKKwlmb3JfZWFj aF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdiwgaWQpCisJCWVuZ2luZS0+ZmxhZ3MgfD0gSTkxNV9F TkdJTkVfU1VQUE9SVFNfU1RBVFM7CisKIAlndWNfY2xpZW50c19kZXN0cm95KGd1Yyk7CiB9CiAK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggNDc5Zjg4MGMwZjJmLi5iODExZjdjZGRkN2Ug MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBAIC0xOTgzLDYgKzE5ODMsOCBAQCBpbnRlbF9l bmdpbmVfc2V0dXBfZXhlY2xpc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCiAJ ZXhlY2xpc3RzLT5xdWV1ZSA9IFJCX1JPT1Q7CiAJZXhlY2xpc3RzLT5maXJzdCA9IE5VTEw7CisK KwllbmdpbmUtPmZsYWdzIHw9IEk5MTVfRU5HSU5FX1NVUFBPUlRTX1NUQVRTOwogfQogCiBzdGF0 aWMgdm9pZApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4IGE5MWNl NjNiODhiNi4uYzY4YWIzZWFkODNjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1 ZmZlci5oCkBAIC01NDAsNiArNTQwLDcgQEAgc3RydWN0IGludGVsX2VuZ2luZV9jcyB7CiAJc3Ry dWN0IGludGVsX2VuZ2luZV9oYW5nY2hlY2sgaGFuZ2NoZWNrOwogCiAjZGVmaW5lIEk5MTVfRU5H SU5FX05FRURTX0NNRF9QQVJTRVIgQklUKDApCisjZGVmaW5lIEk5MTVfRU5HSU5FX1NVUFBPUlRT X1NUQVRTICAgQklUKDEpCiAJdW5zaWduZWQgaW50IGZsYWdzOwogCiAJLyoKQEAgLTYwNCw2ICs2 MDUsMTEgQEAgc3RhdGljIGlubGluZSBib29sIGludGVsX2VuZ2luZV9uZWVkc19jbWRfcGFyc2Vy KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlyZXR1cm4gZW5naW5lLT5mbGFncyAm IEk5MTVfRU5HSU5FX05FRURTX0NNRF9QQVJTRVI7CiB9CiAKK3N0YXRpYyBpbmxpbmUgYm9vbCBp bnRlbF9lbmdpbmVfc3VwcG9ydHNfc3RhdHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l KQoreworCXJldHVybiBlbmdpbmUtPmZsYWdzICYgSTkxNV9FTkdJTkVfU1VQUE9SVFNfU1RBVFM7 Cit9CisKIHN0YXRpYyBpbmxpbmUgdm9pZAogZXhlY2xpc3RzX3NldF9hY3RpdmUoc3RydWN0IGlu dGVsX2VuZ2luZV9leGVjbGlzdHMgKmV4ZWNsaXN0cywKIAkJICAgICB1bnNpZ25lZCBpbnQgYml0 KQotLSAKMi4xNC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK