From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 7/8] drm/i915/pmu: Wire up engine busy stats to PMU Date: Mon, 25 Sep 2017 16:15:42 +0100 Message-ID: <20170925151543.7395-8-tvrtko.ursulin@linux.intel.com> References: <20170925151543.7395-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-wr0-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id E45B36E347 for ; Mon, 25 Sep 2017 15:16:00 +0000 (UTC) Received: by mail-wr0-x244.google.com with SMTP id b9so38342wra.0 for ; Mon, 25 Sep 2017 08:16:00 -0700 (PDT) In-Reply-To: <20170925151543.7395-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 c2UgZW5naW5lIGJ1c3kgc3RhdHMgaW5zdGVhZCBvZiB0aGUgTU1JTyBzYW1wbGluZyB0aW1lcgpm b3IgYmV0dGVyIGVmZmljaWVuY3kuCgpBcyBtaW5pbXVtIHRoaXMgc2F2ZXMgcGVyaW9kICogbnVt X2VuZ2luZXMgLyBzZWMgbW1pbyByZWFkcywKYW5kIGluIGEgYmV0dGVyIGNhc2UsIHdoZW4gb25s eSBlbmdpbmUgYnVzeSBzYW1wbGVycyBhcmUgYWN0aXZlLAppdCBlbmFibGVzIHVzIHRvIG5vdCBr aWNrIG9mZiB0aGUgc2FtcGxpbmcgdGltZXIgYXQgYWxsLgoKdjI6IFJlYmFzZS4KdjM6CiAqIFJl YmFzZSwgY29tbWVudHMuCiAqIExlYXZlIGVuZ2luZSBidXN5bmVzcyBjb250cm9scyBvdXQgb2Yg d29ya2Vycy4KdjQ6IENoZWNrcGF0Y2ggY2xlYW51cC4KdjU6IEFkZGVkIGNvbW1lbnQgdG8gcG11 X25lZWRzX3RpbWVyIGNoYW5nZS4KdjY6CiAqIFJlYmFzZS4KICogRml4IHN0eWxlIG9mIHNvbWUg Y29tbWVudHMuIChDaHJpcyBXaWxzb24pCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8 dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf cG11LmMgICAgICAgICB8IDQwICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIHwgIDUgKysrKysKIDIgZmlsZXMg Y2hhbmdlZCwgNDIgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BtdS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9wbXUuYwppbmRleCAxM2MxZjU4ODc2NjcuLjIyOGFhNTBjZTcwOSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3BtdS5jCkBAIC05MCw2ICs5MCwxMSBAQCBzdGF0aWMgdW5zaWduZWQgaW50IGV2ZW50X2Vu YWJsZWRfYml0KHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCkKIAlyZXR1cm4gY29uZmlnX2VuYWJs ZWRfYml0KGV2ZW50LT5hdHRyLmNvbmZpZyk7CiB9CiAKK3N0YXRpYyBib29sIHN1cHBvcnRzX2J1 c3lfc3RhdHModm9pZCkKK3sKKwlyZXR1cm4gaTkxNV9tb2RwYXJhbXMuZW5hYmxlX2V4ZWNsaXN0 czsKK30KKwogc3RhdGljIGJvb2wgcG11X25lZWRzX3RpbWVyKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICppOTE1LCBib29sIGdwdV9hY3RpdmUpCiB7CiAJdTY0IGVuYWJsZTsKQEAgLTExNSw2ICsx MjAsMTIgQEAgc3RhdGljIGJvb2wgcG11X25lZWRzX3RpbWVyKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICppOTE1LCBib29sIGdwdV9hY3RpdmUpCiAJICovCiAJaWYgKCFncHVfYWN0aXZlKQogCQll bmFibGUgJj0gfkVOR0lORV9TQU1QTEVfTUFTSzsKKwkvKgorCSAqIEFsc28gdGhlcmUgaXMgc29m dHdhcmUgYnVzeW5lc3MgdHJhY2tpbmcgYXZhaWxhYmxlIHdlIGRvIG5vdAorCSAqIG5lZWQgdGhl IHRpbWVyIGZvciBJOTE1X1NBTVBMRV9CVVNZIGNvdW50ZXIuCisJICovCisJZWxzZSBpZiAoc3Vw cG9ydHNfYnVzeV9zdGF0cygpKQorCQllbmFibGUgJj0gfkJJVChJOTE1X1NBTVBMRV9CVVNZKTsK IAogCS8qCiAJICogSWYgc29tZSBiaXRzIHJlbWFpbiBpdCBtZWFucyB3ZSBuZWVkIHRoZSBzYW1w bGluZyB0aW1lciBydW5uaW5nLgpAQCAtMTk0LDcgKzIwNSw4IEBAIHN0YXRpYyB2b2lkIGVuZ2lu ZXNfc2FtcGxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJICAgIChsYXN0 X3NlcW5vIC0gMSA+IGN1cnJlbnRfc2Vxbm8pKQogCQkJZW5naW5lLT5wbXUuc2FtcGxlW0k5MTVf U0FNUExFX1FVRVVFRF0gKz0gUEVSSU9EOwogCi0JCWlmIChlbmFibGUgJiBCSVQoSTkxNV9TQU1Q TEVfQlVTWSkpIHsKKwkJaWYgKChlbmFibGUgJiBCSVQoSTkxNV9TQU1QTEVfQlVTWSkpICYmCisJ CSAgICAhZW5naW5lLT5wbXUuYnVzeV9zdGF0cykgewogCQkJdTMyIHZhbDsKIAogCQkJZncgPSBn cmFiX2ZvcmNld2FrZShkZXZfcHJpdiwgZncpOwpAQCAtMzg3LDYgKzM5OSw5IEBAIHN0YXRpYyB1 NjQgX19pOTE1X3BtdV9ldmVudF9yZWFkKHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCkKIAogCQlp ZiAoV0FSTl9PTl9PTkNFKCFlbmdpbmUpKSB7CiAJCQkvKiBEbyBub3RoaW5nICovCisJCX0gZWxz ZSBpZiAoc2FtcGxlID09IEk5MTVfU0FNUExFX0JVU1kgJiYKKwkJCSAgIGVuZ2luZS0+cG11LmJ1 c3lfc3RhdHMpIHsKKwkJCXZhbCA9IGt0aW1lX3RvX25zKGludGVsX2VuZ2luZV9nZXRfYnVzeV90 aW1lKGVuZ2luZSkpOwogCQl9IGVsc2UgewogCQkJdmFsID0gZW5naW5lLT5wbXUuc2FtcGxlW3Nh bXBsZV07CiAJCX0KQEAgLTQ0MCw2ICs0NTUsMTIgQEAgc3RhdGljIHZvaWQgaTkxNV9wbXVfZXZl bnRfcmVhZChzdHJ1Y3QgcGVyZl9ldmVudCAqZXZlbnQpCiAJbG9jYWw2NF9hZGQobmV3IC0gcHJl diwgJmV2ZW50LT5jb3VudCk7CiB9CiAKK3N0YXRpYyBib29sIGVuZ2luZV9uZWVkc19idXN5X3N0 YXRzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3sKKwlyZXR1cm4gc3VwcG9ydHNf YnVzeV9zdGF0cygpICYmCisJICAgICAgIChlbmdpbmUtPnBtdS5lbmFibGUgJiBCSVQoSTkxNV9T QU1QTEVfQlVTWSkpOworfQorCiBzdGF0aWMgdm9pZCBpOTE1X3BtdV9lbmFibGUoc3RydWN0IHBl cmZfZXZlbnQgKmV2ZW50KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1ID0KQEAg LTQ3OSw3ICs1MDAsMTQgQEAgc3RhdGljIHZvaWQgaTkxNV9wbXVfZW5hYmxlKHN0cnVjdCBwZXJm X2V2ZW50ICpldmVudCkKIAogCQlHRU1fQlVHX09OKHNhbXBsZSA+PSBJOTE1X1BNVV9TQU1QTEVf QklUUyk7CiAJCUdFTV9CVUdfT04oZW5naW5lLT5wbXUuZW5hYmxlX2NvdW50W3NhbXBsZV0gPT0g fjApOwotCQllbmdpbmUtPnBtdS5lbmFibGVfY291bnRbc2FtcGxlXSsrOworCQlpZiAoZW5naW5l LT5wbXUuZW5hYmxlX2NvdW50W3NhbXBsZV0rKyA9PSAwKSB7CisJCQlpZiAoZW5naW5lX25lZWRz X2J1c3lfc3RhdHMoZW5naW5lKSAmJgorCQkJICAgICFlbmdpbmUtPnBtdS5idXN5X3N0YXRzKSB7 CisJCQkJZW5naW5lLT5wbXUuYnVzeV9zdGF0cyA9CisJCQkJCWludGVsX2VuYWJsZV9lbmdpbmVf c3RhdHMoZW5naW5lKSA9PSAwOworCQkJCVdBUk5fT05fT05DRSghZW5naW5lLT5wbXUuYnVzeV9z dGF0cyk7CisJCQl9CisJCX0KIAl9CiAKIAkvKgpAQCAtNTE1LDggKzU0MywxNCBAQCBzdGF0aWMg dm9pZCBpOTE1X3BtdV9kaXNhYmxlKHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCkKIAkJICogRGVj cmVtZW50IHRoZSByZWZlcmVuY2UgY291bnQgYW5kIGNsZWFyIHRoZSBlbmFibGVkCiAJCSAqIGJp dG1hc2sgd2hlbiB0aGUgbGFzdCBsaXN0ZW5lciBvbiBhbiBldmVudCBnb2VzIGF3YXkuCiAJCSAq LwotCQlpZiAoLS1lbmdpbmUtPnBtdS5lbmFibGVfY291bnRbc2FtcGxlXSA9PSAwKQorCQlpZiAo LS1lbmdpbmUtPnBtdS5lbmFibGVfY291bnRbc2FtcGxlXSA9PSAwKSB7CiAJCQllbmdpbmUtPnBt dS5lbmFibGUgJj0gfkJJVChzYW1wbGUpOworCQkJaWYgKCFlbmdpbmVfbmVlZHNfYnVzeV9zdGF0 cyhlbmdpbmUpICYmCisJCQkgICAgZW5naW5lLT5wbXUuYnVzeV9zdGF0cykgeworCQkJCWVuZ2lu ZS0+cG11LmJ1c3lfc3RhdHMgPSBmYWxzZTsKKwkJCQlpbnRlbF9kaXNhYmxlX2VuZ2luZV9zdGF0 cyhlbmdpbmUpOworCQkJfQorCQl9CiAJfQogCiAJR0VNX0JVR19PTihiaXQgPj0gSTkxNV9QTVVf TUFTS19CSVRTKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jpbmdi dWZmZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCA4 ZGIyMjhlYmRiMjguLmVmNjM4Yjk3ZTQ2YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcmluZ2J1ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuaApAQCAtMzUwLDYgKzM1MCwxMSBAQCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzIHsK IAkJICogT3VyIGludGVybmFsIHRpbWVyIHN0b3JlcyB0aGUgY3VycmVudCBjb3VudGVyIGluIHRo aXMgZmllbGQuCiAJCSAqLwogCQl1NjQgc2FtcGxlW0k5MTVfRU5HSU5FX1NBTVBMRV9NQVhdOwor CQkvKioKKwkJICogQGJ1c3lfc3RhdHM6IEhhcyBlbmFibGVtZW50IG9mIGVuZ2luZSBzdGF0cyB0 cmFja2luZyBiZWVuCisJCSAqIAkJcmVxdWVzdGVkLgorCQkgKi8KKwkJYm9vbCBidXN5X3N0YXRz OwogCX0gcG11OwogCiAJLyoKLS0gCjIuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK