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, 18 Sep 2017 12:38:13 +0100 Message-ID: <20170918113814.2591-8-tvrtko.ursulin@linux.intel.com> References: <20170918113814.2591-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 A7DA56E34C for ; Mon, 18 Sep 2017 11:38:28 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id x17so592597wmd.5 for ; Mon, 18 Sep 2017 04:38:28 -0700 (PDT) In-Reply-To: <20170918113814.2591-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 X25lZWRzX3RpbWVyIGNoYW5nZS4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0 a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUu YyAgICAgICAgIHwgNDAgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggfCAgNSArKysrKwogMiBmaWxlcyBjaGFu Z2VkLCA0MiBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfcG11LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Bt dS5jCmluZGV4IGI3ZGU2ZmUzY2FjNy4uZmZiYTIxZWViNWQwIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X3BtdS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf cG11LmMKQEAgLTkwLDYgKzkwLDExIEBAIHN0YXRpYyB1bnNpZ25lZCBpbnQgZXZlbnRfZW5hYmxl ZF9iaXQoc3RydWN0IHBlcmZfZXZlbnQgKmV2ZW50KQogCXJldHVybiBjb25maWdfZW5hYmxlZF9i aXQoZXZlbnQtPmF0dHIuY29uZmlnKTsKIH0KIAorc3RhdGljIGJvb2wgc3VwcG9ydHNfYnVzeV9z dGF0cyh2b2lkKQoreworCXJldHVybiBpOTE1LmVuYWJsZV9leGVjbGlzdHM7Cit9CisKIHN0YXRp YyBib29sIHBtdV9uZWVkc190aW1lcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwgYm9v bCBncHVfYWN0aXZlKQogewogCXU2NCBlbmFibGU7CkBAIC0xMTUsNiArMTIwLDEyIEBAIHN0YXRp YyBib29sIHBtdV9uZWVkc190aW1lcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwgYm9v bCBncHVfYWN0aXZlKQogCSAqLwogCWlmICghZ3B1X2FjdGl2ZSkKIAkJZW5hYmxlICY9IH5FTkdJ TkVfU0FNUExFX01BU0s7CisJLyoqCisJICogQWxzbyB0aGVyZSBpcyBzb2Z0d2FyZSBidXN5bmVz cyB0cmFja2luZyBhdmFpbGFibGUgd2UgZG8gbm90CisJICogbmVlZCB0aGUgdGltZXIgZm9yIEk5 MTVfU0FNUExFX0JVU1kgY291bnRlci4KKwkgKi8KKwllbHNlIGlmIChzdXBwb3J0c19idXN5X3N0 YXRzKCkpCisJCWVuYWJsZSAmPSB+QklUKEk5MTVfU0FNUExFX0JVU1kpOwogCiAJLyoqCiAJICog SWYgc29tZSBiaXRzIHJlbWFpbiBpdCBtZWFucyB3ZSBuZWVkIHRoZSBzYW1wbGluZyB0aW1lciBy dW5uaW5nLgpAQCAtMTkyLDcgKzIwMyw4IEBAIHN0YXRpYyB2b2lkIGVuZ2luZXNfc2FtcGxlKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJaWYgKGVuYWJsZSAmIEJJVChJOTE1 X1NBTVBMRV9RVUVVRUQpKQogCQkJZW5naW5lLT5wbXUuc2FtcGxlW0k5MTVfU0FNUExFX1FVRVVF RF0gKz0gUEVSSU9EOwogCi0JCWlmIChlbmFibGUgJiBCSVQoSTkxNV9TQU1QTEVfQlVTWSkpIHsK KwkJaWYgKChlbmFibGUgJiBCSVQoSTkxNV9TQU1QTEVfQlVTWSkpICYmCisJCSAgICAhZW5naW5l LT5wbXUuYnVzeV9zdGF0cykgewogCQkJdTMyIHZhbDsKIAogCQkJZncgPSBncmFiX2ZvcmNld2Fr ZShkZXZfcHJpdiwgZncpOwpAQCAtMzg1LDYgKzM5Nyw5IEBAIHN0YXRpYyB1NjQgX19pOTE1X3Bt dV9ldmVudF9yZWFkKHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCkKIAogCQlpZiAoV0FSTl9PTl9P TkNFKCFlbmdpbmUpKSB7CiAJCQkvKiBEbyBub3RoaW5nICovCisJCX0gZWxzZSBpZiAoc2FtcGxl ID09IEk5MTVfU0FNUExFX0JVU1kgJiYKKwkJCSAgIGVuZ2luZS0+cG11LmJ1c3lfc3RhdHMpIHsK KwkJCXZhbCA9IGt0aW1lX3RvX25zKGludGVsX2VuZ2luZV9nZXRfYnVzeV90aW1lKGVuZ2luZSkp OwogCQl9IGVsc2UgewogCQkJdmFsID0gZW5naW5lLT5wbXUuc2FtcGxlW3NhbXBsZV07CiAJCX0K QEAgLTQzOCw2ICs0NTMsMTIgQEAgc3RhdGljIHZvaWQgaTkxNV9wbXVfZXZlbnRfcmVhZChzdHJ1 Y3QgcGVyZl9ldmVudCAqZXZlbnQpCiAJbG9jYWw2NF9hZGQobmV3IC0gcHJldiwgJmV2ZW50LT5j b3VudCk7CiB9CiAKK3N0YXRpYyBib29sIGVuZ2luZV9uZWVkc19idXN5X3N0YXRzKHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKK3sKKwlyZXR1cm4gc3VwcG9ydHNfYnVzeV9zdGF0cygp ICYmCisJICAgICAgIChlbmdpbmUtPnBtdS5lbmFibGUgJiBCSVQoSTkxNV9TQU1QTEVfQlVTWSkp OworfQorCiBzdGF0aWMgdm9pZCBpOTE1X3BtdV9lbmFibGUoc3RydWN0IHBlcmZfZXZlbnQgKmV2 ZW50KQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1ID0KQEAgLTQ3Nyw3ICs0OTgs MTQgQEAgc3RhdGljIHZvaWQgaTkxNV9wbXVfZW5hYmxlKHN0cnVjdCBwZXJmX2V2ZW50ICpldmVu dCkKIAogCQlHRU1fQlVHX09OKHNhbXBsZSA+PSBJOTE1X1BNVV9TQU1QTEVfQklUUyk7CiAJCUdF TV9CVUdfT04oZW5naW5lLT5wbXUuZW5hYmxlX2NvdW50W3NhbXBsZV0gPT0gfjApOwotCQllbmdp bmUtPnBtdS5lbmFibGVfY291bnRbc2FtcGxlXSsrOworCQlpZiAoZW5naW5lLT5wbXUuZW5hYmxl X2NvdW50W3NhbXBsZV0rKyA9PSAwKSB7CisJCQlpZiAoZW5naW5lX25lZWRzX2J1c3lfc3RhdHMo ZW5naW5lKSAmJgorCQkJICAgICFlbmdpbmUtPnBtdS5idXN5X3N0YXRzKSB7CisJCQkJZW5naW5l LT5wbXUuYnVzeV9zdGF0cyA9CisJCQkJCWludGVsX2VuYWJsZV9lbmdpbmVfc3RhdHMoZW5naW5l KSA9PSAwOworCQkJCVdBUk5fT05fT05DRSghZW5naW5lLT5wbXUuYnVzeV9zdGF0cyk7CisJCQl9 CisJCX0KIAl9CiAKIAkvKgpAQCAtNTEzLDggKzU0MSwxNCBAQCBzdGF0aWMgdm9pZCBpOTE1X3Bt dV9kaXNhYmxlKHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCkKIAkJICogRGVjcmVtZW50IHRoZSBy ZWZlcmVuY2UgY291bnQgYW5kIGNsZWFyIHRoZSBlbmFibGVkCiAJCSAqIGJpdG1hc2sgd2hlbiB0 aGUgbGFzdCBsaXN0ZW5lciBvbiBhbiBldmVudCBnb2VzIGF3YXkuCiAJCSAqLwotCQlpZiAoLS1l bmdpbmUtPnBtdS5lbmFibGVfY291bnRbc2FtcGxlXSA9PSAwKQorCQlpZiAoLS1lbmdpbmUtPnBt dS5lbmFibGVfY291bnRbc2FtcGxlXSA9PSAwKSB7CiAJCQllbmdpbmUtPnBtdS5lbmFibGUgJj0g fkJJVChzYW1wbGUpOworCQkJaWYgKCFlbmdpbmVfbmVlZHNfYnVzeV9zdGF0cyhlbmdpbmUpICYm CisJCQkgICAgZW5naW5lLT5wbXUuYnVzeV9zdGF0cykgeworCQkJCWVuZ2luZS0+cG11LmJ1c3lf c3RhdHMgPSBmYWxzZTsKKwkJCQlpbnRlbF9kaXNhYmxlX2VuZ2luZV9zdGF0cyhlbmdpbmUpOwor CQkJfQorCQl9CiAJfQogCiAJR0VNX0JVR19PTihiaXQgPj0gSTkxNV9QTVVfTUFTS19CSVRTKTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCBhZTBhNGM0OThhMGYu LmNiNThjZTM0YWIxMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmlu Z2J1ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApA QCAtMjY1LDYgKzI2NSwxMSBAQCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzIHsKIAkJICogT3VyIGlu dGVybmFsIHRpbWVyIHN0b3JlcyB0aGUgY3VycmVudCBjb3VudGVyIGluIHRoaXMgZmllbGQuCiAJ CSAqLwogCQl1NjQgc2FtcGxlW0k5MTVfRU5HSU5FX1NBTVBMRV9NQVhdOworCQkvKioKKwkJICog QGJ1c3lfc3RhdHM6IEhhcyBlbmFibGVtZW50IG9mIGVuZ2luZSBzdGF0cyB0cmFja2luZyBiZWVu CisJCSAqIAkJcmVxdWVzdGVkLgorCQkgKi8KKwkJYm9vbCBidXN5X3N0YXRzOwogCX0gcG11Owog CiAJLyoKLS0gCjIuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK