From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 4/6] drm/i915/pmu: Add queued counter Date: Mon, 12 Feb 2018 18:57:38 +0000 Message-ID: <20180212185740.4429-5-tvrtko.ursulin@linux.intel.com> References: <20180212185740.4429-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 6D12A89D63 for ; Mon, 12 Feb 2018 18:57:55 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id a84so162874wmi.5 for ; Mon, 12 Feb 2018 10:57:55 -0800 (PST) In-Reply-To: <20180212185740.4429-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 NV9wbXUuYwppbmRleCBhMGFlN2NhMjIwZmQuLjdhOGUwMjgyNDAyMSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3BtdS5jCkBAIC0zNiw3ICszNiw4IEBACiAjZGVmaW5lIEVOR0lORV9TQU1QTEVfTUFTSyBc CiAJKEJJVChJOTE1X1NBTVBMRV9CVVNZKSB8IFwKIAkgQklUKEk5MTVfU0FNUExFX1dBSVQpIHwg XAotCSBCSVQoSTkxNV9TQU1QTEVfU0VNQSkpCisJIEJJVChJOTE1X1NBTVBMRV9TRU1BKSB8IFwK KwkgQklUKEk5MTVfU0FNUExFX1FVRVVFRCkpCiAKICNkZWZpbmUgRU5HSU5FX1NBTVBMRV9CSVRT ICgxIDw8IEk5MTVfUE1VX1NBTVBMRV9CSVRTKQogCkBAIC0yMjAsNiArMjIxLDExIEBAIHN0YXRp YyB2b2lkIGVuZ2luZXNfc2FtcGxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK IAogCQl1cGRhdGVfc2FtcGxlKCZlbmdpbmUtPnBtdS5zYW1wbGVbSTkxNV9TQU1QTEVfU0VNQV0s CiAJCQkgICAgICBQRVJJT0QsICEhKHZhbCAmIFJJTkdfV0FJVF9TRU1BUEhPUkUpKTsKKworCQlp ZiAoZW5naW5lLT5wbXUuZW5hYmxlICYgQklUKEk5MTVfU0FNUExFX1FVRVVFRCkpCisJCQl1cGRh dGVfc2FtcGxlKCZlbmdpbmUtPnBtdS5zYW1wbGVbSTkxNV9TQU1QTEVfUVVFVUVEXSwKKwkJCQkg ICAgICBJOTE1X1NBTVBMRV9RVUVVRURfRElWSVNPUiwKKwkJCQkgICAgICBhdG9taWNfcmVhZCgm ZW5naW5lLT5yZXF1ZXN0X3N0YXRzLnF1ZXVlZCkpOwogCX0KIAogCWlmIChmdykKQEAgLTMxNyw2 ICszMjMsNyBAQCBlbmdpbmVfZXZlbnRfc3RhdHVzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVu Z2luZSwKIAlzd2l0Y2ggKHNhbXBsZSkgewogCWNhc2UgSTkxNV9TQU1QTEVfQlVTWToKIAljYXNl IEk5MTVfU0FNUExFX1dBSVQ6CisJY2FzZSBJOTE1X1NBTVBMRV9RVUVVRUQ6CiAJCWJyZWFrOwog CWNhc2UgSTkxNV9TQU1QTEVfU0VNQToKIAkJaWYgKElOVEVMX0dFTihlbmdpbmUtPmk5MTUpIDwg NikKQEAgLTUyNCw2ICs1MzEsOSBAQCBzdGF0aWMgdTY0IF9faTkxNV9wbXVfZXZlbnRfcmVhZChz dHJ1Y3QgcGVyZl9ldmVudCAqZXZlbnQsIGJvb2wgbG9ja2VkKQogCQl9IGVsc2UgewogCQkJdmFs ID0gZW5naW5lLT5wbXUuc2FtcGxlW3NhbXBsZV0uY3VyOwogCQl9CisKKwkJaWYgKHNhbXBsZSA9 PSBJOTE1X1NBTVBMRV9RVUVVRUQpCisJCQl2YWwgPSBkaXZfdTY0KHZhbCwgRlJFUVVFTkNZKTsK IAl9IGVsc2UgewogCQlzd2l0Y2ggKGV2ZW50LT5hdHRyLmNvbmZpZykgewogCQljYXNlIEk5MTVf UE1VX0FDVFVBTF9GUkVRVUVOQ1k6CkBAIC03NzksNiArNzg5LDE2IEBAIHN0YXRpYyBjb25zdCBz dHJ1Y3QgYXR0cmlidXRlX2dyb3VwICppOTE1X3BtdV9hdHRyX2dyb3Vwc1tdID0gewogeyBcCiAJ LnNhbXBsZSA9IChfX3NhbXBsZSksIFwKIAkubmFtZSA9IChfX25hbWUpLCBcCisJLnN1ZmZpeCA9 ICJ1bml0IiwgXAorCS52YWx1ZSA9ICJucyIsIFwKK30KKworI2RlZmluZSBfX2VuZ2luZV9ldmVu dF9zY2FsZShfX3NhbXBsZSwgX19uYW1lLCBfX3NjYWxlKSBcCit7IFwKKwkuc2FtcGxlID0gKF9f c2FtcGxlKSwgXAorCS5uYW1lID0gKF9fbmFtZSksIFwKKwkuc3VmZml4ID0gInNjYWxlIiwgXAor CS52YWx1ZSA9IChfX3NjYWxlKSwgXAogfQogCiBzdGF0aWMgc3RydWN0IGk5MTVfZXh0X2F0dHJp YnV0ZSAqCkBAIC04MDYsNiArODI2LDkgQEAgYWRkX3BtdV9hdHRyKHN0cnVjdCBwZXJmX3BtdV9l dmVudHNfYXR0ciAqYXR0ciwgY29uc3QgY2hhciAqbmFtZSwKIAlyZXR1cm4gKythdHRyOwogfQog CisvKiBObyBicmFja2V0cyBvciBxdW90ZXMgYmVsb3cgcGxlYXNlLiAqLworI2RlZmluZSBJOTE1 X1NBTVBMRV9RVUVVRURfU0NBTEUgMC4wMDA5NzY1NjI1CisKIHN0YXRpYyBzdHJ1Y3QgYXR0cmli dXRlICoqCiBjcmVhdGVfZXZlbnRfYXR0cmlidXRlcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq aTkxNSkKIHsKQEAgLTgyMiwxMCArODQ1LDE0IEBAIGNyZWF0ZV9ldmVudF9hdHRyaWJ1dGVzKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogCXN0YXRpYyBjb25zdCBzdHJ1Y3QgewogCQll bnVtIGRybV9pOTE1X3BtdV9lbmdpbmVfc2FtcGxlIHNhbXBsZTsKIAkJY2hhciAqbmFtZTsKKwkJ Y2hhciAqc3VmZml4OworCQljaGFyICp2YWx1ZTsKIAl9IGVuZ2luZV9ldmVudHNbXSA9IHsKIAkJ X19lbmdpbmVfZXZlbnQoSTkxNV9TQU1QTEVfQlVTWSwgImJ1c3kiKSwKIAkJX19lbmdpbmVfZXZl bnQoSTkxNV9TQU1QTEVfU0VNQSwgInNlbWEiKSwKIAkJX19lbmdpbmVfZXZlbnQoSTkxNV9TQU1Q TEVfV0FJVCwgIndhaXQiKSwKKwkJX19lbmdpbmVfZXZlbnRfc2NhbGUoSTkxNV9TQU1QTEVfUVVF VUVELCAicXVldWVkIiwKKwkJCQkgICAgIF9fc3RyaW5naWZ5KEk5MTVfU0FNUExFX1FVRVVFRF9T Q0FMRSkpLAogCX07CiAJdW5zaWduZWQgaW50IGNvdW50ID0gMDsKIAlzdHJ1Y3QgcGVyZl9wbXVf ZXZlbnRzX2F0dHIgKnBtdV9hdHRyID0gTlVMTCwgKnBtdV9pdGVyOwpAQCAtODM1LDYgKzg2Miw5 IEBAIGNyZWF0ZV9ldmVudF9hdHRyaWJ1dGVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1 KQogCWVudW0gaW50ZWxfZW5naW5lX2lkIGlkOwogCXVuc2lnbmVkIGludCBpOwogCisJQlVJTERf QlVHX09OKEk5MTVfU0FNUExFX1FVRVVFRF9ESVZJU09SICE9CisJCSAgICAgKDEgLyBJOTE1X1NB TVBMRV9RVUVVRURfU0NBTEUpKTsKKwogCS8qIENvdW50IGhvdyBtYW55IGNvdW50ZXJzIHdlIHdp bGwgYmUgZXhwb3NpbmcuICovCiAJZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUoZXZlbnRzKTsg aSsrKSB7CiAJCWlmICghY29uZmlnX3N0YXR1cyhpOTE1LCBldmVudHNbaV0uY29uZmlnKSkKQEAg LTkxMiwxMyArOTQyLDE1IEBAIGNyZWF0ZV9ldmVudF9hdHRyaWJ1dGVzKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICppOTE1KQogCQkJCQkJCQllbmdpbmUtPmluc3RhbmNlLAogCQkJCQkJCQllbmdp bmVfZXZlbnRzW2ldLnNhbXBsZSkpOwogCi0JCQlzdHIgPSBrYXNwcmludGYoR0ZQX0tFUk5FTCwg IiVzLSVzLnVuaXQiLAotCQkJCQllbmdpbmUtPm5hbWUsIGVuZ2luZV9ldmVudHNbaV0ubmFtZSk7 CisJCQlzdHIgPSBrYXNwcmludGYoR0ZQX0tFUk5FTCwgIiVzLSVzLiVzIiwKKwkJCQkJZW5naW5l LT5uYW1lLCBlbmdpbmVfZXZlbnRzW2ldLm5hbWUsCisJCQkJCWVuZ2luZV9ldmVudHNbaV0uc3Vm Zml4KTsKIAkJCWlmICghc3RyKQogCQkJCWdvdG8gZXJyOwogCiAJCQkqYXR0cl9pdGVyKysgPSAm cG11X2l0ZXItPmF0dHIuYXR0cjsKLQkJCXBtdV9pdGVyID0gYWRkX3BtdV9hdHRyKHBtdV9pdGVy LCBzdHIsICJucyIpOworCQkJcG11X2l0ZXIgPSBhZGRfcG11X2F0dHIocG11X2l0ZXIsIHN0ciwK KwkJCQkJCWVuZ2luZV9ldmVudHNbaV0udmFsdWUpOwogCQl9CiAJfQogCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggNjMwOWU3NjFiZjY5Li40MTU1NWZlOWExYTAg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTM4Niw3ICszODYs NyBAQCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzIHsKIAkJICoKIAkJICogT3VyIGludGVybmFsIHRp bWVyIHN0b3JlcyB0aGUgY3VycmVudCBjb3VudGVycyBpbiB0aGlzIGZpZWxkLgogCQkgKi8KLSNk ZWZpbmUgSTkxNV9FTkdJTkVfU0FNUExFX01BWCAoSTkxNV9TQU1QTEVfU0VNQSArIDEpCisjZGVm aW5lIEk5MTVfRU5HSU5FX1NBTVBMRV9NQVggKEk5MTVfU0FNUExFX1FVRVVFRCArIDEpCiAJCXN0 cnVjdCBpOTE1X3BtdV9zYW1wbGUgc2FtcGxlW0k5MTVfRU5HSU5FX1NBTVBMRV9NQVhdOwogCX0g cG11OwogCmRpZmYgLS1naXQgYS9pbmNsdWRlL3VhcGkvZHJtL2k5MTVfZHJtLmggYi9pbmNsdWRl L3VhcGkvZHJtL2k5MTVfZHJtLmgKaW5kZXggMjlmYTQ4ZTQ3NTVkLi5iNjVjODBiMzllOGIgMTAw NjQ0Ci0tLSBhL2luY2x1ZGUvdWFwaS9kcm0vaTkxNV9kcm0uaAorKysgYi9pbmNsdWRlL3VhcGkv ZHJtL2k5MTVfZHJtLmgKQEAgLTExMCw5ICsxMTAsMTMgQEAgZW51bSBkcm1faTkxNV9nZW1fZW5n aW5lX2NsYXNzIHsKIGVudW0gZHJtX2k5MTVfcG11X2VuZ2luZV9zYW1wbGUgewogCUk5MTVfU0FN UExFX0JVU1kgPSAwLAogCUk5MTVfU0FNUExFX1dBSVQgPSAxLAotCUk5MTVfU0FNUExFX1NFTUEg PSAyCisJSTkxNV9TQU1QTEVfU0VNQSA9IDIsCisJSTkxNV9TQU1QTEVfUVVFVUVEID0gMwogfTsK IAorIC8qIERpdmlkZSBjb3VudGVyIHZhbHVlIGJ5IGRpdmlzb3IgdG8gZ2V0IHRoZSByZWFsIHZh bHVlLiAqLworI2RlZmluZSBJOTE1X1NBTVBMRV9RVUVVRURfRElWSVNPUiAoMTAyNCkKKwogI2Rl ZmluZSBJOTE1X1BNVV9TQU1QTEVfQklUUyAoNCkKICNkZWZpbmUgSTkxNV9QTVVfU0FNUExFX01B U0sgKDB4ZikKICNkZWZpbmUgSTkxNV9QTVVfU0FNUExFX0lOU1RBTkNFX0JJVFMgKDgpCkBAIC0x MzMsNiArMTM3LDkgQEAgZW51bSBkcm1faTkxNV9wbXVfZW5naW5lX3NhbXBsZSB7CiAjZGVmaW5l IEk5MTVfUE1VX0VOR0lORV9TRU1BKGNsYXNzLCBpbnN0YW5jZSkgXAogCV9fSTkxNV9QTVVfRU5H SU5FKGNsYXNzLCBpbnN0YW5jZSwgSTkxNV9TQU1QTEVfU0VNQSkKIAorI2RlZmluZSBJOTE1X1BN VV9FTkdJTkVfUVVFVUVEKGNsYXNzLCBpbnN0YW5jZSkgXAorCV9fSTkxNV9QTVVfRU5HSU5FKGNs YXNzLCBpbnN0YW5jZSwgSTkxNV9TQU1QTEVfUVVFVUVEKQorCiAjZGVmaW5lIF9fSTkxNV9QTVVf T1RIRVIoeCkgKF9fSTkxNV9QTVVfRU5HSU5FKDB4ZmYsIDB4ZmYsIDB4ZikgKyAxICsgKHgpKQog CiAjZGVmaW5lIEk5MTVfUE1VX0FDVFVBTF9GUkVRVUVOQ1kJX19JOTE1X1BNVV9PVEhFUigwKQot LSAKMi4xNC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK