From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [CI 6/9] drm/i915/pmu: Wire up engine busy stats to PMU Date: Tue, 21 Nov 2017 18:18:49 +0000 Message-ID: <20171121181852.16128-6-tvrtko.ursulin@linux.intel.com> References: <20171121181852.16128-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-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 24B426E570 for ; Tue, 21 Nov 2017 18:19:17 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id r68so5393996wmr.3 for ; Tue, 21 Nov 2017 10:19:17 -0800 (PST) In-Reply-To: <20171121181852.16128-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCldlIGNhbiB1 c2UgZW5naW5lIGJ1c3kgc3RhdHMgaW5zdGVhZCBvZiB0aGUgc2FtcGxpbmcgdGltZXIgZm9yCmJl dHRlciBhY2N1cmFjeS4KCkJ5IGRvaW5nIHRoaXMgd2UgcmVwbGFjZSB0aGUgc3RvaGFzdGljIHNh bXBsaW5nIHdpdGggYnVzeW5lc3MKbWV0cmljIGRlcml2ZWQgZGlyZWN0bHkgZnJvbSBlbmdpbmUg YWN0aXZpdHkuIFRoaXMgaXMgY29udGV4dApzd2l0Y2ggaW50ZXJydXB0IGRyaXZlbiwgc28gYXMg YWNjdXJhdGUgYXMgd2UgY2FuIGdldCBmcm9tCnNvZnR3YXJlIHRyYWNraW5nLgoKQXMgYSBzZWNv bmRhcnkgYmVuZWZpdCwgd2UgY2FuIGFsc28gbm90IHJ1biB0aGUgc2FtcGxpbmcgdGltZXIKaW4g Y2FzZXMgb25seSBidXN5bmVzcyBtZXRyaWMgaXMgZW5hYmxlZC4KCnYyOiBSZWJhc2UuCnYzOgog KiBSZWJhc2UsIGNvbW1lbnRzLgogKiBMZWF2ZSBlbmdpbmUgYnVzeW5lc3MgY29udHJvbHMgb3V0 IG9mIHdvcmtlcnMuCnY0OiBDaGVja3BhdGNoIGNsZWFudXAuCnY1OiBBZGRlZCBjb21tZW50IHRv IHBtdV9uZWVkc190aW1lciBjaGFuZ2UuCnY2OgogKiBSZWJhc2UuCiAqIEZpeCBzdHlsZSBvZiBz b21lIGNvbW1lbnRzLiAoQ2hyaXMgV2lsc29uKQp2NzogUmViYXNlIGFuZCBjb21taXQgbWVzc2Fn ZSB1cGRhdGUuIChDaHJpcyBXaWxzb24pCnY4OiBBZGQgZGVsYXllZCBzdGF0cyBkaXNhYmxpbmcg dG8gaW1wcm92ZSBhY2N1cmFjeSBpbiBmYWNlIG9mCiAgICBDUFUgaG90cGx1ZyBldmVudHMuCnY5 OiBSZWJhc2UuCnYxMDogUmViYXNlIC0gaTkxNV9tb2RwYXJhbXMuZW5hYmxlX2V4ZWNsaXN0cyBy ZW1vdmFsLgoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGlu dGVsLmNvbT4KUmV2aWV3ZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNv LnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcG11LmMgICAgICAgICB8IDc4ICsr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcmluZ2J1ZmZlci5oIHwgMTQgKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDkwIGluc2VydGlv bnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9wbXUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcG11LmMKaW5kZXggZmI5NWYw YWMzMGVhLi42YTQyOGU3MjE4ZDIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfcG11LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUuYwpAQCAtOTAsNiAr OTAsMTEgQEAgc3RhdGljIHVuc2lnbmVkIGludCBldmVudF9lbmFibGVkX2JpdChzdHJ1Y3QgcGVy Zl9ldmVudCAqZXZlbnQpCiAJcmV0dXJuIGNvbmZpZ19lbmFibGVkX2JpdChldmVudC0+YXR0ci5j b25maWcpOwogfQogCitzdGF0aWMgYm9vbCBzdXBwb3J0c19idXN5X3N0YXRzKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICppOTE1KQoreworCXJldHVybiBJTlRFTF9HRU4oaTkxNSkgPj0gODsKK30K Kwogc3RhdGljIGJvb2wgcG11X25lZWRzX3RpbWVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpp OTE1LCBib29sIGdwdV9hY3RpdmUpCiB7CiAJdTY0IGVuYWJsZTsKQEAgLTExNSw2ICsxMjAsMTIg QEAgc3RhdGljIGJvb2wgcG11X25lZWRzX3RpbWVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpp OTE1LCBib29sIGdwdV9hY3RpdmUpCiAJICovCiAJaWYgKCFncHVfYWN0aXZlKQogCQllbmFibGUg Jj0gfkVOR0lORV9TQU1QTEVfTUFTSzsKKwkvKgorCSAqIEFsc28gdGhlcmUgaXMgc29mdHdhcmUg YnVzeW5lc3MgdHJhY2tpbmcgYXZhaWxhYmxlIHdlIGRvIG5vdAorCSAqIG5lZWQgdGhlIHRpbWVy IGZvciBJOTE1X1NBTVBMRV9CVVNZIGNvdW50ZXIuCisJICovCisJZWxzZSBpZiAoc3VwcG9ydHNf YnVzeV9zdGF0cyhpOTE1KSkKKwkJZW5hYmxlICY9IH5CSVQoSTkxNV9TQU1QTEVfQlVTWSk7CiAK IAkvKgogCSAqIElmIHNvbWUgYml0cyByZW1haW4gaXQgbWVhbnMgd2UgbmVlZCB0aGUgc2FtcGxp bmcgdGltZXIgcnVubmluZy4KQEAgLTM2Myw2ICszNzQsOSBAQCBzdGF0aWMgdTY0IF9faTkxNV9w bXVfZXZlbnRfcmVhZChzdHJ1Y3QgcGVyZl9ldmVudCAqZXZlbnQpCiAKIAkJaWYgKFdBUk5fT05f T05DRSghZW5naW5lKSkgewogCQkJLyogRG8gbm90aGluZyAqLworCQl9IGVsc2UgaWYgKHNhbXBs ZSA9PSBJOTE1X1NBTVBMRV9CVVNZICYmCisJCQkgICBlbmdpbmUtPnBtdS5idXN5X3N0YXRzKSB7 CisJCQl2YWwgPSBrdGltZV90b19ucyhpbnRlbF9lbmdpbmVfZ2V0X2J1c3lfdGltZShlbmdpbmUp KTsKIAkJfSBlbHNlIHsKIAkJCXZhbCA9IGVuZ2luZS0+cG11LnNhbXBsZVtzYW1wbGVdLmN1cjsK IAkJfQpAQCAtMzk5LDYgKzQxMywxMiBAQCBzdGF0aWMgdm9pZCBpOTE1X3BtdV9ldmVudF9yZWFk KHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCkKIAlsb2NhbDY0X2FkZChuZXcgLSBwcmV2LCAmZXZl bnQtPmNvdW50KTsKIH0KIAorc3RhdGljIGJvb2wgZW5naW5lX25lZWRzX2J1c3lfc3RhdHMoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQoreworCXJldHVybiBzdXBwb3J0c19idXN5X3N0 YXRzKGVuZ2luZS0+aTkxNSkgJiYKKwkgICAgICAgKGVuZ2luZS0+cG11LmVuYWJsZSAmIEJJVChJ OTE1X1NBTVBMRV9CVVNZKSk7Cit9CisKIHN0YXRpYyB2b2lkIGk5MTVfcG11X2VuYWJsZShzdHJ1 Y3QgcGVyZl9ldmVudCAqZXZlbnQpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUg PQpAQCAtNDM4LDcgKzQ1OCwyMSBAQCBzdGF0aWMgdm9pZCBpOTE1X3BtdV9lbmFibGUoc3RydWN0 IHBlcmZfZXZlbnQgKmV2ZW50KQogCiAJCUdFTV9CVUdfT04oc2FtcGxlID49IEk5MTVfUE1VX1NB TVBMRV9CSVRTKTsKIAkJR0VNX0JVR19PTihlbmdpbmUtPnBtdS5lbmFibGVfY291bnRbc2FtcGxl XSA9PSB+MCk7Ci0JCWVuZ2luZS0+cG11LmVuYWJsZV9jb3VudFtzYW1wbGVdKys7CisJCWlmIChl bmdpbmUtPnBtdS5lbmFibGVfY291bnRbc2FtcGxlXSsrID09IDApIHsKKwkJCS8qCisJCQkgKiBF bmFibGUgZW5naW5lIGJ1c3kgc3RhdHMgdHJhY2tpbmcgaWYgbmVlZGVkIG9yCisJCQkgKiBhbHRl cm5hdGl2ZWx5IGNhbmNlbCB0aGUgc2NoZWR1bGVkIGRpc2FibGUuCisJCQkgKgorCQkJICogSWYg dGhlIGRlbGF5ZWQgZGlzYWJsZSB3YXMgcGVuZGluZywgY2FuY2VsIGl0IGFuZAorCQkJICogaW4g dGhpcyBjYXNlIGRvIG5vdCBlbmFibGUgc2luY2UgaXQgYWxyZWFkeSBpcy4KKwkJCSAqLworCQkJ aWYgKGVuZ2luZV9uZWVkc19idXN5X3N0YXRzKGVuZ2luZSkgJiYKKwkJCSAgICAhZW5naW5lLT5w bXUuYnVzeV9zdGF0cykgeworCQkJCWVuZ2luZS0+cG11LmJ1c3lfc3RhdHMgPSB0cnVlOworCQkJ CWlmICghY2FuY2VsX2RlbGF5ZWRfd29yaygmZW5naW5lLT5wbXUuZGlzYWJsZV9idXN5X3N0YXRz KSkKKwkJCQkJaW50ZWxfZW5hYmxlX2VuZ2luZV9zdGF0cyhlbmdpbmUpOworCQkJfQorCQl9CiAJ fQogCiAJLyoKQEAgLTQ1MSw2ICs0ODUsMTQgQEAgc3RhdGljIHZvaWQgaTkxNV9wbXVfZW5hYmxl KHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCkKIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZpOTE1 LT5wbXUubG9jaywgZmxhZ3MpOwogfQogCitzdGF0aWMgdm9pZCBfX2Rpc2FibGVfYnVzeV9zdGF0 cyhzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCit7CisJc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZW5naW5lID0KKwkgICAgICAgY29udGFpbmVyX29mKHdvcmssIHR5cGVvZigqZW5naW5lKSwgcG11 LmRpc2FibGVfYnVzeV9zdGF0cy53b3JrKTsKKworCWludGVsX2Rpc2FibGVfZW5naW5lX3N0YXRz KGVuZ2luZSk7Cit9CisKIHN0YXRpYyB2b2lkIGk5MTVfcG11X2Rpc2FibGUoc3RydWN0IHBlcmZf ZXZlbnQgKmV2ZW50KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1ID0KQEAgLTQ3 NCw4ICs1MTYsMjYgQEAgc3RhdGljIHZvaWQgaTkxNV9wbXVfZGlzYWJsZShzdHJ1Y3QgcGVyZl9l dmVudCAqZXZlbnQpCiAJCSAqIERlY3JlbWVudCB0aGUgcmVmZXJlbmNlIGNvdW50IGFuZCBjbGVh ciB0aGUgZW5hYmxlZAogCQkgKiBiaXRtYXNrIHdoZW4gdGhlIGxhc3QgbGlzdGVuZXIgb24gYW4g ZXZlbnQgZ29lcyBhd2F5LgogCQkgKi8KLQkJaWYgKC0tZW5naW5lLT5wbXUuZW5hYmxlX2NvdW50 W3NhbXBsZV0gPT0gMCkKKwkJaWYgKC0tZW5naW5lLT5wbXUuZW5hYmxlX2NvdW50W3NhbXBsZV0g PT0gMCkgewogCQkJZW5naW5lLT5wbXUuZW5hYmxlICY9IH5CSVQoc2FtcGxlKTsKKwkJCWlmICgh ZW5naW5lX25lZWRzX2J1c3lfc3RhdHMoZW5naW5lKSAmJgorCQkJICAgIGVuZ2luZS0+cG11LmJ1 c3lfc3RhdHMpIHsKKwkJCQllbmdpbmUtPnBtdS5idXN5X3N0YXRzID0gZmFsc2U7CisJCQkJLyoK KwkJCQkgKiBXZSByZXF1ZXN0IGEgZGVsYXllZCBkaXNhYmxlIHRvIGhhbmRsZSB0aGUKKwkJCQkg KiByYXBpZCBvbi9vZmYgY3ljbGVzIG9uIGV2ZW50cywgd2hpY2ggY2FuCisJCQkJICogaGFwcGVu IHdoZW4gdG9vbHMgbGlrZSBwZXJmIHN0YXQgc3RhcnQsIGluIGEKKwkJCQkgKiBuaWNlciB3YXku CisJCQkJICoKKwkJCQkgKiBJbiBhZGRpdGlvbiwgdGhpcyBhbHNvIGhlbHBzIHdpdGggYnVzeSBz dGF0cworCQkJCSAqIGFjY3VyYWN5IHdpdGggYmFja2dyb3VuZCBDUFUgb2ZmbGluZS9vbmxpbmUK KwkJCQkgKiBtaWdyYXRpb24gZXZlbnRzLgorCQkJCSAqLworCQkJCXF1ZXVlX2RlbGF5ZWRfd29y ayhzeXN0ZW1fd3EsCisJCQkJCQkgICAmZW5naW5lLT5wbXUuZGlzYWJsZV9idXN5X3N0YXRzLAor CQkJCQkJICAgcm91bmRfamlmZmllc191cF9yZWxhdGl2ZShIWikpOworCQkJfQorCQl9CiAJfQog CiAJR0VNX0JVR19PTihiaXQgPj0gSTkxNV9QTVVfTUFTS19CSVRTKTsKQEAgLTcwMiw2ICs3NjIs OCBAQCBzdGF0aWMgdm9pZCBpOTE1X3BtdV91bnJlZ2lzdGVyX2NwdWhwX3N0YXRlKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICppOTE1KQogCiB2b2lkIGk5MTVfcG11X3JlZ2lzdGVyKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICppOTE1KQogeworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2lu ZTsKKwllbnVtIGludGVsX2VuZ2luZV9pZCBpZDsKIAlpbnQgcmV0OwogCiAJaWYgKElOVEVMX0dF TihpOTE1KSA8PSAyKSB7CkBAIC03MjMsNiArNzg1LDEwIEBAIHZvaWQgaTkxNV9wbXVfcmVnaXN0 ZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCiAJaHJ0aW1lcl9pbml0KCZpOTE1LT5w bXUudGltZXIsIENMT0NLX01PTk9UT05JQywgSFJUSU1FUl9NT0RFX1JFTCk7CiAJaTkxNS0+cG11 LnRpbWVyLmZ1bmN0aW9uID0gaTkxNV9zYW1wbGU7CiAKKwlmb3JfZWFjaF9lbmdpbmUoZW5naW5l LCBpOTE1LCBpZCkKKwkJSU5JVF9ERUxBWUVEX1dPUksoJmVuZ2luZS0+cG11LmRpc2FibGVfYnVz eV9zdGF0cywKKwkJCQkgIF9fZGlzYWJsZV9idXN5X3N0YXRzKTsKKwogCXJldCA9IHBlcmZfcG11 X3JlZ2lzdGVyKCZpOTE1LT5wbXUuYmFzZSwgImk5MTUiLCAtMSk7CiAJaWYgKHJldCkKIAkJZ290 byBlcnI7CkBAIC03NDIsNiArODA4LDkgQEAgdm9pZCBpOTE1X3BtdV9yZWdpc3RlcihzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIAogdm9pZCBpOTE1X3BtdV91bnJlZ2lzdGVyKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogeworCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZTsKKwllbnVtIGludGVsX2VuZ2luZV9pZCBpZDsKKwogCWlmICghaTkxNS0+cG11LmJhc2Uu ZXZlbnRfaW5pdCkKIAkJcmV0dXJuOwogCkBAIC03NDksNiArODE4LDExIEBAIHZvaWQgaTkxNV9w bXVfdW5yZWdpc3RlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIAogCWhydGltZXJf Y2FuY2VsKCZpOTE1LT5wbXUudGltZXIpOwogCisJZm9yX2VhY2hfZW5naW5lKGVuZ2luZSwgaTkx NSwgaWQpIHsKKwkJR0VNX0JVR19PTihlbmdpbmUtPnBtdS5idXN5X3N0YXRzKTsKKwkJZmx1c2hf ZGVsYXllZF93b3JrKCZlbmdpbmUtPnBtdS5kaXNhYmxlX2J1c3lfc3RhdHMpOworCX0KKwogCWk5 MTVfcG11X3VucmVnaXN0ZXJfY3B1aHBfc3RhdGUoaTkxNSk7CiAKIAlwZXJmX3BtdV91bnJlZ2lz dGVyKCZpOTE1LT5wbXUuYmFzZSk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy LmgKaW5kZXggNDJlZTgxNWQ4ZjI4Li4zYmQzMGQwMTE4NjYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTM2MCw2ICszNjAsMjAgQEAgc3RydWN0IGludGVsX2Vu Z2luZV9jcyB7CiAJCSAqIE91ciBpbnRlcm5hbCB0aW1lciBzdG9yZXMgdGhlIGN1cnJlbnQgY291 bnRlcnMgaW4gdGhpcyBmaWVsZC4KIAkJICovCiAJCXN0cnVjdCBpOTE1X3BtdV9zYW1wbGUgc2Ft cGxlW0k5MTVfRU5HSU5FX1NBTVBMRV9NQVhdOworCQkvKioKKwkJICogQGJ1c3lfc3RhdHM6IEhh cyBlbmFibGVtZW50IG9mIGVuZ2luZSBzdGF0cyB0cmFja2luZyBiZWVuCisJCSAqIAkJcmVxdWVz dGVkLgorCQkgKi8KKwkJYm9vbCBidXN5X3N0YXRzOworCQkvKioKKwkJICogQGRpc2FibGVfYnVz eV9zdGF0czogV29yayBpdGVtIGZvciBidXN5IHN0YXRzIGRpc2FibGluZy4KKwkJICoKKwkJICog U2FtZSBhcyB3aXRoIEBlbmFibGVfYnVzeV9zdGF0cyBhY3Rpb24sIHdpdGggdGhlIGRpZmZlcmVu Y2UKKwkJICogdGhhdCB3ZSBkZWxheSBpdCBpbiBjYXNlIHRoZXJlIGFyZSByYXBpZCBlbmFibGUt ZGlzYWJsZQorCQkgKiBhY3Rpb25zLCB3aGljaCBjYW4gaGFwcGVuIGR1cmluZyB0b29sIHN0YXJ0 dXAgKGxpa2UgcGVyZgorCQkgKiBzdGF0KS4KKwkJICovCisJCXN0cnVjdCBkZWxheWVkX3dvcmsg ZGlzYWJsZV9idXN5X3N0YXRzOwogCX0gcG11OwogCiAJLyoKLS0gCjIuMTQuMQoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==