From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 4/7] drm/i915/pmu: Add queued counter Date: Thu, 5 Apr 2018 13:39:20 +0100 Message-ID: <20180405123923.22671-5-tvrtko.ursulin@linux.intel.com> References: <20180405123923.22671-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 2FA3C6E760 for ; Thu, 5 Apr 2018 12:39:38 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id u189so5302727wmd.1 for ; Thu, 05 Apr 2018 05:39:38 -0700 (PDT) In-Reply-To: <20180405123923.22671-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCldlIGFkZCBh IFBNVSBjb3VudGVyIHRvIGV4cG9zZSB0aGUgbnVtYmVyIG9mIHJlcXVlc3RzIHdoaWNoIGhhdmUg YmVlbgpzdWJtaXR0ZWQgZnJvbSB1c2Vyc3BhY2UgYnV0IGFyZSBub3QgeWV0IHJ1bm5hYmxlIGR1 ZSBkZXBlbmRlbmNpZXMgYW5kCnVuc2lnbmFsZWQgZmVuY2VzLgoKVGhpcyBpcyB1c2VmdWwgdG8g YW5hbHl6ZSB0aGUgb3ZlcmFsbCBsb2FkIG9mIHRoZSBzeXN0ZW0uCgp2MjoKICogUmViYXNlIGZv ciBuYW1lIGNoYW5nZSBhbmQgcmUtb3JkZXIuCiAqIERyb3AgZmxvYXRpbmcgcG9pbnQgY29uc3Rh bnQuIChDaHJpcyBXaWxzb24pCgp2MzoKICogQ2hhbmdlIHNjYWxlIHRvIDEwMjQgZm9yIGZhc3Rl ciBhcml0aG1ldGljcy4gKENocmlzIFdpbHNvbikKClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1 bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9wbXUuYyAgICAgICAgIHwgNDAgKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggfCAgMiArLQogaW5jbHVk ZS91YXBpL2RybS9pOTE1X2RybS5oICAgICAgICAgICAgIHwgIDkgKysrKysrKy0KIDMgZmlsZXMg Y2hhbmdlZCwgNDUgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BtdS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9wbXUuYwppbmRleCBlYjYwOTQzNjcxYjMuLjA3ZjVjYWM5N2I1NiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3BtdS5jCkBAIC0xNSw3ICsxNSw4IEBACiAjZGVmaW5lIEVOR0lORV9TQU1QTEVfTUFTSyBc CiAJKEJJVChJOTE1X1NBTVBMRV9CVVNZKSB8IFwKIAkgQklUKEk5MTVfU0FNUExFX1dBSVQpIHwg XAotCSBCSVQoSTkxNV9TQU1QTEVfU0VNQSkpCisJIEJJVChJOTE1X1NBTVBMRV9TRU1BKSB8IFwK KwkgQklUKEk5MTVfU0FNUExFX1FVRVVFRCkpCiAKICNkZWZpbmUgRU5HSU5FX1NBTVBMRV9CSVRT ICgxIDw8IEk5MTVfUE1VX1NBTVBMRV9CSVRTKQogCkBAIC0xOTksNiArMjAwLDExIEBAIHN0YXRp YyB2b2lkIGVuZ2luZXNfc2FtcGxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IAogCQl1cGRhdGVfc2FtcGxlKCZlbmdpbmUtPnBtdS5zYW1wbGVbSTkxNV9TQU1QTEVfU0VNQV0s CiAJCQkgICAgICBQRVJJT0QsICEhKHZhbCAmIFJJTkdfV0FJVF9TRU1BUEhPUkUpKTsKKworCQlp ZiAoZW5naW5lLT5wbXUuZW5hYmxlICYgQklUKEk5MTVfU0FNUExFX1FVRVVFRCkpCisJCQl1cGRh dGVfc2FtcGxlKCZlbmdpbmUtPnBtdS5zYW1wbGVbSTkxNV9TQU1QTEVfUVVFVUVEXSwKKwkJCQkg ICAgICBJOTE1X1NBTVBMRV9RVUVVRURfRElWSVNPUiwKKwkJCQkgICAgICBhdG9taWNfcmVhZCgm ZW5naW5lLT5yZXF1ZXN0X3N0YXRzLnF1ZXVlZCkpOwogCX0KIAogCWlmIChmdykKQEAgLTI5Niw2 ICszMDIsNyBAQCBlbmdpbmVfZXZlbnRfc3RhdHVzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZSwKIAlzd2l0Y2ggKHNhbXBsZSkgewogCWNhc2UgSTkxNV9TQU1QTEVfQlVTWToKIAljYXNl IEk5MTVfU0FNUExFX1dBSVQ6CisJY2FzZSBJOTE1X1NBTVBMRV9RVUVVRUQ6CiAJCWJyZWFrOwog CWNhc2UgSTkxNV9TQU1QTEVfU0VNQToKIAkJaWYgKElOVEVMX0dFTihlbmdpbmUtPmk5MTUpIDwg NikKQEAgLTQ5Nyw2ICs1MDQsOSBAQCBzdGF0aWMgdTY0IF9faTkxNV9wbXVfZXZlbnRfcmVhZChz dHJ1Y3QgcGVyZl9ldmVudCAqZXZlbnQpCiAJCX0gZWxzZSB7CiAJCQl2YWwgPSBlbmdpbmUtPnBt dS5zYW1wbGVbc2FtcGxlXS5jdXI7CiAJCX0KKworCQlpZiAoc2FtcGxlID09IEk5MTVfU0FNUExF X1FVRVVFRCkKKwkJCXZhbCA9IGRpdl91NjQodmFsLCBGUkVRVUVOQ1kpOwogCX0gZWxzZSB7CiAJ CXN3aXRjaCAoZXZlbnQtPmF0dHIuY29uZmlnKSB7CiAJCWNhc2UgSTkxNV9QTVVfQUNUVUFMX0ZS RVFVRU5DWToKQEAgLTc1Miw2ICs3NjIsMTYgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBhdHRyaWJ1 dGVfZ3JvdXAgKmk5MTVfcG11X2F0dHJfZ3JvdXBzW10gPSB7CiB7IFwKIAkuc2FtcGxlID0gKF9f c2FtcGxlKSwgXAogCS5uYW1lID0gKF9fbmFtZSksIFwKKwkuc3VmZml4ID0gInVuaXQiLCBcCisJ LnZhbHVlID0gIm5zIiwgXAorfQorCisjZGVmaW5lIF9fZW5naW5lX2V2ZW50X3NjYWxlKF9fc2Ft cGxlLCBfX25hbWUsIF9fc2NhbGUpIFwKK3sgXAorCS5zYW1wbGUgPSAoX19zYW1wbGUpLCBcCisJ Lm5hbWUgPSAoX19uYW1lKSwgXAorCS5zdWZmaXggPSAic2NhbGUiLCBcCisJLnZhbHVlID0gKF9f c2NhbGUpLCBcCiB9CiAKIHN0YXRpYyBzdHJ1Y3QgaTkxNV9leHRfYXR0cmlidXRlICoKQEAgLTc3 OSw2ICs3OTksOSBAQCBhZGRfcG11X2F0dHIoc3RydWN0IHBlcmZfcG11X2V2ZW50c19hdHRyICph dHRyLCBjb25zdCBjaGFyICpuYW1lLAogCXJldHVybiArK2F0dHI7CiB9CiAKKy8qIE5vIGJyYWNr ZXRzIG9yIHF1b3RlcyBiZWxvdyBwbGVhc2UuICovCisjZGVmaW5lIEk5MTVfU0FNUExFX1FVRVVF RF9TQ0FMRSAwLjAwMDk3NjU2MjUKKwogc3RhdGljIHN0cnVjdCBhdHRyaWJ1dGUgKioKIGNyZWF0 ZV9ldmVudF9hdHRyaWJ1dGVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogewpAQCAt Nzk1LDEwICs4MTgsMTQgQEAgY3JlYXRlX2V2ZW50X2F0dHJpYnV0ZXMoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmk5MTUpCiAJc3RhdGljIGNvbnN0IHN0cnVjdCB7CiAJCWVudW0gZHJtX2k5MTVf cG11X2VuZ2luZV9zYW1wbGUgc2FtcGxlOwogCQljaGFyICpuYW1lOworCQljaGFyICpzdWZmaXg7 CisJCWNoYXIgKnZhbHVlOwogCX0gZW5naW5lX2V2ZW50c1tdID0gewogCQlfX2VuZ2luZV9ldmVu dChJOTE1X1NBTVBMRV9CVVNZLCAiYnVzeSIpLAogCQlfX2VuZ2luZV9ldmVudChJOTE1X1NBTVBM RV9TRU1BLCAic2VtYSIpLAogCQlfX2VuZ2luZV9ldmVudChJOTE1X1NBTVBMRV9XQUlULCAid2Fp dCIpLAorCQlfX2VuZ2luZV9ldmVudF9zY2FsZShJOTE1X1NBTVBMRV9RVUVVRUQsICJxdWV1ZWQi LAorCQkJCSAgICAgX19zdHJpbmdpZnkoSTkxNV9TQU1QTEVfUVVFVUVEX1NDQUxFKSksCiAJfTsK IAl1bnNpZ25lZCBpbnQgY291bnQgPSAwOwogCXN0cnVjdCBwZXJmX3BtdV9ldmVudHNfYXR0ciAq cG11X2F0dHIgPSBOVUxMLCAqcG11X2l0ZXI7CkBAIC04MDgsNiArODM1LDkgQEAgY3JlYXRlX2V2 ZW50X2F0dHJpYnV0ZXMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCiAJZW51bSBpbnRl bF9lbmdpbmVfaWQgaWQ7CiAJdW5zaWduZWQgaW50IGk7CiAKKwlCVUlMRF9CVUdfT04oSTkxNV9T QU1QTEVfUVVFVUVEX0RJVklTT1IgIT0KKwkJICAgICAoMSAvIEk5MTVfU0FNUExFX1FVRVVFRF9T Q0FMRSkpOworCiAJLyogQ291bnQgaG93IG1hbnkgY291bnRlcnMgd2Ugd2lsbCBiZSBleHBvc2lu Zy4gKi8KIAlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRShldmVudHMpOyBpKyspIHsKIAkJaWYg KCFjb25maWdfc3RhdHVzKGk5MTUsIGV2ZW50c1tpXS5jb25maWcpKQpAQCAtODg1LDEzICs5MTUs MTUgQEAgY3JlYXRlX2V2ZW50X2F0dHJpYnV0ZXMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5 MTUpCiAJCQkJCQkJCWVuZ2luZS0+aW5zdGFuY2UsCiAJCQkJCQkJCWVuZ2luZV9ldmVudHNbaV0u c2FtcGxlKSk7CiAKLQkJCXN0ciA9IGthc3ByaW50ZihHRlBfS0VSTkVMLCAiJXMtJXMudW5pdCIs Ci0JCQkJCWVuZ2luZS0+bmFtZSwgZW5naW5lX2V2ZW50c1tpXS5uYW1lKTsKKwkJCXN0ciA9IGth c3ByaW50ZihHRlBfS0VSTkVMLCAiJXMtJXMuJXMiLAorCQkJCQllbmdpbmUtPm5hbWUsIGVuZ2lu ZV9ldmVudHNbaV0ubmFtZSwKKwkJCQkJZW5naW5lX2V2ZW50c1tpXS5zdWZmaXgpOwogCQkJaWYg KCFzdHIpCiAJCQkJZ290byBlcnI7CiAKIAkJCSphdHRyX2l0ZXIrKyA9ICZwbXVfaXRlci0+YXR0 ci5hdHRyOwotCQkJcG11X2l0ZXIgPSBhZGRfcG11X2F0dHIocG11X2l0ZXIsIHN0ciwgIm5zIik7 CisJCQlwbXVfaXRlciA9IGFkZF9wbXVfYXR0cihwbXVfaXRlciwgc3RyLAorCQkJCQkJZW5naW5l X2V2ZW50c1tpXS52YWx1ZSk7CiAJCX0KIAl9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jp bmdidWZmZXIuaAppbmRleCA2MTYwNjZmNTM2YzkuLjIzMjQxNTBmYWUwNiAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAtNDE0LDcgKzQxNCw3IEBAIHN0cnVjdCBp bnRlbF9lbmdpbmVfY3MgewogCQkgKgogCQkgKiBPdXIgaW50ZXJuYWwgdGltZXIgc3RvcmVzIHRo ZSBjdXJyZW50IGNvdW50ZXJzIGluIHRoaXMgZmllbGQuCiAJCSAqLwotI2RlZmluZSBJOTE1X0VO R0lORV9TQU1QTEVfTUFYIChJOTE1X1NBTVBMRV9TRU1BICsgMSkKKyNkZWZpbmUgSTkxNV9FTkdJ TkVfU0FNUExFX01BWCAoSTkxNV9TQU1QTEVfUVVFVUVEICsgMSkKIAkJc3RydWN0IGk5MTVfcG11 X3NhbXBsZSBzYW1wbGVbSTkxNV9FTkdJTkVfU0FNUExFX01BWF07CiAJfSBwbXU7CiAKZGlmZiAt LWdpdCBhL2luY2x1ZGUvdWFwaS9kcm0vaTkxNV9kcm0uaCBiL2luY2x1ZGUvdWFwaS9kcm0vaTkx NV9kcm0uaAppbmRleCA3ZjU2MzRjZThlODguLjYwOTRjYzljYTZkOSAxMDA2NDQKLS0tIGEvaW5j bHVkZS91YXBpL2RybS9pOTE1X2RybS5oCisrKyBiL2luY2x1ZGUvdWFwaS9kcm0vaTkxNV9kcm0u aApAQCAtMTEwLDkgKzExMCwxMyBAQCBlbnVtIGRybV9pOTE1X2dlbV9lbmdpbmVfY2xhc3Mgewog ZW51bSBkcm1faTkxNV9wbXVfZW5naW5lX3NhbXBsZSB7CiAJSTkxNV9TQU1QTEVfQlVTWSA9IDAs CiAJSTkxNV9TQU1QTEVfV0FJVCA9IDEsCi0JSTkxNV9TQU1QTEVfU0VNQSA9IDIKKwlJOTE1X1NB TVBMRV9TRU1BID0gMiwKKwlJOTE1X1NBTVBMRV9RVUVVRUQgPSAzCiB9OwogCisgLyogRGl2aWRl IGNvdW50ZXIgdmFsdWUgYnkgZGl2aXNvciB0byBnZXQgdGhlIHJlYWwgdmFsdWUuICovCisjZGVm aW5lIEk5MTVfU0FNUExFX1FVRVVFRF9ESVZJU09SICgxMDI0KQorCiAjZGVmaW5lIEk5MTVfUE1V X1NBTVBMRV9CSVRTICg0KQogI2RlZmluZSBJOTE1X1BNVV9TQU1QTEVfTUFTSyAoMHhmKQogI2Rl ZmluZSBJOTE1X1BNVV9TQU1QTEVfSU5TVEFOQ0VfQklUUyAoOCkKQEAgLTEzMyw2ICsxMzcsOSBA QCBlbnVtIGRybV9pOTE1X3BtdV9lbmdpbmVfc2FtcGxlIHsKICNkZWZpbmUgSTkxNV9QTVVfRU5H SU5FX1NFTUEoY2xhc3MsIGluc3RhbmNlKSBcCiAJX19JOTE1X1BNVV9FTkdJTkUoY2xhc3MsIGlu c3RhbmNlLCBJOTE1X1NBTVBMRV9TRU1BKQogCisjZGVmaW5lIEk5MTVfUE1VX0VOR0lORV9RVUVV RUQoY2xhc3MsIGluc3RhbmNlKSBcCisJX19JOTE1X1BNVV9FTkdJTkUoY2xhc3MsIGluc3RhbmNl LCBJOTE1X1NBTVBMRV9RVUVVRUQpCisKICNkZWZpbmUgX19JOTE1X1BNVV9PVEhFUih4KSAoX19J OTE1X1BNVV9FTkdJTkUoMHhmZiwgMHhmZiwgMHhmKSArIDEgKyAoeCkpCiAKICNkZWZpbmUgSTkx NV9QTVVfQUNUVUFMX0ZSRVFVRU5DWQlfX0k5MTVfUE1VX09USEVSKDApCi0tIAoyLjE0LjEKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=