From: Tvrtko Ursulin Subject: [PATCH i-g-t] intel/pmu: Catch-up with i915 RC6 aggregation changes Date: Fri, 24 Nov 2017 17:16:18 +0000 Message-ID: <20171124171618.18094-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-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 24E136E9BA for ; Fri, 24 Nov 2017 17:16:29 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id x63so23821404wmf.4 for ; Fri, 24 Nov 2017 09:16:29 -0800 (PST) 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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNpbmNlIGk5 MTUgUE1VIGlzIHJlbW92aW5nIHNlcGFyYXRlIFJDNiBjb3VudGVycyBhbmQgbm93IGFnZ3JlZ2F0 ZXMgYWxsCnVuZGVyIGEgc2luZ2xlIG9uZSwgY2F0Y2ggdXAgdGhlIHRlc3QgYW5kIGludGVsLWdw dS1vdmVybGF5IHdpdGggdGhvc2UKY2hhbmdlcy4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1 bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogbGliL2lndF9wZXJmLmggICB8ICA0 ICstLS0KIG92ZXJsYXkvcmM2LmMgICAgfCA0NSArKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0KIHRlc3RzL3BlcmZfcG11LmMgfCA1MyAtLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCA4 IGluc2VydGlvbnMoKyksIDk0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpYi9pZ3RfcGVy Zi5oIGIvbGliL2lndF9wZXJmLmgKaW5kZXggNTQyOGZlYjBjNzQ2Li43YjY2ZmM1ODJiODggMTAw NjQ0Ci0tLSBhL2xpYi9pZ3RfcGVyZi5oCisrKyBiL2xpYi9pZ3RfcGVyZi5oCkBAIC02NCwxMCAr NjQsOCBAQCBlbnVtIGRybV9pOTE1X3BtdV9lbmdpbmVfc2FtcGxlIHsKICNkZWZpbmUgSTkxNV9Q TVVfUkVRVUVTVEVEX0ZSRVFVRU5DWQlfX0k5MTVfUE1VX09USEVSKDEpCiAjZGVmaW5lIEk5MTVf UE1VX0lOVEVSUlVQVFMJCV9fSTkxNV9QTVVfT1RIRVIoMikKICNkZWZpbmUgSTkxNV9QTVVfUkM2 X1JFU0lERU5DWQkJX19JOTE1X1BNVV9PVEhFUigzKQotI2RlZmluZSBJOTE1X1BNVV9SQzZwX1JF U0lERU5DWQkJX19JOTE1X1BNVV9PVEhFUig0KQotI2RlZmluZSBJOTE1X1BNVV9SQzZwcF9SRVNJ REVOQ1kJX19JOTE1X1BNVV9PVEhFUig1KQogCi0jZGVmaW5lIEk5MTVfUE1VX0xBU1QgSTkxNV9Q TVVfUkM2cHBfUkVTSURFTkNZCisjZGVmaW5lIEk5MTVfUE1VX0xBU1QgSTkxNV9QTVVfUkM2X1JF U0lERU5DWQogCiBzdGF0aWMgaW5saW5lIGludAogcGVyZl9ldmVudF9vcGVuKHN0cnVjdCBwZXJm X2V2ZW50X2F0dHIgKmF0dHIsCmRpZmYgLS1naXQgYS9vdmVybGF5L3JjNi5jIGIvb3ZlcmxheS9y YzYuYwppbmRleCA4OTc3ZjA5OTMwOTUuLmI1Mjg2ZjBjZjhjNiAxMDA2NDQKLS0tIGEvb3Zlcmxh eS9yYzYuYworKysgYi9vdmVybGF5L3JjNi5jCkBAIC0zNSwzNCArMzUsMTIgQEAKIAogI2luY2x1 ZGUgInJjNi5oIgogCi0jZGVmaW5lIFJDNgkoMTw8MCkKLSNkZWZpbmUgUkM2cAkoMTw8MSkKLSNk ZWZpbmUgUkM2cHAJKDE8PDIpCi0KLXN0YXRpYyBpbnQgcGVyZl9vcGVuKHVuc2lnbmVkICpmbGFn cykKLXsKLQlpbnQgZmQ7Ci0KLQlmZCA9IHBlcmZfaTkxNV9vcGVuX2dyb3VwKEk5MTVfUE1VX1JD Nl9SRVNJREVOQ1ksIC0xKTsKLQlpZiAoZmQgPCAwKQotCQlyZXR1cm4gLTE7Ci0KLQkqZmxhZ3Mg fD0gUkM2OwotCWlmIChwZXJmX2k5MTVfb3Blbl9ncm91cChJOTE1X1BNVV9SQzZwX1JFU0lERU5D WSwgZmQpID49IDApCi0JCSpmbGFncyB8PSBSQzZwOwotCi0JaWYgKHBlcmZfaTkxNV9vcGVuX2dy b3VwKEk5MTVfUE1VX1JDNnBwX1JFU0lERU5DWSwgZmQpID49IDApCi0JCSpmbGFncyB8PSBSQzZw cDsKLQotCXJldHVybiBmZDsKLX0KLQogaW50IHJjNl9pbml0KHN0cnVjdCByYzYgKnJjNikKIHsK IAltZW1zZXQocmM2LCAwLCBzaXplb2YoKnJjNikpOwogCi0JcmM2LT5mZCA9IHBlcmZfb3Blbigm cmM2LT5mbGFncyk7Ci0JaWYgKHJjNi0+ZmQgPT0gLTEpIHsKKwlyYzYtPmZkID0gcGVyZl9pOTE1 X29wZW4oSTkxNV9QTVVfUkM2X1JFU0lERU5DWSk7CisJaWYgKHJjNi0+ZmQgPCAwKSB7CiAJCXN0 cnVjdCBzdGF0IHN0OwogCQlpZiAoc3RhdCgiL3N5cy9jbGFzcy9kcm0vY2FyZDAvcG93ZXIiLCAm c3QpIDwgMCkKIAkJCXJldHVybiByYzYtPmVycm9yID0gZXJybm87CkBAIC0xMTAsNyArODgsNyBA QCBpbnQgcmM2X3VwZGF0ZShzdHJ1Y3QgcmM2ICpyYzYpCiAJaWYgKHJjNi0+ZXJyb3IpCiAJCXJl dHVybiByYzYtPmVycm9yOwogCi0JaWYgKHJjNi0+ZmQgPT0gLTEpIHsKKwlpZiAocmM2LT5mZCA8 IDApIHsKIAkJc3RydWN0IHN0YXQgc3Q7CiAKIAkJaWYgKHN0YXQoIi9zeXMvY2xhc3MvZHJtL2Nh cmQwL3Bvd2VyL3JjNl9yZXNpZGVuY3lfbXMiLCAmc3QpIDwgMCkKQEAgLTEyMSwyMiArOTksMTMg QEAgaW50IHJjNl91cGRhdGUoc3RydWN0IHJjNiAqcmM2KQogCQlzLT5yYzZwcF9yZXNpZGVuY3kg PSBmaWxlX3RvX3U2NCgiL3N5cy9jbGFzcy9kcm0vY2FyZDAvcG93ZXIvcmM2cHBfcmVzaWRlbmN5 X21zIik7CiAJCXMtPnRpbWVzdGFtcCA9IGNsb2NrX21zX3RvX3U2NCgpOwogCX0gZWxzZSB7Ci0J CXVpbnQ2NF90IGRhdGFbNV07Ci0JCWludCBsZW47CisJCXVpbnQ2NF90IGRhdGFbMl07CiAKLQkJ bGVuID0gcmVhZChyYzYtPmZkLCBkYXRhLCBzaXplb2YoZGF0YSkpOwotCQlpZiAobGVuIDwgMCkK KwkJaWYgKHJlYWQocmM2LT5mZCwgZGF0YSwgc2l6ZW9mKGRhdGEpKSA8IHNpemVvZihkYXRhKSkK IAkJCXJldHVybiByYzYtPmVycm9yID0gZXJybm87CiAKLQkJcy0+dGltZXN0YW1wID0gZGF0YVsx XSAvICgxMDAwKjEwMDApOwotCi0JCWxlbiA9IDI7Ci0JCWlmIChyYzYtPmZsYWdzICYgUkM2KQot CQkJcy0+cmM2X3Jlc2lkZW5jeSA9IGRhdGFbbGVuKytdIC8gMWU2OwotCQlpZiAocmM2LT5mbGFn cyAmIFJDNnApCi0JCQlzLT5yYzZwX3Jlc2lkZW5jeSA9IGRhdGFbbGVuKytdIC8gMWU2OwotCQlp ZiAocmM2LT5mbGFncyAmIFJDNnBwKQotCQkJcy0+cmM2cHBfcmVzaWRlbmN5ID0gZGF0YVtsZW4r K10gLyAxZTY7CisJCXMtPnRpbWVzdGFtcCA9IGRhdGFbMV0gLyAxZTY7CisJCXMtPnJjNl9yZXNp ZGVuY3kgPSBkYXRhWzBdIC8gMWU2OwogCX0KIAogCWlmIChyYzYtPmNvdW50ID09IDEpCmRpZmYg LS1naXQgYS90ZXN0cy9wZXJmX3BtdS5jIGIvdGVzdHMvcGVyZl9wbXUuYwppbmRleCBhMTlmZDJh YzQ1YTIuLjhkNThlY2VhMzUyOCAxMDA2NDQKLS0tIGEvdGVzdHMvcGVyZl9wbXUuYworKysgYi90 ZXN0cy9wZXJmX3BtdS5jCkBAIC0xMDE5LDUzICsxMDE5LDYgQEAgdGVzdF9yYzYoaW50IGdlbV9m ZCkKIAlhc3NlcnRfd2l0aGluX2Vwc2lsb24oYnVzeSAtIHByZXYsIDAuMCwgdG9sZXJhbmNlKTsK IH0KIAotc3RhdGljIHZvaWQKLXRlc3RfcmM2cChpbnQgZ2VtX2ZkKQotewotCWludDY0X3QgZHVy YXRpb25fbnMgPSAyZTk7Ci0JdW5zaWduZWQgaW50IG51bV9wbXUgPSAxOwotCXVpbnQ2NF90IGlk bGVbM10sIGJ1c3lbM10sIHByZXZbM107Ci0JdW5zaWduZWQgaW50IHNsZXB0LCBpOwotCWludCBm ZCwgcmV0LCBmdzsKLQotCWZkID0gb3Blbl9ncm91cChJOTE1X1BNVV9SQzZfUkVTSURFTkNZLCAt MSk7Ci0JcmV0ID0gcGVyZl9pOTE1X29wZW5fZ3JvdXAoSTkxNV9QTVVfUkM2cF9SRVNJREVOQ1ks IGZkKTsKLQlpZiAocmV0ID4gMCkgewotCQludW1fcG11Kys7Ci0JCXJldCA9IHBlcmZfaTkxNV9v cGVuX2dyb3VwKEk5MTVfUE1VX1JDNnBwX1JFU0lERU5DWSwgZmQpOwotCQlpZiAocmV0ID4gMCkK LQkJCW51bV9wbXUrKzsKLQl9Ci0KLQlpZ3RfcmVxdWlyZShudW1fcG11ID09IDMpOwotCi0JZ2Vt X3F1aWVzY2VudF9ncHUoZ2VtX2ZkKTsKLQl1c2xlZXAoMTAwZTMpOyAvKiB3YWl0IGZvciB0aGUg cmM2IGN5Y2xlIGNvdW50ZXIgdG8ga2ljayBpbiAqLwotCi0JLyogR28gaWRsZSBhbmQgY2hlY2sg ZnVsbCBSQzYuICovCi0JcG11X3JlYWRfbXVsdGkoZmQsIG51bV9wbXUsIHByZXYpOwotCXNsZXB0 ID0gbWVhc3VyZWRfdXNsZWVwKGR1cmF0aW9uX25zIC8gMTAwMCk7Ci0JcG11X3JlYWRfbXVsdGko ZmQsIG51bV9wbXUsIGlkbGUpOwotCi0JZm9yIChpID0gMDsgaSA8IG51bV9wbXU7IGkrKykKLQkJ YXNzZXJ0X3dpdGhpbl9lcHNpbG9uKGlkbGVbaV0gLSBwcmV2W2ldLCBzbGVwdCwgdG9sZXJhbmNl KTsKLQotCS8qIFdha2UgdXAgZGV2aWNlIGFuZCBjaGVjayBubyBSQzYuICovCi0JZncgPSBpZ3Rf b3Blbl9mb3JjZXdha2VfaGFuZGxlKGdlbV9mZCk7Ci0JaWd0X2Fzc2VydChmdyA+PSAwKTsKLQl1 c2xlZXAoMWUzKTsgLyogd2FpdCBmb3IgdGhlIHJjNiBjeWNsZSBjb3VudGVyIHRvIHN0b3AgdGlj a2luZyAqLwotCi0JcG11X3JlYWRfbXVsdGkoZmQsIG51bV9wbXUsIHByZXYpOwotCXVzbGVlcChk dXJhdGlvbl9ucyAvIDEwMDApOwotCXBtdV9yZWFkX211bHRpKGZkLCBudW1fcG11LCBidXN5KTsK LQotCWNsb3NlKGZ3KTsKLQljbG9zZShmZCk7Ci0KLQlmb3IgKGkgPSAwOyBpIDwgbnVtX3BtdTsg aSsrKQotCQlhc3NlcnRfd2l0aGluX2Vwc2lsb24oYnVzeVtpXSAtIHByZXZbaV0sIDAuMCwgdG9s ZXJhbmNlKTsKLX0KLQogaWd0X21haW4KIHsKIAljb25zdCB1bnNpZ25lZCBpbnQgbnVtX290aGVy X21ldHJpY3MgPQpAQCAtMTIwNSwxMiArMTE1OCw2IEBAIGlndF9tYWluCiAJaWd0X3N1YnRlc3Qo InJjNiIpCiAJCXRlc3RfcmM2KGZkKTsKIAotCS8qKgotCSAqIFRlc3QgUkM2cCByZXNpZGVuY3kg cmVwb3J0aW5nLgotCSAqLwotCWlndF9zdWJ0ZXN0KCJyYzZwIikKLQkJdGVzdF9yYzZwKGZkKTsK LQogCS8qKgogCSAqIENoZWNrIHJlbmRlciBub2RlcyBhcmUgY291bnRlZC4KIAkgKi8KLS0gCjIu MTQuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==