From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tvrtko Ursulin <tursulin@ursulin.net>
Subject: [PATCH v6 2/2] drm/i915: Consolidate checks for engine
	stats availability
Date: Wed, 29 Nov 2017 09:27:56 +0000
Message-ID: <20171129092756.22010-1-tvrtko.ursulin@linux.intel.com>
References: <20171129082450.18278-1-tvrtko.ursulin@linux.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mail-wr0-x242.google.com (mail-wr0-x242.google.com
 [IPv6:2a00:1450:400c:c0c::242])
 by gabe.freedesktop.org (Postfix) with ESMTPS id C37DF6E81B
 for <Intel-gfx@lists.freedesktop.org>; Wed, 29 Nov 2017 09:28:07 +0000 (UTC)
Received: by mail-wr0-x242.google.com with SMTP id q9so2730137wre.7
 for <Intel-gfx@lists.freedesktop.org>; Wed, 29 Nov 2017 01:28:07 -0800 (PST)
In-Reply-To: <20171129082450.18278-1-tvrtko.ursulin@linux.intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNhZ2FyIG5v
dGljZWQgdGhlIGNoZWNrIGNhbiBiZSBjb25zb2xpZGF0ZWQgYmV0d2VlbiB0aGUgZW5naW5lIHN0
YXRzCmltcGxlbWVudGF0aW9uIGFuZCB0aGUgUE1VLgoKTXkgZmlyc3QgY2hvaWNlIHdhcyBhIHN0
YXRpYyBpbmxpbmUgaGVscGVyIGJ1dCB0aGF0IGdvdCBpbnRvIGluY2x1ZGUKb3JkZXJpbmcgbWVz
cyBxdWlja2x5IGZhc3Qgc28gSSB3ZW50IHdpdGggYSBtYWNybyBpbnN0ZWFkLiBBdCBzb21lIHBv
aW50CndlIHNob3VsZCBwZXJoYXBzIGxvb2tpbmcgaW50byB0YWtpbmcgb3V0IHRoZSBub24tcmlu
Z3ViZmZlciBiaXRzIGZyb20KaW50ZWxfcmluZ2J1ZmZlci5oIGludG8gYSBuZXcgaW50ZWxfZW5n
aW5lLmggb3Igc29tZXRoaW5nLgoKdjI6IFVzZSBlbmdpbmUtPmZsYWdzLiAoQ2hyaXMgV2lsc29u
KQp2MzogUmViYXNlIGFuZCBtYXJrIEd1QyBhcyBub3QgeWV0IHN1cHBvcnRlZC4gKENocmlzIFdp
bHNvbikKdjQ6IE1vdmUgZmxhZyBzZXR0aW5nIHRvIGludGVsX2VuZ2luZXNfcmVzZXRfZGVmYXVs
dF9zdWJtaXNzaW9uLgogICAgKENocmlzIFdpbHNvbikKdjU6IE1vdmUgZmxhZyBzZXR0aW5nIHRv
IGxvZ2ljYWxfcmluZ19zZXR1cC4KdjY6IGludGVsX2VuZ2luZXNfcmVzZXRfZGVmYXVsdF9zdWJt
aXNzaW9uIGlzIHRoZSB3cm9uZyBwbGFjZSB0byBzZXQgdGhlCiAgICBmbGFnIC0gaXQgbmVlZHMg
dG8gYmUgaW4gZXhlY2xpc3RzX3NldF9kZWZhdWx0X3N1Ym1pc3Npb24uIChTYWdhcikKClNpZ25l
ZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+ClN1Z2dl
c3RlZC1ieTogU2FnYXIgQXJ1biBLYW1ibGUgPHNhZ2FyLmEua2FtYmxlQGludGVsLmNvbT4KQ2M6
IFNhZ2FyIEFydW4gS2FtYmxlIDxzYWdhci5hLmthbWJsZUBpbnRlbC5jb20+ClJldmlld2VkLWJ5
OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4gKHYyKQotLS0KIGRyaXZl
cnMvZ3B1L2RybS9pOTE1L2k5MTVfcG11LmMgICAgICAgICAgICAgfCAxMSArKysrLS0tLS0tLQog
ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX2NzLmMgICAgICB8ICA0ICsrLS0KIGRy
aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19zdWJtaXNzaW9uLmMgfCAgMiArKwogZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgICAgICB8ICA0ICsrKysKIGRyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCAgICAgfCAgNiArKysrKysKIDUgZmlsZXMg
Y2hhbmdlZCwgMTggaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BtdS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9wbXUuYwppbmRleCAxYzBlZTlkNjhiMDQuLmU4ZTJmYWY0OTgyZiAxMDA2NDQKLS0tIGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
OTE1X3BtdS5jCkBAIC05MCwxMSArOTAsNiBAQCBzdGF0aWMgdW5zaWduZWQgaW50IGV2ZW50X2Vu
YWJsZWRfYml0KHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCkKIAlyZXR1cm4gY29uZmlnX2VuYWJs
ZWRfYml0KGV2ZW50LT5hdHRyLmNvbmZpZyk7CiB9CiAKLXN0YXRpYyBib29sIHN1cHBvcnRzX2J1
c3lfc3RhdHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCi17Ci0JcmV0dXJuIElOVEVM
X0dFTihpOTE1KSA+PSA4OwotfQotCiBzdGF0aWMgYm9vbCBwbXVfbmVlZHNfdGltZXIoc3RydWN0
IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsIGJvb2wgZ3B1X2FjdGl2ZSkKIHsKIAl1NjQgZW5hYmxl
OwpAQCAtMTIzLDggKzExOCwxMCBAQCBzdGF0aWMgYm9vbCBwbXVfbmVlZHNfdGltZXIoc3RydWN0
IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsIGJvb2wgZ3B1X2FjdGl2ZSkKIAkvKgogCSAqIEFsc28g
dGhlcmUgaXMgc29mdHdhcmUgYnVzeW5lc3MgdHJhY2tpbmcgYXZhaWxhYmxlIHdlIGRvIG5vdAog
CSAqIG5lZWQgdGhlIHRpbWVyIGZvciBJOTE1X1NBTVBMRV9CVVNZIGNvdW50ZXIuCisJICoKKwkg
KiBVc2UgUkNTIGFzIHByb3h5IGZvciBhbGwgZW5naW5lcy4KIAkgKi8KLQllbHNlIGlmIChzdXBw
b3J0c19idXN5X3N0YXRzKGk5MTUpKQorCWVsc2UgaWYgKGludGVsX2VuZ2luZV9zdXBwb3J0c19z
dGF0cyhpOTE1LT5lbmdpbmVbUkNTXSkpCiAJCWVuYWJsZSAmPSB+QklUKEk5MTVfU0FNUExFX0JV
U1kpOwogCiAJLyoKQEAgLTQ0Nyw3ICs0NDQsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X3BtdV9ldmVu
dF9yZWFkKHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCkKIAogc3RhdGljIGJvb2wgZW5naW5lX25l
ZWRzX2J1c3lfc3RhdHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewotCXJldHVy
biBzdXBwb3J0c19idXN5X3N0YXRzKGVuZ2luZS0+aTkxNSkgJiYKKwlyZXR1cm4gaW50ZWxfZW5n
aW5lX3N1cHBvcnRzX3N0YXRzKGVuZ2luZSkgJiYKIAkgICAgICAgKGVuZ2luZS0+cG11LmVuYWJs
ZSAmIEJJVChJOTE1X1NBTVBMRV9CVVNZKSk7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
ZW5naW5lX2NzLmMKaW5kZXggZmVkZTYyZGFmM2UxLi5jZmZkMGM4MTJiN2UgMTAwNjQ0Ci0tLSBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jCisrKyBiL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX2VuZ2luZV9jcy5jCkBAIC0xODYzLDcgKzE4NjMsNyBAQCBpbnQgaW50
ZWxfZW5hYmxlX2VuZ2luZV9zdGF0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7
CiAJdW5zaWduZWQgbG9uZyBmbGFnczsKIAotCWlmIChJTlRFTF9HRU4oZW5naW5lLT5pOTE1KSA8
IDgpCisJaWYgKCFpbnRlbF9lbmdpbmVfc3VwcG9ydHNfc3RhdHMoZW5naW5lKSkKIAkJcmV0dXJu
IC1FTk9ERVY7CiAKIAlzcGluX2xvY2tfaXJxc2F2ZSgmZW5naW5lLT5zdGF0cy5sb2NrLCBmbGFn
cyk7CkBAIC0xOTI0LDcgKzE5MjQsNyBAQCB2b2lkIGludGVsX2Rpc2FibGVfZW5naW5lX3N0YXRz
KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKIAl1bnNpZ25lZCBsb25nIGZsYWdz
OwogCi0JaWYgKElOVEVMX0dFTihlbmdpbmUtPmk5MTUpIDwgOCkKKwlpZiAoIWludGVsX2VuZ2lu
ZV9zdXBwb3J0c19zdGF0cyhlbmdpbmUpKQogCQlyZXR1cm47CiAKIAlzcGluX2xvY2tfaXJxc2F2
ZSgmZW5naW5lLT5zdGF0cy5sb2NrLCBmbGFncyk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfZ3VjX3N1Ym1pc3Npb24uYwppbmRleCBjZjFjYzJjYjY3MjIuLjkxMmZmMTQzZDUzMSAxMDA2
NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX3N1Ym1pc3Npb24uYworKysg
Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfc3VibWlzc2lvbi5jCkBAIC0xNDUzLDYg
KzE0NTMsOCBAQCBpbnQgaW50ZWxfZ3VjX3N1Ym1pc3Npb25fZW5hYmxlKHN0cnVjdCBpbnRlbF9n
dWMgKmd1YykKIAkJZXhlY2xpc3RzLT50YXNrbGV0LmZ1bmMgPSBndWNfc3VibWlzc2lvbl90YXNr
bGV0OwogCQllbmdpbmUtPnBhcmsgPSBndWNfc3VibWlzc2lvbl9wYXJrOwogCQllbmdpbmUtPnVu
cGFyayA9IGd1Y19zdWJtaXNzaW9uX3VucGFyazsKKworCQllbmdpbmUtPmZsYWdzICY9IH5JOTE1
X0VOR0lORV9TVVBQT1JUU19TVEFUUzsKIAl9CiAKIAlyZXR1cm4gMDsKZGlmZiAtLWdpdCBhL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfbHJjLmMKaW5kZXggNTcwODY0NTgzZTI4Li5lZjUxM2UxYzEwZjMgMTAwNjQ0Ci0tLSBhL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2xyYy5jCkBAIC0xOTE5LDYgKzE5MTksOCBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNf
c2V0X2RlZmF1bHRfc3VibWlzc2lvbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAK
IAllbmdpbmUtPnBhcmsgPSBOVUxMOwogCWVuZ2luZS0+dW5wYXJrID0gTlVMTDsKKworCWVuZ2lu
ZS0+ZmxhZ3MgfD0gSTkxNV9FTkdJTkVfU1VQUE9SVFNfU1RBVFM7CiB9CiAKIHN0YXRpYyB2b2lk
CkBAIC0xOTYzLDYgKzE5NjUsOCBAQCBsb2dpY2FsX3Jpbmdfc2V0dXAoc3RydWN0IGludGVsX2Vu
Z2luZV9jcyAqZW5naW5lKQogCS8qIEludGVudGlvbmFsbHkgbGVmdCBibGFuay4gKi8KIAllbmdp
bmUtPmJ1ZmZlciA9IE5VTEw7CiAKKwllbmdpbmUtPmZsYWdzIHw9IEk5MTVfRU5HSU5FX1NVUFBP
UlRTX1NUQVRTOworCiAJZndfZG9tYWlucyA9IGludGVsX3VuY29yZV9mb3JjZXdha2VfZm9yX3Jl
ZyhkZXZfcHJpdiwKIAkJCQkJCSAgICBSSU5HX0VMU1AoZW5naW5lKSwKIAkJCQkJCSAgICBGV19S
RUdfV1JJVEUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1
ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4IGE5
MWNlNjNiODhiNi4uYzY4YWIzZWFkODNjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmlu
Z2J1ZmZlci5oCkBAIC01NDAsNiArNTQwLDcgQEAgc3RydWN0IGludGVsX2VuZ2luZV9jcyB7CiAJ
c3RydWN0IGludGVsX2VuZ2luZV9oYW5nY2hlY2sgaGFuZ2NoZWNrOwogCiAjZGVmaW5lIEk5MTVf
RU5HSU5FX05FRURTX0NNRF9QQVJTRVIgQklUKDApCisjZGVmaW5lIEk5MTVfRU5HSU5FX1NVUFBP
UlRTX1NUQVRTICAgQklUKDEpCiAJdW5zaWduZWQgaW50IGZsYWdzOwogCiAJLyoKQEAgLTYwNCw2
ICs2MDUsMTEgQEAgc3RhdGljIGlubGluZSBib29sIGludGVsX2VuZ2luZV9uZWVkc19jbWRfcGFy
c2VyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIAlyZXR1cm4gZW5naW5lLT5mbGFn
cyAmIEk5MTVfRU5HSU5FX05FRURTX0NNRF9QQVJTRVI7CiB9CiAKK3N0YXRpYyBpbmxpbmUgYm9v
bCBpbnRlbF9lbmdpbmVfc3VwcG9ydHNfc3RhdHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n
aW5lKQoreworCXJldHVybiBlbmdpbmUtPmZsYWdzICYgSTkxNV9FTkdJTkVfU1VQUE9SVFNfU1RB
VFM7Cit9CisKIHN0YXRpYyBpbmxpbmUgdm9pZAogZXhlY2xpc3RzX3NldF9hY3RpdmUoc3RydWN0
IGludGVsX2VuZ2luZV9leGVjbGlzdHMgKmV4ZWNsaXN0cywKIAkJICAgICB1bnNpZ25lZCBpbnQg
Yml0KQotLSAKMi4xNC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv
cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl
bC1nZngK