From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Bragg Subject: [PATCH v5 07/11] drm/i915: advertise available metrics via sysfs Date: Fri, 19 Aug 2016 15:04:36 +0100 Message-ID: <20160819140436.2116-1-robert@sixbynine.org> References: <20160819101925.GY22696@nuc-i3427.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20160819101925.GY22696@nuc-i3427.alporthouse.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org, Sourab Gupta , Daniel Vetter , Robert Bragg List-Id: dri-devel@lists.freedesktop.org RWFjaCBtZXRyaWMgc2V0IGlzIGdpdmVuIGEgc3lzZnMgZW50cnkgbGlrZToKCi9zeXMvY2xhc3Mv ZHJtL2NhcmQwL21ldHJpY3MvPGd1aWQ+L2lkCgpUaGlzIGFsbG93cyB1c2Vyc3BhY2UgdG8gZW51 bWVyYXRlIHRoZSBzcGVjaWZpYyBzZXRzIHRoYXQgYXJlIGF2YWlsYWJsZQpmb3IgdGhlIGN1cnJl bnQgc3lzdGVtLiBUaGUgJ2lkJyBmaWxlIGNvbnRhaW5zIGFuIHVuc2lnbmVkIGludGVnZXIgdGhh dApjYW4gYmUgdXNlZCB0byBvcGVuIHRoZSBhc3NvY2lhdGVkIG1ldHJpYyBzZXQgdmlhCkRSTV9J T0NUTF9JOTE1X1BFUkZfT1BFTi4gVGhlIDxndWlkPiBpcyBhIGdsb2JhbGx5IHVuaXF1ZSBJRCBm b3IgYQpzcGVjaWZpYyBPQSB1bml0IHJlZ2lzdGVyIGNvbmZpZ3VyYXRpb24gdGhhdCBjYW4gYmUg cmVsaWFibHkgdXNlZCBieQp1c2Vyc3BhY2UgYXMgYSBrZXkgdG8gbG9va3VwIGNvcnJlc3BvbmRp bmcgY291bnRlciBtZXRhIGRhdGEgYW5kCm5vcm1hbGl6YXRpb24gZXF1YXRpb25zLgoKVGhlIGd1 aWQgcmVnaXN0cnkgaXMgY3VycmVudGx5IG1haW50YWluZWQgYXMgcGFydCBvZiBncHV0b3AgYWxv bmcgd2l0aAp0aGUgWE1MIG1ldHJpYyBzZXQgZGVzY3JpcHRpb25zIGFuZCBjb2RlIGdlbmVyYXRp b24gc2NyaXB0cywgcmVmOgoKIGh0dHBzOi8vZ2l0aHViLmNvbS9yaWIvZ3B1dG9wCiA+IGdwdXRv cC1kYXRhL2d1aWRzLnhtbAogPiBzY3JpcHRzL3VwZGF0ZS1ndWlkcy5weQogPiBncHV0b3AtZGF0 YS9vYS0qLnhtbAogPiBzY3JpcHRzL2k5MTUtcGVyZi1rZXJuZWxnZW4ucHkKCiAkIG1ha2UgLUMg Z3B1dG9wLWRhdGEgLWYgTWFrZWZpbGUueG1sIFNZU0ZTPTEgV0hJVEVMSVNUPVJlbmRlckJhc2lj CgpTaWduZWQtb2ZmLWJ5OiBSb2JlcnQgQnJhZ2cgPHJvYmVydEBzaXhieW5pbmUub3JnPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgICAgfCAgNSArKysrCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgIHwgIDQgKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X29hX2hzdy5jIHwgNDUgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X29hX2hzdy5oIHwgIDQgKysrCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X3BlcmYuYyAgIHwgNTIgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysKIDUgZmlsZXMgY2hhbmdlZCwgMTEwIGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuYwppbmRleCA5MmY2NjhlLi41M2RmMTZmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMK QEAgLTExNTAsNiArMTE1MCw5IEBAIHN0YXRpYyB2b2lkIGk5MTVfZHJpdmVyX3JlZ2lzdGVyKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlpZiAoZHJtX2Rldl9yZWdpc3Rlcihk ZXYsIDApID09IDApIHsKIAkJaTkxNV9kZWJ1Z2ZzX3JlZ2lzdGVyKGRldl9wcml2KTsKIAkJaTkx NV9zZXR1cF9zeXNmcyhkZXYpOworCisJCS8qIERlcGVuZHMgb24gc3lzZnMgaGF2aW5nIGJlZW4g aW5pdGlhbGl6ZWQgKi8KKwkJaTkxNV9wZXJmX3JlZ2lzdGVyKGRldl9wcml2KTsKIAl9IGVsc2UK IAkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gcmVnaXN0ZXIgZHJpdmVyIGZvciB1c2Vyc3BhY2UgYWNj ZXNzIVxuIik7CiAKQEAgLTExODYsNiArMTE4OSw4IEBAIHN0YXRpYyB2b2lkIGk5MTVfZHJpdmVy X3VucmVnaXN0ZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWFjcGlfdmlk ZW9fdW5yZWdpc3RlcigpOwogCWludGVsX29wcmVnaW9uX3VucmVnaXN0ZXIoZGV2X3ByaXYpOwog CisJaTkxNV9wZXJmX3VucmVnaXN0ZXIoZGV2X3ByaXYpOworCiAJaTkxNV90ZWFyZG93bl9zeXNm cygmZGV2X3ByaXYtPmRybSk7CiAJaTkxNV9kZWJ1Z2ZzX3VucmVnaXN0ZXIoZGV2X3ByaXYpOwog CWRybV9kZXZfdW5yZWdpc3RlcigmZGV2X3ByaXYtPmRybSk7CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aAppbmRleCA0YzMwMmNkLi5kZDg4ZWIxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTIx MTUsNiArMjExNSw4IEBAIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlIHsKIAlzdHJ1Y3QgewogCQli b29sIGluaXRpYWxpemVkOwogCisJCXN0cnVjdCBrb2JqZWN0ICptZXRyaWNzX2tvYmo7CisKIAkJ c3RydWN0IG11dGV4IGxvY2s7CiAJCXN0cnVjdCBsaXN0X2hlYWQgc3RyZWFtczsKIApAQCAtMzY5 NCw2ICszNjk2LDggQEAgaW50IGludGVsX2VuZ2luZV9jbWRfcGFyc2VyKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKmVuZ2luZSwKIC8qIGk5MTVfcGVyZi5jICovCiBleHRlcm4gdm9pZCBpOTE1X3Bl cmZfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogZXh0ZXJuIHZvaWQg aTkxNV9wZXJmX2Zpbmkoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKK2V4dGVy biB2b2lkIGk5MTVfcGVyZl9yZWdpc3RlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYpOworZXh0ZXJuIHZvaWQgaTkxNV9wZXJmX3VucmVnaXN0ZXIoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KTsKIAogLyogaTkxNV9zdXNwZW5kLmMgKi8KIGV4dGVybiBpbnQgaTkx NV9zYXZlX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9vYV9oc3cuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf b2FfaHN3LmMKaW5kZXggM2U2MDA2ZWMuLjNmOWRkODAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfb2FfaHN3LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9v YV9oc3cuYwpAQCAtMjQsNiArMjQsOCBAQAogICoKICAqLwogCisjaW5jbHVkZSA8bGludXgvc3lz ZnMuaD4KKwogI2luY2x1ZGUgImk5MTVfZHJ2LmgiCiAKIGVudW0gbWV0cmljX3NldF9pZCB7CkBA IC0xMzAsMyArMTMyLDQ2IEBAIGludCBpOTE1X29hX3NlbGVjdF9tZXRyaWNfc2V0X2hzdyhzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCXJldHVybiAtRU5PREVWOwogCX0KIH0K Kworc3RhdGljIHNzaXplX3QKK3Nob3dfcmVuZGVyX2Jhc2ljX2lkKHN0cnVjdCBkZXZpY2UgKmtk ZXYsIHN0cnVjdCBkZXZpY2VfYXR0cmlidXRlICphdHRyLCBjaGFyICpidWYpCit7CisJcmV0dXJu IHNwcmludGYoYnVmLCAiJWRcbiIsIE1FVFJJQ19TRVRfSURfUkVOREVSX0JBU0lDKTsKK30KKwor c3RhdGljIHN0cnVjdCBkZXZpY2VfYXR0cmlidXRlIGRldl9hdHRyX3JlbmRlcl9iYXNpY19pZCA9 IHsKKwkuYXR0ciA9IHsgLm5hbWUgPSAiaWQiLCAubW9kZSA9IFNfSVJVR08gfSwKKwkuc2hvdyA9 IHNob3dfcmVuZGVyX2Jhc2ljX2lkLAorCS5zdG9yZSA9IE5VTEwsCit9OworCitzdGF0aWMgc3Ry dWN0IGF0dHJpYnV0ZSAqYXR0cnNfcmVuZGVyX2Jhc2ljW10gPSB7CisJJmRldl9hdHRyX3JlbmRl cl9iYXNpY19pZC5hdHRyLAorCU5VTEwsCit9OworCitzdGF0aWMgc3RydWN0IGF0dHJpYnV0ZV9n cm91cCBncm91cF9yZW5kZXJfYmFzaWMgPSB7CisJLm5hbWUgPSAiNDAzZDg4MzItMWEyNy00YWE2 LWE2NGUtZjUzODljZTdiMjEyIiwKKwkuYXR0cnMgPSAgYXR0cnNfcmVuZGVyX2Jhc2ljLAorfTsK KworaW50CitpOTE1X3BlcmZfcmVnaXN0ZXJfc3lzZnNfaHN3KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKK3sKKwlpbnQgcmV0OworCisJcmV0ID0gc3lzZnNfY3JlYXRlX2dyb3Vw KGRldl9wcml2LT5wZXJmLm1ldHJpY3Nfa29iaiwgJmdyb3VwX3JlbmRlcl9iYXNpYyk7CisJaWYg KHJldCkKKwkJZ290byBlcnJvcl9yZW5kZXJfYmFzaWM7CisKKwlyZXR1cm4gMDsKKworZXJyb3Jf cmVuZGVyX2Jhc2ljOgorCXJldHVybiByZXQ7Cit9CisKK3ZvaWQKK2k5MTVfcGVyZl91bnJlZ2lz dGVyX3N5c2ZzX2hzdyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJc3lz ZnNfcmVtb3ZlX2dyb3VwKGRldl9wcml2LT5wZXJmLm1ldHJpY3Nfa29iaiwgJmdyb3VwX3JlbmRl cl9iYXNpYyk7Cit9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X29hX2hz dy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9vYV9oc3cuaAppbmRleCBiNjE4YTFmLi40 MjlhMjI5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X29hX2hzdy5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfb2FfaHN3LmgKQEAgLTMxLDQgKzMxLDggQEAg ZXh0ZXJuIGludCBpOTE1X29hX25fYnVpbHRpbl9tZXRyaWNfc2V0c19oc3c7CiAKIGV4dGVybiBp bnQgaTkxNV9vYV9zZWxlY3RfbWV0cmljX3NldF9oc3coc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2KTsKIAorZXh0ZXJuIGludCBpOTE1X3BlcmZfcmVnaXN0ZXJfc3lzZnNfaHN3KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdik7CisKK2V4dGVybiB2b2lkIGk5MTVfcGVy Zl91bnJlZ2lzdGVyX3N5c2ZzX2hzdyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp OworCiAjZW5kaWYKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGVyZi5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wZXJmLmMKaW5kZXggNzg3M2QxNS4uYjllM2Vj MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wZXJmLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wZXJmLmMKQEAgLTczMSw2ICs3MzEsMTUgQEAgc3RhdGlj IGludCBpOTE1X29hX3N0cmVhbV9pbml0KHN0cnVjdCBpOTE1X3BlcmZfc3RyZWFtICpzdHJlYW0s CiAJaW50IGZvcm1hdF9zaXplOwogCWludCByZXQ7CiAKKwkvKiBJZiB0aGUgc3lzZnMgbWV0cmlj cy8gZGlyZWN0b3J5IHdhc24ndCByZWdpc3RlcmVkIGZvciBzb21lCisJICogcmVhc29uIHRoZW4g ZG9uJ3QgbGV0IHVzZXJzcGFjZSB0cnkgdGhlaXIgbHVjayB3aXRoIGNvbmZpZworCSAqIElEcwor CSAqLworCWlmICghZGV2X3ByaXYtPnBlcmYubWV0cmljc19rb2JqKSB7CisJCURSTV9FUlJPUigi T0EgbWV0cmljcyB3ZXJlbid0IGFkdmVydGlzZWQgdmlhIHN5c2ZzXG4iKTsKKwkJcmV0dXJuIC1F SU5WQUw7CisJfQorCiAJaWYgKCEocHJvcHMtPnNhbXBsZV9mbGFncyAmIFNBTVBMRV9PQV9SRVBP UlQpKSB7CiAJCURSTV9FUlJPUigiT25seSBPQSByZXBvcnQgc2FtcGxpbmcgc3VwcG9ydGVkXG4i KTsKIAkJcmV0dXJuIC1FSU5WQUw7CkBAIC0xMzUzLDYgKzEzNjIsNDkgQEAgaW50IGk5MTVfcGVy Zl9vcGVuX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJcmV0dXJu IHJldDsKIH0KIAordm9pZCBpOTE1X3BlcmZfcmVnaXN0ZXIoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQoreworCWlmICghSVNfSEFTV0VMTChkZXZfcHJpdikpCisJCXJldHVybjsK KworCWlmICghZGV2X3ByaXYtPnBlcmYuaW5pdGlhbGl6ZWQpCisJCXJldHVybjsKKworCS8qIFRv IGJlIHN1cmUgd2UncmUgc3luY2hyb25pemVkIHdpdGggYW4gYXR0ZW1wdGVkCisJICogaTkxNV9w ZXJmX29wZW5faW9jdGwoKTsgY29uc2lkZXJpbmcgdGhhdCB3ZSByZWdpc3RlciBhZnRlcgorCSAq IGJlaW5nIGV4cG9zZWQgdG8gdXNlcnNwYWNlLgorCSAqLworCW11dGV4X2xvY2soJmRldl9wcml2 LT5wZXJmLmxvY2spOworCisJZGV2X3ByaXYtPnBlcmYubWV0cmljc19rb2JqID0KKwkJa29iamVj dF9jcmVhdGVfYW5kX2FkZCgibWV0cmljcyIsCisJCQkJICAgICAgICZkZXZfcHJpdi0+ZHJtLnBy aW1hcnktPmtkZXYtPmtvYmopOworCWlmICghZGV2X3ByaXYtPnBlcmYubWV0cmljc19rb2JqKQor CQlnb3RvIGV4aXQ7CisKKwlpZiAoaTkxNV9wZXJmX3JlZ2lzdGVyX3N5c2ZzX2hzdyhkZXZfcHJp dikpIHsKKwkJa29iamVjdF9wdXQoZGV2X3ByaXYtPnBlcmYubWV0cmljc19rb2JqKTsKKwkJZGV2 X3ByaXYtPnBlcmYubWV0cmljc19rb2JqID0gTlVMTDsKKwl9CisKK2V4aXQ6CisJbXV0ZXhfdW5s b2NrKCZkZXZfcHJpdi0+cGVyZi5sb2NrKTsKK30KKwordm9pZCBpOTE1X3BlcmZfdW5yZWdpc3Rl cihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJaWYgKCFJU19IQVNXRUxM KGRldl9wcml2KSkKKwkJcmV0dXJuOworCisJaWYgKCFkZXZfcHJpdi0+cGVyZi5tZXRyaWNzX2tv YmopCisJCXJldHVybjsKKworCWk5MTVfcGVyZl91bnJlZ2lzdGVyX3N5c2ZzX2hzdyhkZXZfcHJp dik7CisKKwlrb2JqZWN0X3B1dChkZXZfcHJpdi0+cGVyZi5tZXRyaWNzX2tvYmopOworCWRldl9w cml2LT5wZXJmLm1ldHJpY3Nfa29iaiA9IE5VTEw7Cit9CisKIHZvaWQgaTkxNV9wZXJmX2luaXQo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCWlmICghSVNfSEFTV0VMTChk ZXZfcHJpdikpCi0tIAoyLjkuMgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v ZHJpLWRldmVsCg==