From: Robert Bragg Subject: [PATCH v6 07/11] drm/i915: advertise available metrics via sysfs Date: Thu, 20 Oct 2016 22:19:06 +0100 Message-ID: <20161020211910.4723-7-robert@sixbynine.org> References: <20161020211910.4723-1-robert@sixbynine.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20161020211910.4723-1-robert@sixbynine.org> 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 Cc: David Airlie , dri-devel@lists.freedesktop.org, Sourab Gupta , Daniel Vetter List-Id: dri-devel@lists.freedesktop.org RWFjaCBtZXRyaWMgc2V0IGlzIGdpdmVuIGEgc3lzZnMgZW50cnkgbGlrZToKCi9zeXMvY2xhc3Mv ZHJtL2NhcmQwL21ldHJpY3MvPGd1aWQ+L2lkCgpUaGlzIGFsbG93cyB1c2Vyc3BhY2UgdG8gZW51 bWVyYXRlIHRoZSBzcGVjaWZpYyBzZXRzIHRoYXQgYXJlIGF2YWlsYWJsZQpmb3IgdGhlIGN1cnJl bnQgc3lzdGVtLiBUaGUgJ2lkJyBmaWxlIGNvbnRhaW5zIGFuIHVuc2lnbmVkIGludGVnZXIgdGhh dApjYW4gYmUgdXNlZCB0byBvcGVuIHRoZSBhc3NvY2lhdGVkIG1ldHJpYyBzZXQgdmlhCkRSTV9J T0NUTF9JOTE1X1BFUkZfT1BFTi4gVGhlIDxndWlkPiBpcyBhIGdsb2JhbGx5IHVuaXF1ZSBJRCBm b3IgYQpzcGVjaWZpYyBPQSB1bml0IHJlZ2lzdGVyIGNvbmZpZ3VyYXRpb24gdGhhdCBjYW4gYmUg cmVsaWFibHkgdXNlZCBieQp1c2Vyc3BhY2UgYXMgYSBrZXkgdG8gbG9va3VwIGNvcnJlc3BvbmRp bmcgY291bnRlciBtZXRhIGRhdGEgYW5kCm5vcm1hbGl6YXRpb24gZXF1YXRpb25zLgoKVGhlIGd1 aWQgcmVnaXN0cnkgaXMgY3VycmVudGx5IG1haW50YWluZWQgYXMgcGFydCBvZiBncHV0b3AgYWxv bmcgd2l0aAp0aGUgWE1MIG1ldHJpYyBzZXQgZGVzY3JpcHRpb25zIGFuZCBjb2RlIGdlbmVyYXRp b24gc2NyaXB0cywgcmVmOgoKIGh0dHBzOi8vZ2l0aHViLmNvbS9yaWIvZ3B1dG9wCiA+IGdwdXRv cC1kYXRhL2d1aWRzLnhtbAogPiBzY3JpcHRzL3VwZGF0ZS1ndWlkcy5weQogPiBncHV0b3AtZGF0 YS9vYS0qLnhtbAogPiBzY3JpcHRzL2k5MTUtcGVyZi1rZXJuZWxnZW4ucHkKCiAkIG1ha2UgLUMg Z3B1dG9wLWRhdGEgLWYgTWFrZWZpbGUueG1sIFNZU0ZTPTEgV0hJVEVMSVNUPVJlbmRlckJhc2lj CgpTaWduZWQtb2ZmLWJ5OiBSb2JlcnQgQnJhZ2cgPHJvYmVydEBzaXhieW5pbmUub3JnPgpSZXZp ZXdlZC1ieTogTWF0dGhldyBBdWxkIDxtYXR0aGV3LmF1bGRAaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgICAgfCAgNSArKysrCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oICAgIHwgIDQgKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X29h X2hzdy5jIHwgNTEgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9vYV9oc3cuaCB8ICA0ICsrKwogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9wZXJmLmMgICB8IDUyICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrCiA1IGZpbGVzIGNoYW5nZWQsIDExNiBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmMKaW5kZXggNTQ0OTU3OS4uM2I2ZjU4NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBA IC0xMTE1LDYgKzExMTUsOSBAQCBzdGF0aWMgdm9pZCBpOTE1X2RyaXZlcl9yZWdpc3RlcihzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJaWYgKGRybV9kZXZfcmVnaXN0ZXIoZGV2 LCAwKSA9PSAwKSB7CiAJCWk5MTVfZGVidWdmc19yZWdpc3RlcihkZXZfcHJpdik7CiAJCWk5MTVf c2V0dXBfc3lzZnMoZGV2X3ByaXYpOworCisJCS8qIERlcGVuZHMgb24gc3lzZnMgaGF2aW5nIGJl ZW4gaW5pdGlhbGl6ZWQgKi8KKwkJaTkxNV9wZXJmX3JlZ2lzdGVyKGRldl9wcml2KTsKIAl9IGVs c2UKIAkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gcmVnaXN0ZXIgZHJpdmVyIGZvciB1c2Vyc3BhY2Ug YWNjZXNzIVxuIik7CiAKQEAgLTExNTEsNiArMTE1NCw4IEBAIHN0YXRpYyB2b2lkIGk5MTVfZHJp dmVyX3VucmVnaXN0ZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWFjcGlf dmlkZW9fdW5yZWdpc3RlcigpOwogCWludGVsX29wcmVnaW9uX3VucmVnaXN0ZXIoZGV2X3ByaXYp OwogCisJaTkxNV9wZXJmX3VucmVnaXN0ZXIoZGV2X3ByaXYpOworCiAJaTkxNV90ZWFyZG93bl9z eXNmcyhkZXZfcHJpdik7CiAJaTkxNV9kZWJ1Z2ZzX3VucmVnaXN0ZXIoZGV2X3ByaXYpOwogCWRy bV9kZXZfdW5yZWdpc3RlcigmZGV2X3ByaXYtPmRybSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApp bmRleCBiMjM0NDEyLi4zYjg2NDI3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTIxNjEs NiArMjE2MSw4IEBAIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlIHsKIAlzdHJ1Y3QgewogCQlib29s IGluaXRpYWxpemVkOwogCisJCXN0cnVjdCBrb2JqZWN0ICptZXRyaWNzX2tvYmo7CisKIAkJc3Ry dWN0IG11dGV4IGxvY2s7CiAJCXN0cnVjdCBsaXN0X2hlYWQgc3RyZWFtczsKIApAQCAtMzc1Miw2 ICszNzU0LDggQEAgaW50IGludGVsX2VuZ2luZV9jbWRfcGFyc2VyKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKmVuZ2luZSwKIC8qIGk5MTVfcGVyZi5jICovCiBleHRlcm4gdm9pZCBpOTE1X3BlcmZf aW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogZXh0ZXJuIHZvaWQgaTkx NV9wZXJmX2Zpbmkoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKK2V4dGVybiB2 b2lkIGk5MTVfcGVyZl9yZWdpc3RlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp OworZXh0ZXJuIHZvaWQgaTkxNV9wZXJmX3VucmVnaXN0ZXIoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KTsKIAogLyogaTkxNV9zdXNwZW5kLmMgKi8KIGV4dGVybiBpbnQgaTkxNV9z YXZlX3N0YXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9vYV9oc3cuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfb2Ff aHN3LmMKaW5kZXggODkwNjM4MC4uMTlmMjcyYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9vYV9oc3cuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X29hX2hz dy5jCkBAIC0yNCw2ICsyNCw4IEBACiAgKgogICovCiAKKyNpbmNsdWRlIDxsaW51eC9zeXNmcy5o PgorCiAjaW5jbHVkZSAiaTkxNV9kcnYuaCIKICNpbmNsdWRlICJpOTE1X29hX2hzdy5oIgogCkBA IC0xNDIsMyArMTQ0LDUyIEBAIGludCBpOTE1X29hX3NlbGVjdF9tZXRyaWNfc2V0X2hzdyhzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCXJldHVybiAtRU5PREVWOwogCX0KIH0K Kworc3RhdGljIHNzaXplX3QKK3Nob3dfcmVuZGVyX2Jhc2ljX2lkKHN0cnVjdCBkZXZpY2UgKmtk ZXYsIHN0cnVjdCBkZXZpY2VfYXR0cmlidXRlICphdHRyLCBjaGFyICpidWYpCit7CisJcmV0dXJu IHNwcmludGYoYnVmLCAiJWRcbiIsIE1FVFJJQ19TRVRfSURfUkVOREVSX0JBU0lDKTsKK30KKwor c3RhdGljIHN0cnVjdCBkZXZpY2VfYXR0cmlidXRlIGRldl9hdHRyX3JlbmRlcl9iYXNpY19pZCA9 IHsKKwkuYXR0ciA9IHsgLm5hbWUgPSAiaWQiLCAubW9kZSA9IFNfSVJVR08gfSwKKwkuc2hvdyA9 IHNob3dfcmVuZGVyX2Jhc2ljX2lkLAorCS5zdG9yZSA9IE5VTEwsCit9OworCitzdGF0aWMgc3Ry dWN0IGF0dHJpYnV0ZSAqYXR0cnNfcmVuZGVyX2Jhc2ljW10gPSB7CisJJmRldl9hdHRyX3JlbmRl cl9iYXNpY19pZC5hdHRyLAorCU5VTEwsCit9OworCitzdGF0aWMgc3RydWN0IGF0dHJpYnV0ZV9n cm91cCBncm91cF9yZW5kZXJfYmFzaWMgPSB7CisJLm5hbWUgPSAiNDAzZDg4MzItMWEyNy00YWE2 LWE2NGUtZjUzODljZTdiMjEyIiwKKwkuYXR0cnMgPSAgYXR0cnNfcmVuZGVyX2Jhc2ljLAorfTsK KworaW50CitpOTE1X3BlcmZfcmVnaXN0ZXJfc3lzZnNfaHN3KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKK3sKKwlpbnQgbXV4X2xlbjsKKwlpbnQgcmV0ID0gMDsKKworCWlmIChn ZXRfcmVuZGVyX2Jhc2ljX211eF9jb25maWcoZGV2X3ByaXYsICZtdXhfbGVuKSkgeworCQlyZXQg PSBzeXNmc19jcmVhdGVfZ3JvdXAoZGV2X3ByaXYtPnBlcmYubWV0cmljc19rb2JqLCAmZ3JvdXBf cmVuZGVyX2Jhc2ljKTsKKwkJaWYgKHJldCkKKwkJCWdvdG8gZXJyb3JfcmVuZGVyX2Jhc2ljOwor CX0KKworCXJldHVybiAwOworCitlcnJvcl9yZW5kZXJfYmFzaWM6CisJcmV0dXJuIHJldDsKK30K Kwordm9pZAoraTkxNV9wZXJmX3VucmVnaXN0ZXJfc3lzZnNfaHN3KHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKK3sKKwlpbnQgbXV4X2xlbjsKKworCWlmIChnZXRfcmVuZGVyX2Jh c2ljX211eF9jb25maWcoZGV2X3ByaXYsICZtdXhfbGVuKSkKKwkJc3lzZnNfcmVtb3ZlX2dyb3Vw KGRldl9wcml2LT5wZXJmLm1ldHJpY3Nfa29iaiwgJmdyb3VwX3JlbmRlcl9iYXNpYyk7Cit9CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X29hX2hzdy5oIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9vYV9oc3cuaAppbmRleCBiNjE4YTFmLi40MjlhMjI5IDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X29hX2hzdy5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfb2FfaHN3LmgKQEAgLTMxLDQgKzMxLDggQEAgZXh0ZXJuIGludCBpOTE1 X29hX25fYnVpbHRpbl9tZXRyaWNfc2V0c19oc3c7CiAKIGV4dGVybiBpbnQgaTkxNV9vYV9zZWxl Y3RfbWV0cmljX3NldF9oc3coc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIAor ZXh0ZXJuIGludCBpOTE1X3BlcmZfcmVnaXN0ZXJfc3lzZnNfaHN3KHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdik7CisKK2V4dGVybiB2b2lkIGk5MTVfcGVyZl91bnJlZ2lzdGVyX3N5 c2ZzX2hzdyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOworCiAjZW5kaWYKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGVyZi5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9wZXJmLmMKaW5kZXggZmIwMjMzNC4uYzQ1YmJhNSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wZXJmLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9wZXJmLmMKQEAgLTc3OCw2ICs3NzgsMTUgQEAgc3RhdGljIGludCBpOTE1X29hX3N0 cmVhbV9pbml0KHN0cnVjdCBpOTE1X3BlcmZfc3RyZWFtICpzdHJlYW0sCiAJaW50IGZvcm1hdF9z aXplOwogCWludCByZXQ7CiAKKwkvKiBJZiB0aGUgc3lzZnMgbWV0cmljcy8gZGlyZWN0b3J5IHdh c24ndCByZWdpc3RlcmVkIGZvciBzb21lCisJICogcmVhc29uIHRoZW4gZG9uJ3QgbGV0IHVzZXJz cGFjZSB0cnkgdGhlaXIgbHVjayB3aXRoIGNvbmZpZworCSAqIElEcworCSAqLworCWlmICghZGV2 X3ByaXYtPnBlcmYubWV0cmljc19rb2JqKSB7CisJCURSTV9FUlJPUigiT0EgbWV0cmljcyB3ZXJl bid0IGFkdmVydGlzZWQgdmlhIHN5c2ZzXG4iKTsKKwkJcmV0dXJuIC1FSU5WQUw7CisJfQorCiAJ aWYgKCEocHJvcHMtPnNhbXBsZV9mbGFncyAmIFNBTVBMRV9PQV9SRVBPUlQpKSB7CiAJCURSTV9F UlJPUigiT25seSBPQSByZXBvcnQgc2FtcGxpbmcgc3VwcG9ydGVkXG4iKTsKIAkJcmV0dXJuIC1F SU5WQUw7CkBAIC0xMzk4LDYgKzE0MDcsNDkgQEAgaW50IGk5MTVfcGVyZl9vcGVuX2lvY3RsKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJcmV0dXJuIHJldDsKIH0KIAordm9p ZCBpOTE1X3BlcmZfcmVnaXN0ZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQor eworCWlmICghSVNfSEFTV0VMTChkZXZfcHJpdikpCisJCXJldHVybjsKKworCWlmICghZGV2X3By aXYtPnBlcmYuaW5pdGlhbGl6ZWQpCisJCXJldHVybjsKKworCS8qIFRvIGJlIHN1cmUgd2UncmUg c3luY2hyb25pemVkIHdpdGggYW4gYXR0ZW1wdGVkCisJICogaTkxNV9wZXJmX29wZW5faW9jdGwo KTsgY29uc2lkZXJpbmcgdGhhdCB3ZSByZWdpc3RlciBhZnRlcgorCSAqIGJlaW5nIGV4cG9zZWQg dG8gdXNlcnNwYWNlLgorCSAqLworCW11dGV4X2xvY2soJmRldl9wcml2LT5wZXJmLmxvY2spOwor CisJZGV2X3ByaXYtPnBlcmYubWV0cmljc19rb2JqID0KKwkJa29iamVjdF9jcmVhdGVfYW5kX2Fk ZCgibWV0cmljcyIsCisJCQkJICAgICAgICZkZXZfcHJpdi0+ZHJtLnByaW1hcnktPmtkZXYtPmtv YmopOworCWlmICghZGV2X3ByaXYtPnBlcmYubWV0cmljc19rb2JqKQorCQlnb3RvIGV4aXQ7CisK KwlpZiAoaTkxNV9wZXJmX3JlZ2lzdGVyX3N5c2ZzX2hzdyhkZXZfcHJpdikpIHsKKwkJa29iamVj dF9wdXQoZGV2X3ByaXYtPnBlcmYubWV0cmljc19rb2JqKTsKKwkJZGV2X3ByaXYtPnBlcmYubWV0 cmljc19rb2JqID0gTlVMTDsKKwl9CisKK2V4aXQ6CisJbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+ cGVyZi5sb2NrKTsKK30KKwordm9pZCBpOTE1X3BlcmZfdW5yZWdpc3RlcihzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCit7CisJaWYgKCFJU19IQVNXRUxMKGRldl9wcml2KSkKKwkJ cmV0dXJuOworCisJaWYgKCFkZXZfcHJpdi0+cGVyZi5tZXRyaWNzX2tvYmopCisJCXJldHVybjsK KworCWk5MTVfcGVyZl91bnJlZ2lzdGVyX3N5c2ZzX2hzdyhkZXZfcHJpdik7CisKKwlrb2JqZWN0 X3B1dChkZXZfcHJpdi0+cGVyZi5tZXRyaWNzX2tvYmopOworCWRldl9wcml2LT5wZXJmLm1ldHJp Y3Nfa29iaiA9IE5VTEw7Cit9CisKIHZvaWQgaTkxNV9wZXJmX2luaXQoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogewogCWlmICghSVNfSEFTV0VMTChkZXZfcHJpdikpCi0tIAoy LjEwLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=