From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [RFC 09/11] drm/i915/pmu: Wire up engine busy stats to PMU Date: Mon, 11 Sep 2017 16:25:57 +0100 Message-ID: <20170911152559.7077-10-tvrtko.ursulin@linux.intel.com> References: <20170911152559.7077-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-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id E9BA36E430 for ; Mon, 11 Sep 2017 15:26:16 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id x17so7137710wmd.5 for ; Mon, 11 Sep 2017 08:26:16 -0700 (PDT) In-Reply-To: <20170911152559.7077-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 Cc: Peter Zijlstra List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCldlIGNhbiB1 c2UgZW5naW5lIGJ1c3kgc3RhdHMgaW5zdGVhZCBvZiB0aGUgTU1JTyBzYW1wbGluZyB0aW1lcgpm b3IgYmV0dGVyIGVmZmljaWVuY3kuCgpBcyBtaW5pbXVtIHRoaXMgc2F2ZXMgcGVyaW9kICogbnVt X2VuZ2luZXMgLyBzZWMgbW1pbyByZWFkcywKYW5kIGluIGEgYmV0dGVyIGNhc2UsIHdoZW4gb25s eSBlbmdpbmUgYnVzeSBzYW1wbGVycyBhcmUgYWN0aXZlLAppdCBlbmFibGVzIHVzIHRvIG5vdCBr aWNrIG9mZiB0aGUgc2FtcGxpbmcgdGltZXIgYXQgYWxsLgoKdjI6IFJlYmFzZS4KdjM6CiAqIFJl YmFzZSwgY29tbWVudHMuCiAqIExlYXZlIGVuZ2luZSBidXN5bmVzcyBjb250cm9scyBvdXQgb2Yg d29ya2Vycy4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBp bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUuYyAgICAgICAgIHwg MzYgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9yaW5nYnVmZmVyLmggfCAgNCArKysrCiAyIGZpbGVzIGNoYW5nZWQsIDM3IGluc2Vy dGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9wbXUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcG11LmMKaW5kZXggMjZl NzM1ZjI3MjgyLi5mOGE2MTk1YzE3ZjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfcG11LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUuYwpAQCAtOTAs NiArOTAsMTEgQEAgc3RhdGljIHVuc2lnbmVkIGludCBldmVudF9lbmFibGVkX2JpdChzdHJ1Y3Qg cGVyZl9ldmVudCAqZXZlbnQpCiAJcmV0dXJuIGNvbmZpZ19lbmFibGVkX2JpdChldmVudC0+YXR0 ci5jb25maWcpOwogfQogCitzdGF0aWMgYm9vbCBzdXBwb3J0c19idXN5X3N0YXRzKHZvaWQpCit7 CisJcmV0dXJuIGk5MTUuZW5hYmxlX2V4ZWNsaXN0czsKK30KKwogc3RhdGljIGJvb2wgcG11X25l ZWRzX3RpbWVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LCBib29sIGdwdV9hY3RpdmUp CiB7CiAJdTY0IGVuYWJsZSA9IGk5MTUtPnBtdS5lbmFibGU7CkBAIC0xMDAsNiArMTA1LDggQEAg c3RhdGljIGJvb2wgcG11X25lZWRzX3RpbWVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1 LCBib29sIGdwdV9hY3RpdmUpCiAKIAlpZiAoIWdwdV9hY3RpdmUpCiAJCWVuYWJsZSAmPSB+RU5H SU5FX1NBTVBMRV9NQVNLOworCWVsc2UgaWYgKHN1cHBvcnRzX2J1c3lfc3RhdHMoKSkKKwkJZW5h YmxlICY9IH5CSVQoSTkxNV9TQU1QTEVfQlVTWSk7CiAKIAlyZXR1cm4gZW5hYmxlOwogfQpAQCAt MTYzLDcgKzE3MCw4IEBAIHN0YXRpYyB2b2lkIGVuZ2luZXNfc2FtcGxlKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIAkJaWYgKGVuYWJsZSAmIEJJVChJOTE1X1NBTVBMRV9RVUVV RUQpKQogCQkJZW5naW5lLT5wbXUuc2FtcGxlW0k5MTVfU0FNUExFX1FVRVVFRF0gKz0gUEVSSU9E OwogCi0JCWlmIChlbmFibGUgJiBCSVQoSTkxNV9TQU1QTEVfQlVTWSkpIHsKKwkJaWYgKChlbmFi bGUgJiBCSVQoSTkxNV9TQU1QTEVfQlVTWSkpICYmCisJCSAgICAhZW5naW5lLT5wbXUuYnVzeV9z dGF0cykgewogCQkJdTMyIHZhbDsKIAogCQkJZncgPSBncmFiX2ZvcmNld2FrZShkZXZfcHJpdiwg ZncpOwpAQCAtMzQyLDYgKzM1MCw5IEBAIHN0YXRpYyB1NjQgX19pOTE1X3BtdV9ldmVudF9yZWFk KHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCkKIAogCQlpZiAoV0FSTl9PTl9PTkNFKCFlbmdpbmUp KSB7CiAJCQkvKiBEbyBub3RoaW5nICovCisJCX0gZWxzZSBpZiAoc2FtcGxlID09IEk5MTVfU0FN UExFX0JVU1kgJiYKKwkJCSAgIGVuZ2luZS0+cG11LmJ1c3lfc3RhdHMpIHsKKwkJCXZhbCA9IGt0 aW1lX3RvX25zKGludGVsX2VuZ2luZV9nZXRfYnVzeV90aW1lKGVuZ2luZSkpOwogCQl9IGVsc2Ug ewogCQkJdmFsID0gZW5naW5lLT5wbXUuc2FtcGxlW3NhbXBsZV07CiAJCX0KQEAgLTM4NSw2ICsz OTYsMTIgQEAgc3RhdGljIHZvaWQgaTkxNV9wbXVfZXZlbnRfcmVhZChzdHJ1Y3QgcGVyZl9ldmVu dCAqZXZlbnQpCiAJCSAgICBsb2NhbDY0X3JlYWQoJmV2ZW50LT5ody5wcmV2X2NvdW50KSk7CiB9 CiAKK3N0YXRpYyBib29sIGVuZ2luZV9uZWVkc19idXN5X3N0YXRzKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKmVuZ2luZSkKK3sKKwlyZXR1cm4gc3VwcG9ydHNfYnVzeV9zdGF0cygpICYmCisJICAg ICAgIChlbmdpbmUtPnBtdS5lbmFibGUgJiBCSVQoSTkxNV9TQU1QTEVfQlVTWSkpOworfQorCiBz dGF0aWMgdm9pZCBpOTE1X3BtdV9lbmFibGUoc3RydWN0IHBlcmZfZXZlbnQgKmV2ZW50KQogewog CXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1ID0KQEAgLTQyOSw3ICs0NDYsMTQgQEAgc3Rh dGljIHZvaWQgaTkxNV9wbXVfZW5hYmxlKHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCkKIAogCQlH RU1fQlVHX09OKHNhbXBsZSA+PSBJOTE1X1BNVV9TQU1QTEVfQklUUyk7CiAJCUdFTV9CVUdfT04o ZW5naW5lLT5wbXUuZW5hYmxlX2NvdW50W3NhbXBsZV0gPT0gfjApOwotCQllbmdpbmUtPnBtdS5l bmFibGVfY291bnRbc2FtcGxlXSsrOworCQlpZiAoZW5naW5lLT5wbXUuZW5hYmxlX2NvdW50W3Nh bXBsZV0rKyA9PSAwKSB7CisJCQlpZiAoZW5naW5lX25lZWRzX2J1c3lfc3RhdHMoZW5naW5lKSAm JgorCQkJICAgICFlbmdpbmUtPnBtdS5idXN5X3N0YXRzKSB7CisJCQkJZW5naW5lLT5wbXUuYnVz eV9zdGF0cyA9CisJCQkJCWludGVsX2VuYWJsZV9lbmdpbmVfc3RhdHMoZW5naW5lKSA9PSAwOwor CQkJCVdBUk5fT05fT05DRSghZW5naW5lLT5wbXUuYnVzeV9zdGF0cyk7CisJCQl9CisJCX0KIAl9 CiAKIAkvKgpAQCAtNDY1LDggKzQ4OSwxNCBAQCBzdGF0aWMgdm9pZCBpOTE1X3BtdV9kaXNhYmxl KHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCkKIAkJICogRGVjcmVtZW50IHRoZSByZWZlcmVuY2Ug Y291bnQgYW5kIGNsZWFyIHRoZSBlbmFibGVkCiAJCSAqIGJpdG1hc2sgd2hlbiB0aGUgbGFzdCBs aXN0ZW5lciBvbiBhbiBldmVudCBnb2VzIGF3YXkuCiAJCSAqLwotCQlpZiAoLS1lbmdpbmUtPnBt dS5lbmFibGVfY291bnRbc2FtcGxlXSA9PSAwKQorCQlpZiAoLS1lbmdpbmUtPnBtdS5lbmFibGVf Y291bnRbc2FtcGxlXSA9PSAwKSB7CiAJCQllbmdpbmUtPnBtdS5lbmFibGUgJj0gfkJJVChzYW1w bGUpOworCQkJaWYgKCFlbmdpbmVfbmVlZHNfYnVzeV9zdGF0cyhlbmdpbmUpICYmCisJCQkgICAg ZW5naW5lLT5wbXUuYnVzeV9zdGF0cykgeworCQkJCWVuZ2luZS0+cG11LmJ1c3lfc3RhdHMgPSBm YWxzZTsKKwkJCQlpbnRlbF9kaXNhYmxlX2VuZ2luZV9zdGF0cyhlbmdpbmUpOworCQkJfQorCQl9 CiAJfQogCiAJR0VNX0JVR19PTihiaXQgPj0gSTkxNV9QTVVfTUFTS19CSVRTKTsKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCBmNjE4YzVmOThlZGYuLmZlNTU0ZmM3 Njg2NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAtMjY1LDYg KzI2NSwxMCBAQCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzIHsKIAkJICogT3VyIGludGVybmFsIHRp bWVyIHN0b3JlcyB0aGUgY3VycmVudCBjb3VudGVyIGluIHRoaXMgZmllbGQuCiAJCSAqLwogCQl1 NjQgc2FtcGxlW0k5MTVfRU5HSU5FX1NBTVBMRV9NQVhdOworCQkvKioKKwkJICogQGJ1c3lfc3Rh dHM6IEhhcyBlbmFibGVtZW50IG9mIGVuZ2luZSBzdGF0cyB0cmFja2luZyBiZWVuIHJlcXVlc3Rl ZC4KKwkJICovCisJCWJvb2wgYnVzeV9zdGF0czsKIAl9IHBtdTsKIAogCS8qCi0tIAoyLjkuNQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==