From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [CI 06/10] drm/i915/pmu: Wire up engine busy stats to PMU Date: Tue, 10 Oct 2017 16:19:03 +0100 Message-ID: <20171010151907.5594-6-tvrtko.ursulin@linux.intel.com> References: <20171010151907.5594-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-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5107B6E53F for ; Tue, 10 Oct 2017 15:19:20 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id i124so6364990wmf.3 for ; Tue, 10 Oct 2017 08:19:20 -0700 (PDT) In-Reply-To: <20171010151907.5594-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 ZSB1cGRhdGUuIChDaHJpcyBXaWxzb24pCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8 dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJp c0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUu YyAgICAgICAgIHwgMzcgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggfCAgNSArKysrKwogMiBmaWxlcyBjaGFu Z2VkLCA0MCBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfcG11LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Bt dS5jCmluZGV4IGExYTNjNjMwYzk1ZS4uMjY3MWUzNjQwNjM5IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X3BtdS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf cG11LmMKQEAgLTkwLDYgKzkwLDExIEBAIHN0YXRpYyB1bnNpZ25lZCBpbnQgZXZlbnRfZW5hYmxl ZF9iaXQoc3RydWN0IHBlcmZfZXZlbnQgKmV2ZW50KQogCXJldHVybiBjb25maWdfZW5hYmxlZF9i aXQoZXZlbnQtPmF0dHIuY29uZmlnKTsKIH0KIAorc3RhdGljIGJvb2wgc3VwcG9ydHNfYnVzeV9z dGF0cyh2b2lkKQoreworCXJldHVybiBpOTE1X21vZHBhcmFtcy5lbmFibGVfZXhlY2xpc3RzOwor fQorCiBzdGF0aWMgYm9vbCBwbXVfbmVlZHNfdGltZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg Kmk5MTUsIGJvb2wgZ3B1X2FjdGl2ZSkKIHsKIAl1NjQgZW5hYmxlOwpAQCAtMTE1LDYgKzEyMCwx MiBAQCBzdGF0aWMgYm9vbCBwbXVfbmVlZHNfdGltZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg Kmk5MTUsIGJvb2wgZ3B1X2FjdGl2ZSkKIAkgKi8KIAlpZiAoIWdwdV9hY3RpdmUpCiAJCWVuYWJs ZSAmPSB+RU5HSU5FX1NBTVBMRV9NQVNLOworCS8qCisJICogQWxzbyB0aGVyZSBpcyBzb2Z0d2Fy ZSBidXN5bmVzcyB0cmFja2luZyBhdmFpbGFibGUgd2UgZG8gbm90CisJICogbmVlZCB0aGUgdGlt ZXIgZm9yIEk5MTVfU0FNUExFX0JVU1kgY291bnRlci4KKwkgKi8KKwllbHNlIGlmIChzdXBwb3J0 c19idXN5X3N0YXRzKCkpCisJCWVuYWJsZSAmPSB+QklUKEk5MTVfU0FNUExFX0JVU1kpOwogCiAJ LyoKIAkgKiBJZiBzb21lIGJpdHMgcmVtYWluIGl0IG1lYW5zIHdlIG5lZWQgdGhlIHNhbXBsaW5n IHRpbWVyIHJ1bm5pbmcuCkBAIC0zNjIsNiArMzczLDkgQEAgc3RhdGljIHU2NCBfX2k5MTVfcG11 X2V2ZW50X3JlYWQoc3RydWN0IHBlcmZfZXZlbnQgKmV2ZW50KQogCiAJCWlmIChXQVJOX09OX09O Q0UoIWVuZ2luZSkpIHsKIAkJCS8qIERvIG5vdGhpbmcgKi8KKwkJfSBlbHNlIGlmIChzYW1wbGUg PT0gSTkxNV9TQU1QTEVfQlVTWSAmJgorCQkJICAgZW5naW5lLT5wbXUuYnVzeV9zdGF0cykgewor CQkJdmFsID0ga3RpbWVfdG9fbnMoaW50ZWxfZW5naW5lX2dldF9idXN5X3RpbWUoZW5naW5lKSk7 CiAJCX0gZWxzZSB7CiAJCQl2YWwgPSBlbmdpbmUtPnBtdS5zYW1wbGVbc2FtcGxlXS5jdXI7CiAJ CX0KQEAgLTM5OCw2ICs0MTIsMTIgQEAgc3RhdGljIHZvaWQgaTkxNV9wbXVfZXZlbnRfcmVhZChz dHJ1Y3QgcGVyZl9ldmVudCAqZXZlbnQpCiAJbG9jYWw2NF9hZGQobmV3IC0gcHJldiwgJmV2ZW50 LT5jb3VudCk7CiB9CiAKK3N0YXRpYyBib29sIGVuZ2luZV9uZWVkc19idXN5X3N0YXRzKHN0cnVj dCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3sKKwlyZXR1cm4gc3VwcG9ydHNfYnVzeV9zdGF0 cygpICYmCisJICAgICAgIChlbmdpbmUtPnBtdS5lbmFibGUgJiBCSVQoSTkxNV9TQU1QTEVfQlVT WSkpOworfQorCiBzdGF0aWMgdm9pZCBpOTE1X3BtdV9lbmFibGUoc3RydWN0IHBlcmZfZXZlbnQg KmV2ZW50KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1ID0KQEAgLTQzNyw3ICs0 NTcsMTQgQEAgc3RhdGljIHZvaWQgaTkxNV9wbXVfZW5hYmxlKHN0cnVjdCBwZXJmX2V2ZW50ICpl dmVudCkKIAogCQlHRU1fQlVHX09OKHNhbXBsZSA+PSBJOTE1X1BNVV9TQU1QTEVfQklUUyk7CiAJ CUdFTV9CVUdfT04oZW5naW5lLT5wbXUuZW5hYmxlX2NvdW50W3NhbXBsZV0gPT0gfjApOwotCQll bmdpbmUtPnBtdS5lbmFibGVfY291bnRbc2FtcGxlXSsrOworCQlpZiAoZW5naW5lLT5wbXUuZW5h YmxlX2NvdW50W3NhbXBsZV0rKyA9PSAwKSB7CisJCQlpZiAoZW5naW5lX25lZWRzX2J1c3lfc3Rh dHMoZW5naW5lKSAmJgorCQkJICAgICFlbmdpbmUtPnBtdS5idXN5X3N0YXRzKSB7CisJCQkJZW5n aW5lLT5wbXUuYnVzeV9zdGF0cyA9CisJCQkJCWludGVsX2VuYWJsZV9lbmdpbmVfc3RhdHMoZW5n aW5lKSA9PSAwOworCQkJCVdBUk5fT05fT05DRSghZW5naW5lLT5wbXUuYnVzeV9zdGF0cyk7CisJ CQl9CisJCX0KIAl9CiAKIAkvKgpAQCAtNDczLDggKzUwMCwxNCBAQCBzdGF0aWMgdm9pZCBpOTE1 X3BtdV9kaXNhYmxlKHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCkKIAkJICogRGVjcmVtZW50IHRo ZSByZWZlcmVuY2UgY291bnQgYW5kIGNsZWFyIHRoZSBlbmFibGVkCiAJCSAqIGJpdG1hc2sgd2hl biB0aGUgbGFzdCBsaXN0ZW5lciBvbiBhbiBldmVudCBnb2VzIGF3YXkuCiAJCSAqLwotCQlpZiAo LS1lbmdpbmUtPnBtdS5lbmFibGVfY291bnRbc2FtcGxlXSA9PSAwKQorCQlpZiAoLS1lbmdpbmUt PnBtdS5lbmFibGVfY291bnRbc2FtcGxlXSA9PSAwKSB7CiAJCQllbmdpbmUtPnBtdS5lbmFibGUg Jj0gfkJJVChzYW1wbGUpOworCQkJaWYgKCFlbmdpbmVfbmVlZHNfYnVzeV9zdGF0cyhlbmdpbmUp ICYmCisJCQkgICAgZW5naW5lLT5wbXUuYnVzeV9zdGF0cykgeworCQkJCWVuZ2luZS0+cG11LmJ1 c3lfc3RhdHMgPSBmYWxzZTsKKwkJCQlpbnRlbF9kaXNhYmxlX2VuZ2luZV9zdGF0cyhlbmdpbmUp OworCQkJfQorCQl9CiAJfQogCiAJR0VNX0JVR19PTihiaXQgPj0gSTkxNV9QTVVfTUFTS19CSVRT KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCA4NTA2MjA2OTk0 NjguLmI3ZjBjZDQ0OTgyNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIu aApAQCAtMzU4LDYgKzM1OCwxMSBAQCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzIHsKIAkJICogT3Vy IGludGVybmFsIHRpbWVyIHN0b3JlcyB0aGUgY3VycmVudCBjb3VudGVycyBpbiB0aGlzIGZpZWxk LgogCQkgKi8KIAkJc3RydWN0IGk5MTVfcG11X3NhbXBsZSBzYW1wbGVbSTkxNV9FTkdJTkVfU0FN UExFX01BWF07CisJCS8qKgorCQkgKiBAYnVzeV9zdGF0czogSGFzIGVuYWJsZW1lbnQgb2YgZW5n aW5lIHN0YXRzIHRyYWNraW5nIGJlZW4KKwkJICogCQlyZXF1ZXN0ZWQuCisJCSAqLworCQlib29s IGJ1c3lfc3RhdHM7CiAJfSBwbXU7CiAKIAkvKgotLSAKMi45LjUKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=