From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: Re: [PATCH] drm/i915/pmu: Only enumerate available counters in sysfs Date: Fri, 22 Dec 2017 17:14:10 +0000 Message-ID: <8059b775-95cc-da48-8c5e-4179ed2cde6d@linux.intel.com> References: <20171221171316.11284-1-tvrtko.ursulin@linux.intel.com> <151395432533.16779.3231772694845672632@mail.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 62B566E758 for ; Fri, 22 Dec 2017 17:14:13 +0000 (UTC) In-Reply-To: <151395432533.16779.3231772694845672632@mail.alporthouse.com> Content-Language: en-GB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Chris Wilson , Tvrtko Ursulin , Intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org Ck9uIDIyLzEyLzIwMTcgMTQ6NTIsIENocmlzIFdpbHNvbiB3cm90ZToKPiBRdW90aW5nIFR2cnRr byBVcnN1bGluICgyMDE3LTEyLTIxIDE3OjEzOjE2KQo+PiBGcm9tOiBUdnJ0a28gVXJzdWxpbiA8 dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgo+Pgo+PiBTd2l0Y2ggb3ZlciB0byBkeW5hbWljYWxs eSBjcmVhdGluZyBkZXZpY2UgYXR0cmlidXRlcywgd2hpY2ggYXJlIGluIHR1cm4KPj4gdXNlZCBi eSB0aGUgcGVyZiBjb3JlIHRvIGV4cG9zZSBhdmFpbGFibGUgY291bnRlcnMgaW4gc3lzZnMuCj4+ Cj4+IFRoaXMgd2F5IHdlIGRvIG5vdCBleHBvc2UgY291bnRlcnMgd2hpY2ggYXJlIG5vdCBhdmFp YWJsZSBvbiB0aGUgY3VycmVudAo+PiBwbGF0Zm9ybSwgYW5kIGFyZSBzbyBtb3JlIGNvbnNpc3Rl bnQgYmV0d2VlbiB3aGF0IHdlIHJlcGx5IHRvIG9wZW4KPj4gYXR0ZW1wdHMgdmlhIHRoZSBwZXJm X2V2ZW50X29wZW4oMiksIGFuZCB3aGF0IGlzIGRpc2NvdmVyYWJsZSBpbiBzeXNmcy4KPj4KPj4g U2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4K Pj4gLS0tCj4+ICsjZGVmaW5lIF9fZXZlbnQoX19jb25maWcsIF9fbmFtZSwgX191bml0KSBcCj4+ ICt7IFwKPj4gKyAgICAgICAuY29uZmlnID0gKF9fY29uZmlnKSwgXAo+PiArICAgICAgIC5uYW1l ID0gKF9fbmFtZSksIFwKPj4gKyAgICAgICAudW5pdCA9IChfX3VuaXQpLCBcCj4+ICt9Cj4+ICsK Pj4gKyNkZWZpbmUgX19lbmdpbmVfZXZlbnQoX19zYW1wbGUsIF9fbmFtZSkgXAo+PiAreyBcCj4+ ICsgICAgICAgLnNhbXBsZSA9IChfX3NhbXBsZSksIFwKPj4gKyAgICAgICAubmFtZSA9IChfX25h bWUpLCBcCj4+ICt9Cj4+ICsKPj4gKyNkZWZpbmUgX19pOTE1X2F0dHIoX19wLCBfX25hbWUsIF9f Y29uZmlnKSBcCj4+ICt7IFwKPj4gKyAgICAgICAoX19wKS0+YXR0ci5hdHRyLm5hbWUgPSAoX19u YW1lKTsgXAo+PiArICAgICAgIChfX3ApLT5hdHRyLmF0dHIubW9kZSA9IDA0NDQ7IFwKPj4gKyAg ICAgICAoX19wKS0+YXR0ci5zaG93ID0gaTkxNV9wbXVfZXZlbnRfc2hvdzsgXAo+PiArICAgICAg IChfX3ApLT52YWwgPSAoX19jb25maWcpOyBcCj4+ICt9Cj4+ICsKPj4gKyNkZWZpbmUgX19wbXVf YXR0cihfX3AsIF9fbmFtZSwgX19zdHIpIFwKPj4gK3sgXAo+PiArICAgICAgIChfX3ApLT5hdHRy LmF0dHIubmFtZSA9IChfX25hbWUpOyBcCj4+ICsgICAgICAgKF9fcCktPmF0dHIuYXR0ci5tb2Rl ID0gMDQ0NDsgXAo+PiArICAgICAgIChfX3ApLT5hdHRyLnNob3cgPSBwZXJmX2V2ZW50X3N5c2Zz X3Nob3c7IFwKPj4gKyAgICAgICAoX19wKS0+ZXZlbnRfc3RyID0gKF9fc3RyKTsgXAo+PiArfQo+ PiArCj4+ICtzdGF0aWMgc3RydWN0IGF0dHJpYnV0ZSAqKgo+PiArY3JlYXRlX2V2ZW50X2F0dHJp YnV0ZXMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCj4+ICt7Cj4+ICsgICAgICAgc3Rh dGljIGNvbnN0IHN0cnVjdCB7Cj4+ICsgICAgICAgICAgICAgICB1NjQgY29uZmlnOwo+PiArICAg ICAgICAgICAgICAgY29uc3QgY2hhciAqbmFtZTsKPj4gKyAgICAgICAgICAgICAgIGNvbnN0IGNo YXIgKnVuaXQ7Cj4+ICsgICAgICAgfSBldmVudHNbXSA9IHsKPj4gKyAgICAgICAgICAgICAgIF9f ZXZlbnQoSTkxNV9QTVVfQUNUVUFMX0ZSRVFVRU5DWSwgImFjdHVhbC1mcmVxdWVuY3kiLCAiTUh6 IiksCj4+ICsgICAgICAgICAgICAgICBfX2V2ZW50KEk5MTVfUE1VX1JFUVVFU1RFRF9GUkVRVUVO Q1ksICJyZXF1ZXN0ZWQtZnJlcXVlbmN5IiwgIk1IeiIpLAo+PiArICAgICAgICAgICAgICAgX19l dmVudChJOTE1X1BNVV9JTlRFUlJVUFRTLCAiaW50ZXJydXB0cyIsIE5VTEwpLAo+PiArICAgICAg ICAgICAgICAgX19ldmVudChJOTE1X1BNVV9SQzZfUkVTSURFTkNZLCAicmM2LXJlc2lkZW5jeSIs ICJucyIpLAo+PiArICAgICAgIH07Cj4+ICsgICAgICAgc3RhdGljIGNvbnN0IHN0cnVjdCB7Cj4+ ICsgICAgICAgICAgICAgICBlbnVtIGRybV9pOTE1X3BtdV9lbmdpbmVfc2FtcGxlIHNhbXBsZTsK Pj4gKyAgICAgICAgICAgICAgIGNoYXIgKm5hbWU7Cj4+ICsgICAgICAgfSBlbmdpbmVfZXZlbnRz W10gPSB7Cj4+ICsgICAgICAgICAgICAgICBfX2VuZ2luZV9ldmVudChJOTE1X1NBTVBMRV9CVVNZ LCAiYnVzeSIpLAo+PiArICAgICAgICAgICAgICAgX19lbmdpbmVfZXZlbnQoSTkxNV9TQU1QTEVf U0VNQSwgInNlbWEiKSwKPj4gKyAgICAgICAgICAgICAgIF9fZW5naW5lX2V2ZW50KEk5MTVfU0FN UExFX1dBSVQsICJ3YWl0IiksCj4gCj4gQXJlIHRoZXNlIG1hY3JvcyB0aGF0IHVzZWZ1bD8gdnMg eyBJOTE1X1NBTVBMRV9CVVNZLCAiYnVzeSIgfSBhbmQKPiB7IEk5MTVfUE1VX0FDVFVBTF9GUkVR VUVOQ1ksICJhY3R1YWwtZnJlcXVlbmN5IiwgIk1IeiIgfSwKClRoZXkgYXJlIG1hcmdpbmFsLi4g SSBwcmVmZXJyZWQgdG8gdXNlZCBuYW1lZCBpbml0aWFsaXphdGlvbiB0byBiZSBtb3JlIAptaXN0 YWtlIHByb29mLCBpbiB3aGljaCBjYXNlIHRoZXkgZG8gc2hvcnRlbiB0aGUgbGluZXMgaGVyZSBh IGJpdC4gSXQncyAKNTAtNTAgZm9yIG1lLCBvciBkb24ndCByZWFsbHkgY2FyZS4KCj4+ICsgICAg ICAgfTsKPj4gKyAgICAgICB1bnNpZ25lZCBpbnQgY291bnQgPSAwOwo+PiArICAgICAgIHN0cnVj dCBwZXJmX3BtdV9ldmVudHNfYXR0ciAqcG11X2F0dHIsICpwbXVfcDsKPj4gKyAgICAgICBzdHJ1 Y3QgaTkxNV9leHRfYXR0cmlidXRlICppOTE1X2F0dHIsICppOTE1X3A7Cj4+ICsgICAgICAgc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lOwo+PiArICAgICAgIHN0cnVjdCBhdHRyaWJ1dGUg KiphdHRyLCAqKnA7Cj4+ICsgICAgICAgZW51bSBpbnRlbF9lbmdpbmVfaWQgaWQ7Cj4+ICsgICAg ICAgdW5zaWduZWQgaW50IGk7Cj4+ICsKPj4gKyAgICAgICAvKiBDb3VudCBob3cgbWFueSBjb3Vu dGVycyB3ZSB3aWxsIGJlIGV4cG9zaW5nLiAqLwo+PiArICAgICAgIGZvciAoaSA9IDA7IGkgPCBB UlJBWV9TSVpFKGV2ZW50cyk7IGkrKykgewo+PiArICAgICAgICAgICAgICAgaWYgKCFjb25maWdf c3RhdHVzKGk5MTUsIGV2ZW50c1tpXS5jb25maWcpKQo+PiArICAgICAgICAgICAgICAgICAgICAg ICBjb3VudCsrOwo+PiArICAgICAgIH0KPj4gKwo+PiArICAgICAgIGZvcl9lYWNoX2VuZ2luZShl bmdpbmUsIGk5MTUsIGlkKSB7Cj4+ICsgICAgICAgICAgICAgICBmb3IgKGkgPSAwOyBpIDwgQVJS QVlfU0laRShlbmdpbmVfZXZlbnRzKTsgaSsrKSB7Cj4+ICsgICAgICAgICAgICAgICAgICAgICAg IGlmICghZW5naW5lX2V2ZW50X3N0YXR1cyhlbmdpbmUsCj4+ICsgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbmdpbmVfZXZlbnRzW2ldLnNhbXBsZSkpCj4+ ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY291bnQrKzsKPj4gKyAgICAgICAgICAg ICAgIH0KPj4gKyAgICAgICB9Cj4+ICsKPj4gKyAgICAgICAvKiBBbGxvY2F0ZSBhdHRyaWJ1dGUg b2JqZWN0cyBhbmQgdGFibGUuICovCj4+ICsgICAgICAgaTkxNV9hdHRyID0ga3phbGxvYyhjb3Vu dCAqIHNpemVvZigqaTkxNV9hdHRyKSwgR0ZQX0tFUk5FTCk7Cj4+ICsgICAgICAgaWYgKCFpOTE1 X2F0dHIpCj4+ICsgICAgICAgICAgICAgICByZXR1cm4gTlVMTDsKPj4gKwo+PiArICAgICAgIHBt dV9hdHRyID0ga3phbGxvYyhjb3VudCAqIHNpemVvZigqcG11X2F0dHIpLCBHRlBfS0VSTkVMKTsK Pj4gKyAgICAgICBpZiAoIXBtdV9hdHRyKSB7Cj4+ICsgICAgICAgICAgICAgICBrZnJlZShpOTE1 X2F0dHIpOwo+PiArICAgICAgICAgICAgICAgcmV0dXJuIE5VTEw7Cj4+ICsgICAgICAgfQo+PiAr Cj4+ICsgICAgICAgLyogTWF4IG9uZSBwb2ludGVyIG9mIGVhY2ggYXR0cmlidXRlIHR5cGUgcGx1 cyBhIHRlcm1pbmF0aW9uIGVudHJ5LiAqLwo+PiArICAgICAgIGF0dHIgPSBremFsbG9jKChjb3Vu dCAqIDIgKyAxKSAqIHNpemVvZihhdHRyKSwgR0ZQX0tFUk5FTCk7Cj4+ICsgICAgICAgaWYgKCFh dHRyKSB7Cj4+ICsgICAgICAgICAgICAgICBrZnJlZShwbXVfYXR0cik7Cj4+ICsgICAgICAgICAg ICAgICBrZnJlZShpOTE1X2F0dHIpOwo+PiArICAgICAgICAgICAgICAgcmV0dXJuIE5VTEw7Cj4g Cj4gSm9vbmFzIHdhbnRzIHlvdSB0byBmZWVkIHRocm91Z2ggdGhlIHNhbWUgZXJyb3IgdW53aW5k LgoKWWVhaCwgSSd2ZSBhbG1vc3QgZG9uZSBpdCBhdCBvbmUgcG9pbnQuIDopCgo+PiArICAgICAg IH0KPj4gKwo+PiArICAgICAgIGk5MTVfcCA9IGk5MTVfYXR0cjsKPj4gKyAgICAgICBwbXVfcCA9 IHBtdV9hdHRyOwo+PiArICAgICAgIHAgPSBhdHRyOwo+IAo+IGk5MTVfYXR0cl9pdGVyLCBwbXVf YXR0cl9pdGVyIGFuZCBhdHRyX2l0ZXI/CgpTaHJ1ZywgY2FuIGRvLgoKPiAKPj4gKyAgICAgICAv KiBJbml0aWFsaXplIHN1cHBvcnRlZCBub24tZW5naW5lIGNvdW50ZXJzLiAqLwo+PiArICAgICAg IGZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKGV2ZW50cyk7IGkrKykgewo+PiArICAgICAgICAg ICAgICAgY2hhciAqc3RyOwo+PiArCj4+ICsgICAgICAgICAgICAgICBpZiAoY29uZmlnX3N0YXR1 cyhpOTE1LCBldmVudHNbaV0uY29uZmlnKSkKPj4gKyAgICAgICAgICAgICAgICAgICAgICAgY29u dGludWU7Cj4+ICsKPj4gKyAgICAgICAgICAgICAgIHN0ciA9IGtzdHJkdXAoZXZlbnRzW2ldLm5h bWUsIEdGUF9LRVJORUwpOwo+PiArICAgICAgICAgICAgICAgaWYgKCFzdHIpCj4+ICsgICAgICAg ICAgICAgICAgICAgICAgIGdvdG8gZXJyOwo+PiArCj4+ICsgICAgICAgICAgICAgICBfX2k5MTVf YXR0cihpOTE1X3AsIHN0ciwgZXZlbnRzW2ldLmNvbmZpZyk7Cj4gCj4gCQkqYXR0cl9pdGVyKysg PSAmaTkxNV9hdHRyX2l0ZXItPmF0dHIuYXR0cjsKPiAJCSppOTE1X2F0dHJfaXRlcisrID0gKHN0 cnVjdCBpOTE1X2V4dF9hdHRyaWJ1dGUpIHsKPiAJCQkuYXR0ci5hdHRyLm5hbWUgPSBzdHIsCj4g CQkJLmF0dHIuYXR0ci5tb2RlID0gMDQ0NCwKPiAJCQkuYXR0ci5zaG93ID0gaTkxNV9wbXVfZXZl bnRfc2hvdywKPiAJCQkudmFsID0gZXZlbnRzW2ldLmNvbmZpZywKPiAJCX0KPiAKPiA/CgpQYXJ0 aWFsbHkgcHJldHRpZXIgYnV0IHNpbmNlIEkgaGFkIHR3byBpbnN0YW5jZXMgb2YgZWFjaCBhdHRy IAppbml0aWFsaXphdGlvbiBJIGxpa2VkIGhvdyB0aGUgbWFjcm8gc2hyYW5rIHRoZSBjb2RlLiBQ ZXJoYXBzIEkgbWFrZSB0aGUgCm1hY3JvIGluY3JlbWVudCB0aGUgcG9pbnRlciBhbmQgcmV0dXJu IGl0PyBPciBtYWtlIGl0IGEgc3RhdGljIGlubGluZSBldmVuLgoKaTkxNV9hdHRyX2l0ZXIgPSBf X2FkZF9pOTE1X2F0dHIoaTkxNV9hdHRyX2l0ZXIsIHN0ciwgLi4uKTsKCj8KCj4gTWVyZSBzdWdn ZXN0aW9ucy4gRG9lc24ndCBsb29rIHRoYXQgYmFkCgpUaGFua3MgZm9yIGxvb2tpbmcuIEkgdGhp bmsgdGhlIGxhcmdlc3QgYmVuZWZpdCBpcyBmdXR1cmUgcHJvb2ZpbmcgdGhlIAptYWludGVuYW5j ZS4gU2Vjb25kYXJ5LCBidXQgYWxzbyBhdHRyYWN0aXZlLCB0aGF0IHRoZSB1bnN1cHBvcnRlZCBl dmVudHMgCmRvIG5vdCBsaXN0LgoKUmVnYXJkcywKClR2cnRrbwpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK