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 13:48:45 +0100 Message-ID: <20180606124848.13050-5-tvrtko.ursulin@linux.intel.com> References: <20180606124848.13050-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-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4C79E6EFDF for ; Wed, 6 Jun 2018 12:48:59 +0000 (UTC) Received: by mail-wr0-x243.google.com with SMTP id v13-v6so6161071wrp.13 for ; Wed, 06 Jun 2018 05:48:59 -0700 (PDT) In-Reply-To: <20180606124848.13050-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 ciBhcml0aG1ldGljcy4gKENocmlzIFdpbHNvbikKCnY0OgogKiBSZWZhY3RvcmVkIGZvciB0aW1l ciBwZXJpb2QgYWNjb3VudGluZy4KClNpZ25lZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0 a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUu YyAgICAgICAgIHwgNTMgKysrKysrKysrKysrKysrKysrKystLS0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIHwgIDIgKy0KIGluY2x1ZGUvdWFwaS9kcm0vaTkxNV9k cm0uaCAgICAgICAgICAgICB8ICA5ICsrKystCiAzIGZpbGVzIGNoYW5nZWQsIDUyIGluc2VydGlv bnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfcG11LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BtdS5jCmluZGV4IGI4YzY5 NTM4NjdlZS4uNWY4Y2MzZmUxODI2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3BtdS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcG11LmMKQEAgLTE1LDcg KzE1LDggQEAKICNkZWZpbmUgRU5HSU5FX1NBTVBMRV9NQVNLIFwKIAkoQklUKEk5MTVfU0FNUExF X0JVU1kpIHwgXAogCSBCSVQoSTkxNV9TQU1QTEVfV0FJVCkgfCBcCi0JIEJJVChJOTE1X1NBTVBM RV9TRU1BKSkKKwkgQklUKEk5MTVfU0FNUExFX1NFTUEpIHwgXAorCSBCSVQoSTkxNV9TQU1QTEVf UVVFVUVEKSkKIAogI2RlZmluZSBFTkdJTkVfU0FNUExFX0JJVFMgKDEgPDwgSTkxNV9QTVVfU0FN UExFX0JJVFMpCiAKQEAgLTE2MSw2ICsxNjIsMTIgQEAgYWRkX3NhbXBsZShzdHJ1Y3QgaTkxNV9w bXVfc2FtcGxlICpzYW1wbGUsIHUzMiB2YWwpCiAJc2FtcGxlLT5jdXIgKz0gdmFsOwogfQogCitz dGF0aWMgdm9pZAorYWRkX3NhbXBsZV9tdWx0KHN0cnVjdCBpOTE1X3BtdV9zYW1wbGUgKnNhbXBs ZSwgdTMyIHZhbCwgdTMyIG11bCkKK3sKKwlzYW1wbGUtPmN1ciArPSBtdWxfdTMyX3UzMih2YWws IG11bCk7Cit9CisKIHN0YXRpYyB2b2lkCiBlbmdpbmVzX3NhbXBsZShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsIHVuc2lnbmVkIGludCBwZXJpb2RfbnMpCiB7CkBAIC0yMDQsNiAr MjExLDEyIEBAIGVuZ2luZXNfc2FtcGxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwgdW5zaWduZWQgaW50IHBlcmlvZF9ucykKIAkJaWYgKHZhbCAmIFJJTkdfV0FJVF9TRU1BUEhP UkUpCiAJCQlhZGRfc2FtcGxlKCZlbmdpbmUtPnBtdS5zYW1wbGVbSTkxNV9TQU1QTEVfU0VNQV0s CiAJCQkJICAgcGVyaW9kX25zKTsKKworCQlpZiAoZW5naW5lLT5wbXUuZW5hYmxlICYgQklUKEk5 MTVfU0FNUExFX1FVRVVFRCkpCisJCQlhZGRfc2FtcGxlX211bHQoJmVuZ2luZS0+cG11LnNhbXBs ZVtJOTE1X1NBTVBMRV9RVUVVRURdLAorCQkJCQlhdG9taWNfcmVhZCgmZW5naW5lLT5yZXF1ZXN0 X3N0YXRzLnF1ZXVlZCksCisJCQkJCSh1NjQpcGVyaW9kX25zICoKKwkJCQkJSTkxNV9TQU1QTEVf UVVFVUVEX0RJVklTT1IgLyAxMDAwMDAwKTsKIAl9CiAKIAlpZiAoZncpCkBAIC0yMTIsMTIgKzIy NSw2IEBAIGVuZ2luZXNfc2FtcGxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwg dW5zaWduZWQgaW50IHBlcmlvZF9ucykKIAlpbnRlbF9ydW50aW1lX3BtX3B1dChkZXZfcHJpdik7 CiB9CiAKLXN0YXRpYyB2b2lkCi1hZGRfc2FtcGxlX211bHQoc3RydWN0IGk5MTVfcG11X3NhbXBs ZSAqc2FtcGxlLCB1MzIgdmFsLCB1MzIgbXVsKQotewotCXNhbXBsZS0+Y3VyICs9IG11bF91MzJf dTMyKHZhbCwgbXVsKTsKLX0KLQogc3RhdGljIHZvaWQKIGZyZXF1ZW5jeV9zYW1wbGUoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1bnNpZ25lZCBpbnQgcGVyaW9kX25zKQogewpA QCAtMzIzLDYgKzMzMCw3IEBAIGVuZ2luZV9ldmVudF9zdGF0dXMoc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqZW5naW5lLAogCXN3aXRjaCAoc2FtcGxlKSB7CiAJY2FzZSBJOTE1X1NBTVBMRV9CVVNZ OgogCWNhc2UgSTkxNV9TQU1QTEVfV0FJVDoKKwljYXNlIEk5MTVfU0FNUExFX1FVRVVFRDoKIAkJ YnJlYWs7CiAJY2FzZSBJOTE1X1NBTVBMRV9TRU1BOgogCQlpZiAoSU5URUxfR0VOKGVuZ2luZS0+ aTkxNSkgPCA2KQpAQCAtNTQwLDYgKzU0OCw5IEBAIHN0YXRpYyB1NjQgX19pOTE1X3BtdV9ldmVu dF9yZWFkKHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCkKIAkJCXZhbCA9IGt0aW1lX3RvX25zKGlu dGVsX2VuZ2luZV9nZXRfYnVzeV90aW1lKGVuZ2luZSkpOwogCQl9IGVsc2UgewogCQkJdmFsID0g ZW5naW5lLT5wbXUuc2FtcGxlW3NhbXBsZV0uY3VyOworCisJCQlpZiAoc2FtcGxlID09IEk5MTVf U0FNUExFX1FVRVVFRCkKKwkJCQl2YWwgPSBkaXZfdTY0KHZhbCwgTVNFQ19QRVJfU0VDKTsgIC8q IHRvIHFkICovCiAJCX0KIAl9IGVsc2UgewogCQlzd2l0Y2ggKGV2ZW50LT5hdHRyLmNvbmZpZykg ewpAQCAtNzk2LDYgKzgwNywxNiBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGF0dHJpYnV0ZV9ncm91 cCAqaTkxNV9wbXVfYXR0cl9ncm91cHNbXSA9IHsKIHsgXAogCS5zYW1wbGUgPSAoX19zYW1wbGUp LCBcCiAJLm5hbWUgPSAoX19uYW1lKSwgXAorCS5zdWZmaXggPSAidW5pdCIsIFwKKwkudmFsdWUg PSAibnMiLCBcCit9CisKKyNkZWZpbmUgX19lbmdpbmVfZXZlbnRfc2NhbGUoX19zYW1wbGUsIF9f bmFtZSwgX19zY2FsZSkgXAoreyBcCisJLnNhbXBsZSA9IChfX3NhbXBsZSksIFwKKwkubmFtZSA9 IChfX25hbWUpLCBcCisJLnN1ZmZpeCA9ICJzY2FsZSIsIFwKKwkudmFsdWUgPSAoX19zY2FsZSks IFwKIH0KIAogc3RhdGljIHN0cnVjdCBpOTE1X2V4dF9hdHRyaWJ1dGUgKgpAQCAtODIzLDYgKzg0 NCw5IEBAIGFkZF9wbXVfYXR0cihzdHJ1Y3QgcGVyZl9wbXVfZXZlbnRzX2F0dHIgKmF0dHIsIGNv bnN0IGNoYXIgKm5hbWUsCiAJcmV0dXJuICsrYXR0cjsKIH0KIAorLyogTm8gYnJhY2tldHMgb3Ig cXVvdGVzIGJlbG93IHBsZWFzZS4gKi8KKyNkZWZpbmUgSTkxNV9TQU1QTEVfUVVFVUVEX1NDQUxF IDAuMDAwOTc2NTYyNQorCiBzdGF0aWMgc3RydWN0IGF0dHJpYnV0ZSAqKgogY3JlYXRlX2V2ZW50 X2F0dHJpYnV0ZXMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUpCiB7CkBAIC04MzksMTAg Kzg2MywxNCBAQCBjcmVhdGVfZXZlbnRfYXR0cmlidXRlcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqaTkxNSkKIAlzdGF0aWMgY29uc3Qgc3RydWN0IHsKIAkJZW51bSBkcm1faTkxNV9wbXVfZW5n aW5lX3NhbXBsZSBzYW1wbGU7CiAJCWNoYXIgKm5hbWU7CisJCWNoYXIgKnN1ZmZpeDsKKwkJY2hh ciAqdmFsdWU7CiAJfSBlbmdpbmVfZXZlbnRzW10gPSB7CiAJCV9fZW5naW5lX2V2ZW50KEk5MTVf U0FNUExFX0JVU1ksICJidXN5IiksCiAJCV9fZW5naW5lX2V2ZW50KEk5MTVfU0FNUExFX1NFTUEs ICJzZW1hIiksCiAJCV9fZW5naW5lX2V2ZW50KEk5MTVfU0FNUExFX1dBSVQsICJ3YWl0IiksCisJ CV9fZW5naW5lX2V2ZW50X3NjYWxlKEk5MTVfU0FNUExFX1FVRVVFRCwgInF1ZXVlZCIsCisJCQkJ ICAgICBfX3N0cmluZ2lmeShJOTE1X1NBTVBMRV9RVUVVRURfU0NBTEUpKSwKIAl9OwogCXVuc2ln bmVkIGludCBjb3VudCA9IDA7CiAJc3RydWN0IHBlcmZfcG11X2V2ZW50c19hdHRyICpwbXVfYXR0 ciA9IE5VTEwsICpwbXVfaXRlcjsKQEAgLTg1Miw2ICs4ODAsOSBAQCBjcmVhdGVfZXZlbnRfYXR0 cmlidXRlcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIAllbnVtIGludGVsX2VuZ2lu ZV9pZCBpZDsKIAl1bnNpZ25lZCBpbnQgaTsKIAorCUJVSUxEX0JVR19PTihJOTE1X1NBTVBMRV9R VUVVRURfRElWSVNPUiAhPQorCQkgICAgICgxIC8gSTkxNV9TQU1QTEVfUVVFVUVEX1NDQUxFKSk7 CisKIAkvKiBDb3VudCBob3cgbWFueSBjb3VudGVycyB3ZSB3aWxsIGJlIGV4cG9zaW5nLiAqLwog CWZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKGV2ZW50cyk7IGkrKykgewogCQlpZiAoIWNvbmZp Z19zdGF0dXMoaTkxNSwgZXZlbnRzW2ldLmNvbmZpZykpCkBAIC05MjksMTMgKzk2MCwxNSBAQCBj cmVhdGVfZXZlbnRfYXR0cmlidXRlcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIAkJ CQkJCQkJZW5naW5lLT5pbnN0YW5jZSwKIAkJCQkJCQkJZW5naW5lX2V2ZW50c1tpXS5zYW1wbGUp KTsKIAotCQkJc3RyID0ga2FzcHJpbnRmKEdGUF9LRVJORUwsICIlcy0lcy51bml0IiwKLQkJCQkJ ZW5naW5lLT5uYW1lLCBlbmdpbmVfZXZlbnRzW2ldLm5hbWUpOworCQkJc3RyID0ga2FzcHJpbnRm KEdGUF9LRVJORUwsICIlcy0lcy4lcyIsCisJCQkJCWVuZ2luZS0+bmFtZSwgZW5naW5lX2V2ZW50 c1tpXS5uYW1lLAorCQkJCQllbmdpbmVfZXZlbnRzW2ldLnN1ZmZpeCk7CiAJCQlpZiAoIXN0cikK IAkJCQlnb3RvIGVycjsKIAogCQkJKmF0dHJfaXRlcisrID0gJnBtdV9pdGVyLT5hdHRyLmF0dHI7 Ci0JCQlwbXVfaXRlciA9IGFkZF9wbXVfYXR0cihwbXVfaXRlciwgc3RyLCAibnMiKTsKKwkJCXBt dV9pdGVyID0gYWRkX3BtdV9hdHRyKHBtdV9pdGVyLCBzdHIsCisJCQkJCQllbmdpbmVfZXZlbnRz W2ldLnZhbHVlKTsKIAkJfQogCX0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5oCmluZGV4IGVlYjdmMzY2MjE5NS4uOTAyYjYzZWVhZjUwIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcmluZ2J1ZmZlci5oCkBAIC00MjAsNyArNDIwLDcgQEAgc3RydWN0IGludGVsX2Vu Z2luZV9jcyB7CiAJCSAqCiAJCSAqIE91ciBpbnRlcm5hbCB0aW1lciBzdG9yZXMgdGhlIGN1cnJl bnQgY291bnRlcnMgaW4gdGhpcyBmaWVsZC4KIAkJICovCi0jZGVmaW5lIEk5MTVfRU5HSU5FX1NB TVBMRV9NQVggKEk5MTVfU0FNUExFX1NFTUEgKyAxKQorI2RlZmluZSBJOTE1X0VOR0lORV9TQU1Q TEVfTUFYIChJOTE1X1NBTVBMRV9RVUVVRUQgKyAxKQogCQlzdHJ1Y3QgaTkxNV9wbXVfc2FtcGxl IHNhbXBsZVtJOTE1X0VOR0lORV9TQU1QTEVfTUFYXTsKIAl9IHBtdTsKIApkaWZmIC0tZ2l0IGEv aW5jbHVkZS91YXBpL2RybS9pOTE1X2RybS5oIGIvaW5jbHVkZS91YXBpL2RybS9pOTE1X2RybS5o CmluZGV4IDdmNTYzNGNlOGU4OC4uNjA5NGNjOWNhNmQ5IDEwMDY0NAotLS0gYS9pbmNsdWRlL3Vh cGkvZHJtL2k5MTVfZHJtLmgKKysrIGIvaW5jbHVkZS91YXBpL2RybS9pOTE1X2RybS5oCkBAIC0x MTAsOSArMTEwLDEzIEBAIGVudW0gZHJtX2k5MTVfZ2VtX2VuZ2luZV9jbGFzcyB7CiBlbnVtIGRy bV9pOTE1X3BtdV9lbmdpbmVfc2FtcGxlIHsKIAlJOTE1X1NBTVBMRV9CVVNZID0gMCwKIAlJOTE1 X1NBTVBMRV9XQUlUID0gMSwKLQlJOTE1X1NBTVBMRV9TRU1BID0gMgorCUk5MTVfU0FNUExFX1NF TUEgPSAyLAorCUk5MTVfU0FNUExFX1FVRVVFRCA9IDMKIH07CiAKKyAvKiBEaXZpZGUgY291bnRl ciB2YWx1ZSBieSBkaXZpc29yIHRvIGdldCB0aGUgcmVhbCB2YWx1ZS4gKi8KKyNkZWZpbmUgSTkx NV9TQU1QTEVfUVVFVUVEX0RJVklTT1IgKDEwMjQpCisKICNkZWZpbmUgSTkxNV9QTVVfU0FNUExF X0JJVFMgKDQpCiAjZGVmaW5lIEk5MTVfUE1VX1NBTVBMRV9NQVNLICgweGYpCiAjZGVmaW5lIEk5 MTVfUE1VX1NBTVBMRV9JTlNUQU5DRV9CSVRTICg4KQpAQCAtMTMzLDYgKzEzNyw5IEBAIGVudW0g ZHJtX2k5MTVfcG11X2VuZ2luZV9zYW1wbGUgewogI2RlZmluZSBJOTE1X1BNVV9FTkdJTkVfU0VN QShjbGFzcywgaW5zdGFuY2UpIFwKIAlfX0k5MTVfUE1VX0VOR0lORShjbGFzcywgaW5zdGFuY2Us IEk5MTVfU0FNUExFX1NFTUEpCiAKKyNkZWZpbmUgSTkxNV9QTVVfRU5HSU5FX1FVRVVFRChjbGFz cywgaW5zdGFuY2UpIFwKKwlfX0k5MTVfUE1VX0VOR0lORShjbGFzcywgaW5zdGFuY2UsIEk5MTVf U0FNUExFX1FVRVVFRCkKKwogI2RlZmluZSBfX0k5MTVfUE1VX09USEVSKHgpIChfX0k5MTVfUE1V X0VOR0lORSgweGZmLCAweGZmLCAweGYpICsgMSArICh4KSkKIAogI2RlZmluZSBJOTE1X1BNVV9B Q1RVQUxfRlJFUVVFTkNZCV9fSTkxNV9QTVVfT1RIRVIoMCkKLS0gCjIuMTcuMQoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcg bGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==