From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 4/7] drm/i915/pmu: Add queued counter Date: Wed, 6 Jun 2018 15:39:19 +0100 Message-ID: <20180606143919.9194-1-tvrtko.ursulin@linux.intel.com> References: <20180606124848.13050-5-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 04C656E063 for ; Wed, 6 Jun 2018 14:39:26 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id j15-v6so12590198wme.0 for ; Wed, 06 Jun 2018 07:39:26 -0700 (PDT) In-Reply-To: <20180606124848.13050-5-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 ciBhcml0aG1ldGljcy4gKENocmlzIFdpbHNvbikKCnY0OgogKiBSZWZhY3RvcmVkIGZvciB0aW1l ciBwZXJpb2QgYWNjb3VudGluZy4KCnY1OgogKiBBdm9pZCA2NC1kaXZpc2lvbi4gKENocmlzIFdp bHNvbikKClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRl bC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUuYyAgICAgICAgIHwgNTQg KysrKysrKysrKysrKysrKysrKystLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmlu Z2J1ZmZlci5oIHwgIDIgKy0KIGluY2x1ZGUvdWFwaS9kcm0vaTkxNV9kcm0uaCAgICAgICAgICAg ICB8ICA5ICsrKystCiAzIGZpbGVzIGNoYW5nZWQsIDUzIGluc2VydGlvbnMoKyksIDEyIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcG11LmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BtdS5jCmluZGV4IGI4YzY5NTM4NjdlZS4uYmEyMjA1 ZDkyMTkwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BtdS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcG11LmMKQEAgLTE1LDcgKzE1LDggQEAKICNkZWZp bmUgRU5HSU5FX1NBTVBMRV9NQVNLIFwKIAkoQklUKEk5MTVfU0FNUExFX0JVU1kpIHwgXAogCSBC SVQoSTkxNV9TQU1QTEVfV0FJVCkgfCBcCi0JIEJJVChJOTE1X1NBTVBMRV9TRU1BKSkKKwkgQklU KEk5MTVfU0FNUExFX1NFTUEpIHwgXAorCSBCSVQoSTkxNV9TQU1QTEVfUVVFVUVEKSkKIAogI2Rl ZmluZSBFTkdJTkVfU0FNUExFX0JJVFMgKDEgPDwgSTkxNV9QTVVfU0FNUExFX0JJVFMpCiAKQEAg LTE2MSw2ICsxNjIsMTIgQEAgYWRkX3NhbXBsZShzdHJ1Y3QgaTkxNV9wbXVfc2FtcGxlICpzYW1w bGUsIHUzMiB2YWwpCiAJc2FtcGxlLT5jdXIgKz0gdmFsOwogfQogCitzdGF0aWMgdm9pZAorYWRk X3NhbXBsZV9tdWx0KHN0cnVjdCBpOTE1X3BtdV9zYW1wbGUgKnNhbXBsZSwgdTMyIHZhbCwgdTMy IG11bCkKK3sKKwlzYW1wbGUtPmN1ciArPSBtdWxfdTMyX3UzMih2YWwsIG11bCk7Cit9CisKIHN0 YXRpYyB2b2lkCiBlbmdpbmVzX3NhbXBsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsIHVuc2lnbmVkIGludCBwZXJpb2RfbnMpCiB7CkBAIC0yMDQsNiArMjExLDEzIEBAIGVuZ2lu ZXNfc2FtcGxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdW5zaWduZWQgaW50 IHBlcmlvZF9ucykKIAkJaWYgKHZhbCAmIFJJTkdfV0FJVF9TRU1BUEhPUkUpCiAJCQlhZGRfc2Ft cGxlKCZlbmdpbmUtPnBtdS5zYW1wbGVbSTkxNV9TQU1QTEVfU0VNQV0sCiAJCQkJICAgcGVyaW9k X25zKTsKKworCQlpZiAoZW5naW5lLT5wbXUuZW5hYmxlICYgQklUKEk5MTVfU0FNUExFX1FVRVVF RCkpCisJCQlhZGRfc2FtcGxlX211bHQoJmVuZ2luZS0+cG11LnNhbXBsZVtJOTE1X1NBTVBMRV9R VUVVRURdLAorCQkJCQlhdG9taWNfcmVhZCgmZW5naW5lLT5yZXF1ZXN0X3N0YXRzLnF1ZXVlZCks CisJCQkJCWRpdl91NjQoKHU2NClwZXJpb2RfbnMgKgorCQkJCQkJSTkxNV9TQU1QTEVfUVVFVUVE X0RJVklTT1IsCisJCQkJCQkxMDAwMDAwKSk7CiAJfQogCiAJaWYgKGZ3KQpAQCAtMjEyLDEyICsy MjYsNiBAQCBlbmdpbmVzX3NhbXBsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs IHVuc2lnbmVkIGludCBwZXJpb2RfbnMpCiAJaW50ZWxfcnVudGltZV9wbV9wdXQoZGV2X3ByaXYp OwogfQogCi1zdGF0aWMgdm9pZAotYWRkX3NhbXBsZV9tdWx0KHN0cnVjdCBpOTE1X3BtdV9zYW1w bGUgKnNhbXBsZSwgdTMyIHZhbCwgdTMyIG11bCkKLXsKLQlzYW1wbGUtPmN1ciArPSBtdWxfdTMy X3UzMih2YWwsIG11bCk7Ci19Ci0KIHN0YXRpYyB2b2lkCiBmcmVxdWVuY3lfc2FtcGxlKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdW5zaWduZWQgaW50IHBlcmlvZF9ucykKIHsK QEAgLTMyMyw2ICszMzEsNyBAQCBlbmdpbmVfZXZlbnRfc3RhdHVzKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKmVuZ2luZSwKIAlzd2l0Y2ggKHNhbXBsZSkgewogCWNhc2UgSTkxNV9TQU1QTEVfQlVT WToKIAljYXNlIEk5MTVfU0FNUExFX1dBSVQ6CisJY2FzZSBJOTE1X1NBTVBMRV9RVUVVRUQ6CiAJ CWJyZWFrOwogCWNhc2UgSTkxNV9TQU1QTEVfU0VNQToKIAkJaWYgKElOVEVMX0dFTihlbmdpbmUt Pmk5MTUpIDwgNikKQEAgLTU0MCw2ICs1NDksOSBAQCBzdGF0aWMgdTY0IF9faTkxNV9wbXVfZXZl bnRfcmVhZChzdHJ1Y3QgcGVyZl9ldmVudCAqZXZlbnQpCiAJCQl2YWwgPSBrdGltZV90b19ucyhp bnRlbF9lbmdpbmVfZ2V0X2J1c3lfdGltZShlbmdpbmUpKTsKIAkJfSBlbHNlIHsKIAkJCXZhbCA9 IGVuZ2luZS0+cG11LnNhbXBsZVtzYW1wbGVdLmN1cjsKKworCQkJaWYgKHNhbXBsZSA9PSBJOTE1 X1NBTVBMRV9RVUVVRUQpCisJCQkJdmFsID0gZGl2X3U2NCh2YWwsIE1TRUNfUEVSX1NFQyk7ICAv KiB0byBxZCAqLwogCQl9CiAJfSBlbHNlIHsKIAkJc3dpdGNoIChldmVudC0+YXR0ci5jb25maWcp IHsKQEAgLTc5Niw2ICs4MDgsMTYgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBhdHRyaWJ1dGVfZ3Jv dXAgKmk5MTVfcG11X2F0dHJfZ3JvdXBzW10gPSB7CiB7IFwKIAkuc2FtcGxlID0gKF9fc2FtcGxl KSwgXAogCS5uYW1lID0gKF9fbmFtZSksIFwKKwkuc3VmZml4ID0gInVuaXQiLCBcCisJLnZhbHVl ID0gIm5zIiwgXAorfQorCisjZGVmaW5lIF9fZW5naW5lX2V2ZW50X3NjYWxlKF9fc2FtcGxlLCBf X25hbWUsIF9fc2NhbGUpIFwKK3sgXAorCS5zYW1wbGUgPSAoX19zYW1wbGUpLCBcCisJLm5hbWUg PSAoX19uYW1lKSwgXAorCS5zdWZmaXggPSAic2NhbGUiLCBcCisJLnZhbHVlID0gKF9fc2NhbGUp LCBcCiB9CiAKIHN0YXRpYyBzdHJ1Y3QgaTkxNV9leHRfYXR0cmlidXRlICoKQEAgLTgyMyw2ICs4 NDUsOSBAQCBhZGRfcG11X2F0dHIoc3RydWN0IHBlcmZfcG11X2V2ZW50c19hdHRyICphdHRyLCBj b25zdCBjaGFyICpuYW1lLAogCXJldHVybiArK2F0dHI7CiB9CiAKKy8qIE5vIGJyYWNrZXRzIG9y IHF1b3RlcyBiZWxvdyBwbGVhc2UuICovCisjZGVmaW5lIEk5MTVfU0FNUExFX1FVRVVFRF9TQ0FM RSAwLjAwMDk3NjU2MjUKKwogc3RhdGljIHN0cnVjdCBhdHRyaWJ1dGUgKioKIGNyZWF0ZV9ldmVu dF9hdHRyaWJ1dGVzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogewpAQCAtODM5LDEw ICs4NjQsMTQgQEAgY3JlYXRlX2V2ZW50X2F0dHJpYnV0ZXMoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmk5MTUpCiAJc3RhdGljIGNvbnN0IHN0cnVjdCB7CiAJCWVudW0gZHJtX2k5MTVfcG11X2Vu Z2luZV9zYW1wbGUgc2FtcGxlOwogCQljaGFyICpuYW1lOworCQljaGFyICpzdWZmaXg7CisJCWNo YXIgKnZhbHVlOwogCX0gZW5naW5lX2V2ZW50c1tdID0gewogCQlfX2VuZ2luZV9ldmVudChJOTE1 X1NBTVBMRV9CVVNZLCAiYnVzeSIpLAogCQlfX2VuZ2luZV9ldmVudChJOTE1X1NBTVBMRV9TRU1B LCAic2VtYSIpLAogCQlfX2VuZ2luZV9ldmVudChJOTE1X1NBTVBMRV9XQUlULCAid2FpdCIpLAor CQlfX2VuZ2luZV9ldmVudF9zY2FsZShJOTE1X1NBTVBMRV9RVUVVRUQsICJxdWV1ZWQiLAorCQkJ CSAgICAgX19zdHJpbmdpZnkoSTkxNV9TQU1QTEVfUVVFVUVEX1NDQUxFKSksCiAJfTsKIAl1bnNp Z25lZCBpbnQgY291bnQgPSAwOwogCXN0cnVjdCBwZXJmX3BtdV9ldmVudHNfYXR0ciAqcG11X2F0 dHIgPSBOVUxMLCAqcG11X2l0ZXI7CkBAIC04NTIsNiArODgxLDkgQEAgY3JlYXRlX2V2ZW50X2F0 dHJpYnV0ZXMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCiAJZW51bSBpbnRlbF9lbmdp bmVfaWQgaWQ7CiAJdW5zaWduZWQgaW50IGk7CiAKKwlCVUlMRF9CVUdfT04oSTkxNV9TQU1QTEVf UVVFVUVEX0RJVklTT1IgIT0KKwkJICAgICAoMSAvIEk5MTVfU0FNUExFX1FVRVVFRF9TQ0FMRSkp OworCiAJLyogQ291bnQgaG93IG1hbnkgY291bnRlcnMgd2Ugd2lsbCBiZSBleHBvc2luZy4gKi8K IAlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRShldmVudHMpOyBpKyspIHsKIAkJaWYgKCFjb25m aWdfc3RhdHVzKGk5MTUsIGV2ZW50c1tpXS5jb25maWcpKQpAQCAtOTI5LDEzICs5NjEsMTUgQEAg Y3JlYXRlX2V2ZW50X2F0dHJpYnV0ZXMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCiAJ CQkJCQkJCWVuZ2luZS0+aW5zdGFuY2UsCiAJCQkJCQkJCWVuZ2luZV9ldmVudHNbaV0uc2FtcGxl KSk7CiAKLQkJCXN0ciA9IGthc3ByaW50ZihHRlBfS0VSTkVMLCAiJXMtJXMudW5pdCIsCi0JCQkJ CWVuZ2luZS0+bmFtZSwgZW5naW5lX2V2ZW50c1tpXS5uYW1lKTsKKwkJCXN0ciA9IGthc3ByaW50 ZihHRlBfS0VSTkVMLCAiJXMtJXMuJXMiLAorCQkJCQllbmdpbmUtPm5hbWUsIGVuZ2luZV9ldmVu dHNbaV0ubmFtZSwKKwkJCQkJZW5naW5lX2V2ZW50c1tpXS5zdWZmaXgpOwogCQkJaWYgKCFzdHIp CiAJCQkJZ290byBlcnI7CiAKIAkJCSphdHRyX2l0ZXIrKyA9ICZwbXVfaXRlci0+YXR0ci5hdHRy OwotCQkJcG11X2l0ZXIgPSBhZGRfcG11X2F0dHIocG11X2l0ZXIsIHN0ciwgIm5zIik7CisJCQlw bXVfaXRlciA9IGFkZF9wbXVfYXR0cihwbXVfaXRlciwgc3RyLAorCQkJCQkJZW5naW5lX2V2ZW50 c1tpXS52YWx1ZSk7CiAJCX0KIAl9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZm ZXIuaAppbmRleCBlZWI3ZjM2NjIxOTUuLjkwMmI2M2VlYWY1MCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAtNDIwLDcgKzQyMCw3IEBAIHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgewogCQkgKgogCQkgKiBPdXIgaW50ZXJuYWwgdGltZXIgc3RvcmVzIHRoZSBjdXJy ZW50IGNvdW50ZXJzIGluIHRoaXMgZmllbGQuCiAJCSAqLwotI2RlZmluZSBJOTE1X0VOR0lORV9T QU1QTEVfTUFYIChJOTE1X1NBTVBMRV9TRU1BICsgMSkKKyNkZWZpbmUgSTkxNV9FTkdJTkVfU0FN UExFX01BWCAoSTkxNV9TQU1QTEVfUVVFVUVEICsgMSkKIAkJc3RydWN0IGk5MTVfcG11X3NhbXBs ZSBzYW1wbGVbSTkxNV9FTkdJTkVfU0FNUExFX01BWF07CiAJfSBwbXU7CiAKZGlmZiAtLWdpdCBh L2luY2x1ZGUvdWFwaS9kcm0vaTkxNV9kcm0uaCBiL2luY2x1ZGUvdWFwaS9kcm0vaTkxNV9kcm0u aAppbmRleCA3ZjU2MzRjZThlODguLjYwOTRjYzljYTZkOSAxMDA2NDQKLS0tIGEvaW5jbHVkZS91 YXBpL2RybS9pOTE1X2RybS5oCisrKyBiL2luY2x1ZGUvdWFwaS9kcm0vaTkxNV9kcm0uaApAQCAt MTEwLDkgKzExMCwxMyBAQCBlbnVtIGRybV9pOTE1X2dlbV9lbmdpbmVfY2xhc3MgewogZW51bSBk cm1faTkxNV9wbXVfZW5naW5lX3NhbXBsZSB7CiAJSTkxNV9TQU1QTEVfQlVTWSA9IDAsCiAJSTkx NV9TQU1QTEVfV0FJVCA9IDEsCi0JSTkxNV9TQU1QTEVfU0VNQSA9IDIKKwlJOTE1X1NBTVBMRV9T RU1BID0gMiwKKwlJOTE1X1NBTVBMRV9RVUVVRUQgPSAzCiB9OwogCisgLyogRGl2aWRlIGNvdW50 ZXIgdmFsdWUgYnkgZGl2aXNvciB0byBnZXQgdGhlIHJlYWwgdmFsdWUuICovCisjZGVmaW5lIEk5 MTVfU0FNUExFX1FVRVVFRF9ESVZJU09SICgxMDI0KQorCiAjZGVmaW5lIEk5MTVfUE1VX1NBTVBM RV9CSVRTICg0KQogI2RlZmluZSBJOTE1X1BNVV9TQU1QTEVfTUFTSyAoMHhmKQogI2RlZmluZSBJ OTE1X1BNVV9TQU1QTEVfSU5TVEFOQ0VfQklUUyAoOCkKQEAgLTEzMyw2ICsxMzcsOSBAQCBlbnVt IGRybV9pOTE1X3BtdV9lbmdpbmVfc2FtcGxlIHsKICNkZWZpbmUgSTkxNV9QTVVfRU5HSU5FX1NF TUEoY2xhc3MsIGluc3RhbmNlKSBcCiAJX19JOTE1X1BNVV9FTkdJTkUoY2xhc3MsIGluc3RhbmNl LCBJOTE1X1NBTVBMRV9TRU1BKQogCisjZGVmaW5lIEk5MTVfUE1VX0VOR0lORV9RVUVVRUQoY2xh c3MsIGluc3RhbmNlKSBcCisJX19JOTE1X1BNVV9FTkdJTkUoY2xhc3MsIGluc3RhbmNlLCBJOTE1 X1NBTVBMRV9RVUVVRUQpCisKICNkZWZpbmUgX19JOTE1X1BNVV9PVEhFUih4KSAoX19JOTE1X1BN VV9FTkdJTkUoMHhmZiwgMHhmZiwgMHhmKSArIDEgKyAoeCkpCiAKICNkZWZpbmUgSTkxNV9QTVVf QUNUVUFMX0ZSRVFVRU5DWQlfX0k5MTVfUE1VX09USEVSKDApCi0tIAoyLjE3LjEKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=