From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [CI] drm/i915/pmu: Do not assume fixed hrtimer period Date: Tue, 5 Jun 2018 15:02:53 +0100 Message-ID: <20180605140253.3541-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-x230.google.com (mail-wr0-x230.google.com [IPv6:2a00:1450:400c:c0c::230]) by gabe.freedesktop.org (Postfix) with ESMTPS id 453236EDCA for ; Tue, 5 Jun 2018 14:03:00 +0000 (UTC) Received: by mail-wr0-x230.google.com with SMTP id d8-v6so2580390wro.4 for ; Tue, 05 Jun 2018 07:03:00 -0700 (PDT) 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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkFzIENocmlz IGhhcyBkaXNjb3ZlcmVkIG9uIGhpcyBJdnlicmlkZ2UsIGFuZCBsYXRlciBhdXRvbWF0ZWQgdGVz dCBydW5zCmhhdmUgY29uZmlybWVkLCBvbiBtb3N0IG9mIG91ciBwbGF0Zm9ybXMgaHJ0aW1lciBm YWNlZCB3aXRoIGhlYXZ5IEdQVSBsb2FkCmNhbiBvY2Nhc2lvbmFsbHkgYmVjb21lIHN1ZmZpY2ll bnRseSBpbXByZWNpc2UgdG8gYWZmZWN0IFBNVSBzYW1wbGluZwpjYWxjdWxhdGlvbnMuCgpUaGlz IG1lYW5zIHdlIGNhbm5vdCBhc3N1bWUgc2FtcGxpbmcgZnJlcXVlbmN5IGlzIHdoYXQgd2UgYXNr ZWQgZm9yLCBidXQKd2UgbmVlZCB0byBtZWFzdXJlIHRoZSBpbnRlcnZhbCBvdXJzZWx2ZXMuCgpU aGlzIHBhdGNoIGlzIHNpbWlsYXIgdG8gQ2hyaXMnIG9yaWdpbmFsIHByb3Bvc2FsIGZvciBwZXIt ZW5naW5lIGNvdW50ZXJzLApidXQgaW5zdGVhZCBvZiBpbnRyb2R1Y2luZyBhIG5ldyBzZXQgdG8g d29yayBhcm91bmQgdGhlIHByb2JsZW0gd2l0aApmcmVxdWVuY3kgc2FtcGxpbmcsIGl0IHN3YXBz IGFyb3VuZCB0aGUgd2F5IGludGVybmFsIGZyZXF1ZW5jeSBhY2NvdW50aW5nCmlzIGRvbmUuIElu c3RlYWQgb2YgYWNjdW11bGF0aW5nIGN1cnJlbnQgZnJlcXVlbmN5IGFuZCBkaXZpZGluZyBieQpz YW1wbGluZyBmcmVxdWVuY3kgb24gcmVhZG91dCwgaXQgYWNjdW11bGF0ZXMgZnJlcXVlbmN5IHNj YWxlZCBieSBlYWNoCnBlcmlvZC4KCnYyOgogKiBUeXBvIGluIGNvbW1pdCBtZXNzYWdlLCBjb21t ZW50IG9uIHBlcmlvZCBjYWxjdWxhdGlvbiBhbmQgVVNFUl9QRVJfU0VDLgogICAoQ2hyaXMgV2ls c29uKQoKVGVzdGNhc2U6IGlndC9wZXJmX3BtdS8qYnVzeSogIyBzbmIsIGl2YiwgaHN3ClNpZ25l ZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+ClN1Z2dl c3RlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBDaHJp cyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KUmV2aWV3ZWQtYnk6IENocmlzIFdp bHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfcG11LmMgfCA2NyArKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfcG11LmggfCAgOCArKysrCiAyIGZpbGVzIGNoYW5nZWQsIDU1 IGluc2VydGlvbnMoKyksIDIwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfcG11LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BtdS5jCmlu ZGV4IGRjODc3OTdkYjUwMC4uYzM5NTQxZWQyMjE5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X3BtdS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcG11LmMK QEAgLTEyNyw2ICsxMjcsNyBAQCBzdGF0aWMgdm9pZCBfX2k5MTVfcG11X21heWJlX3N0YXJ0X3Rp bWVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1KQogewogCWlmICghaTkxNS0+cG11LnRp bWVyX2VuYWJsZWQgJiYgcG11X25lZWRzX3RpbWVyKGk5MTUsIHRydWUpKSB7CiAJCWk5MTUtPnBt dS50aW1lcl9lbmFibGVkID0gdHJ1ZTsKKwkJaTkxNS0+cG11LnRpbWVyX2xhc3QgPSBrdGltZV9n ZXQoKTsKIAkJaHJ0aW1lcl9zdGFydF9yYW5nZV9ucygmaTkxNS0+cG11LnRpbWVyLAogCQkJCSAg ICAgICBuc190b19rdGltZShQRVJJT0QpLCAwLAogCQkJCSAgICAgICBIUlRJTUVSX01PREVfUkVM X1BJTk5FRCk7CkBAIC0xNTUsMTIgKzE1NiwxMyBAQCBzdGF0aWMgYm9vbCBncmFiX2ZvcmNld2Fr ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwgYm9vbCBmdykKIH0KIAogc3RhdGljIHZv aWQKLXVwZGF0ZV9zYW1wbGUoc3RydWN0IGk5MTVfcG11X3NhbXBsZSAqc2FtcGxlLCB1MzIgdW5p dCwgdTMyIHZhbCkKK2FkZF9zYW1wbGUoc3RydWN0IGk5MTVfcG11X3NhbXBsZSAqc2FtcGxlLCB1 MzIgdmFsKQogewotCXNhbXBsZS0+Y3VyICs9IG11bF91MzJfdTMyKHZhbCwgdW5pdCk7CisJc2Ft cGxlLT5jdXIgKz0gdmFsOwogfQogCi1zdGF0aWMgdm9pZCBlbmdpbmVzX3NhbXBsZShzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCitzdGF0aWMgdm9pZAorZW5naW5lc19zYW1wbGUo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1bnNpZ25lZCBpbnQgcGVyaW9kX25z KQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKIAllbnVtIGludGVsX2VuZ2lu ZV9pZCBpZDsKQEAgLTE4Miw4ICsxODQsOSBAQCBzdGF0aWMgdm9pZCBlbmdpbmVzX3NhbXBsZShz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIAkJdmFsID0gIWk5MTVfc2Vxbm9f cGFzc2VkKGN1cnJlbnRfc2Vxbm8sIGxhc3Rfc2Vxbm8pOwogCi0JCXVwZGF0ZV9zYW1wbGUoJmVu Z2luZS0+cG11LnNhbXBsZVtJOTE1X1NBTVBMRV9CVVNZXSwKLQkJCSAgICAgIFBFUklPRCwgdmFs KTsKKwkJaWYgKHZhbCkKKwkJCWFkZF9zYW1wbGUoJmVuZ2luZS0+cG11LnNhbXBsZVtJOTE1X1NB TVBMRV9CVVNZXSwKKwkJCQkgICBwZXJpb2RfbnMpOwogCiAJCWlmICh2YWwgJiYgKGVuZ2luZS0+ cG11LmVuYWJsZSAmCiAJCSAgICAoQklUKEk5MTVfU0FNUExFX1dBSVQpIHwgQklUKEk5MTVfU0FN UExFX1NFTUEpKSkpIHsKQEAgLTE5NCwxMSArMTk3LDEzIEBAIHN0YXRpYyB2b2lkIGVuZ2luZXNf c2FtcGxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJCXZhbCA9IDA7CiAJ CX0KIAotCQl1cGRhdGVfc2FtcGxlKCZlbmdpbmUtPnBtdS5zYW1wbGVbSTkxNV9TQU1QTEVfV0FJ VF0sCi0JCQkgICAgICBQRVJJT0QsICEhKHZhbCAmIFJJTkdfV0FJVCkpOworCQlpZiAodmFsICYg UklOR19XQUlUKQorCQkJYWRkX3NhbXBsZSgmZW5naW5lLT5wbXUuc2FtcGxlW0k5MTVfU0FNUExF X1dBSVRdLAorCQkJCSAgIHBlcmlvZF9ucyk7CiAKLQkJdXBkYXRlX3NhbXBsZSgmZW5naW5lLT5w bXUuc2FtcGxlW0k5MTVfU0FNUExFX1NFTUFdLAotCQkJICAgICAgUEVSSU9ELCAhISh2YWwgJiBS SU5HX1dBSVRfU0VNQVBIT1JFKSk7CisJCWlmICh2YWwgJiBSSU5HX1dBSVRfU0VNQVBIT1JFKQor CQkJYWRkX3NhbXBsZSgmZW5naW5lLT5wbXUuc2FtcGxlW0k5MTVfU0FNUExFX1NFTUFdLAorCQkJ CSAgIHBlcmlvZF9ucyk7CiAJfQogCiAJaWYgKGZ3KQpAQCAtMjA3LDcgKzIxMiwxNCBAQCBzdGF0 aWMgdm9pZCBlbmdpbmVzX3NhbXBsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp CiAJaW50ZWxfcnVudGltZV9wbV9wdXQoZGV2X3ByaXYpOwogfQogCi1zdGF0aWMgdm9pZCBmcmVx dWVuY3lfc2FtcGxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3N0YXRpYyB2 b2lkCithZGRfc2FtcGxlX211bHQoc3RydWN0IGk5MTVfcG11X3NhbXBsZSAqc2FtcGxlLCB1MzIg dmFsLCB1MzIgbXVsKQoreworCXNhbXBsZS0+Y3VyICs9IG11bF91MzJfdTMyKHZhbCwgbXVsKTsK K30KKworc3RhdGljIHZvaWQKK2ZyZXF1ZW5jeV9zYW1wbGUoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LCB1bnNpZ25lZCBpbnQgcGVyaW9kX25zKQogewogCWlmIChkZXZfcHJpdi0+ cG11LmVuYWJsZSAmCiAJICAgIGNvbmZpZ19lbmFibGVkX21hc2soSTkxNV9QTVVfQUNUVUFMX0ZS RVFVRU5DWSkpIHsKQEAgLTIyMSwxNSArMjMzLDE3IEBAIHN0YXRpYyB2b2lkIGZyZXF1ZW5jeV9z YW1wbGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQkJaW50ZWxfcnVudGlt ZV9wbV9wdXQoZGV2X3ByaXYpOwogCQl9CiAKLQkJdXBkYXRlX3NhbXBsZSgmZGV2X3ByaXYtPnBt dS5zYW1wbGVbX19JOTE1X1NBTVBMRV9GUkVRX0FDVF0sCi0JCQkgICAgICAxLCBpbnRlbF9ncHVf ZnJlcShkZXZfcHJpdiwgdmFsKSk7CisJCWFkZF9zYW1wbGVfbXVsdCgmZGV2X3ByaXYtPnBtdS5z YW1wbGVbX19JOTE1X1NBTVBMRV9GUkVRX0FDVF0sCisJCQkJaW50ZWxfZ3B1X2ZyZXEoZGV2X3By aXYsIHZhbCksCisJCQkJcGVyaW9kX25zIC8gMTAwMCk7CiAJfQogCiAJaWYgKGRldl9wcml2LT5w bXUuZW5hYmxlICYKIAkgICAgY29uZmlnX2VuYWJsZWRfbWFzayhJOTE1X1BNVV9SRVFVRVNURURf RlJFUVVFTkNZKSkgewotCQl1cGRhdGVfc2FtcGxlKCZkZXZfcHJpdi0+cG11LnNhbXBsZVtfX0k5 MTVfU0FNUExFX0ZSRVFfUkVRXSwgMSwKLQkJCSAgICAgIGludGVsX2dwdV9mcmVxKGRldl9wcml2 LAotCQkJCQkgICAgIGRldl9wcml2LT5ndF9wbS5ycHMuY3VyX2ZyZXEpKTsKKwkJYWRkX3NhbXBs ZV9tdWx0KCZkZXZfcHJpdi0+cG11LnNhbXBsZVtfX0k5MTVfU0FNUExFX0ZSRVFfUkVRXSwKKwkJ CQlpbnRlbF9ncHVfZnJlcShkZXZfcHJpdiwKKwkJCQkJICAgICAgIGRldl9wcml2LT5ndF9wbS5y cHMuY3VyX2ZyZXEpLAorCQkJCXBlcmlvZF9ucyAvIDEwMDApOwogCX0KIH0KIApAQCAtMjM3LDE0 ICsyNTEsMjcgQEAgc3RhdGljIGVudW0gaHJ0aW1lcl9yZXN0YXJ0IGk5MTVfc2FtcGxlKHN0cnVj dCBocnRpbWVyICpocnRpbWVyKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1ID0K IAkJY29udGFpbmVyX29mKGhydGltZXIsIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlLCBwbXUudGlt ZXIpOworCXVuc2lnbmVkIGludCBwZXJpb2RfbnM7CisJa3RpbWVfdCBub3c7CiAKIAlpZiAoIVJF QURfT05DRShpOTE1LT5wbXUudGltZXJfZW5hYmxlZCkpCiAJCXJldHVybiBIUlRJTUVSX05PUkVT VEFSVDsKIAotCWVuZ2luZXNfc2FtcGxlKGk5MTUpOwotCWZyZXF1ZW5jeV9zYW1wbGUoaTkxNSk7 CisJbm93ID0ga3RpbWVfZ2V0KCk7CisJcGVyaW9kX25zID0ga3RpbWVfdG9fbnMoa3RpbWVfc3Vi KG5vdywgaTkxNS0+cG11LnRpbWVyX2xhc3QpKTsKKwlpOTE1LT5wbXUudGltZXJfbGFzdCA9IG5v dzsKKworCS8qCisJICogU3RyaWN0bHkgc3BlYWtpbmcgdGhlIHBhc3NlZCBpbiBwZXJpb2QgbWF5 IG5vdCBiZSAxMDAlIGFjY3VyYXRlIGZvcgorCSAqIGFsbCBpbnRlcm5hbCBjYWxjdWxhdGlvbiwg c2luY2Ugc29tZSBhbW91bnQgb2YgdGltZSBjYW4gYmUgc3BlbnQgb24KKwkgKiBncmFiYmluZyB0 aGUgZm9yY2V3YWtlLiBIb3dldmVyIHRoZSBwb3RlbnRpYWwgZXJyb3IgZnJvbSB0aW1lciBjYWxs LQorCSAqIGJhY2sgZGVsYXkgZ3JlYXRseSBkb21pbmF0ZXMgdGhpcyBzbyB3ZSBrZWVwIGl0IHNp bXBsZS4KKwkgKi8KKwllbmdpbmVzX3NhbXBsZShpOTE1LCBwZXJpb2RfbnMpOworCWZyZXF1ZW5j eV9zYW1wbGUoaTkxNSwgcGVyaW9kX25zKTsKKworCWhydGltZXJfZm9yd2FyZChocnRpbWVyLCBu b3csIG5zX3RvX2t0aW1lKFBFUklPRCkpOwogCi0JaHJ0aW1lcl9mb3J3YXJkX25vdyhocnRpbWVy LCBuc190b19rdGltZShQRVJJT0QpKTsKIAlyZXR1cm4gSFJUSU1FUl9SRVNUQVJUOwogfQogCkBA IC01MTksMTIgKzU0NiwxMiBAQCBzdGF0aWMgdTY0IF9faTkxNV9wbXVfZXZlbnRfcmVhZChzdHJ1 Y3QgcGVyZl9ldmVudCAqZXZlbnQpCiAJCWNhc2UgSTkxNV9QTVVfQUNUVUFMX0ZSRVFVRU5DWToK IAkJCXZhbCA9CiAJCQkgICBkaXZfdTY0KGk5MTUtPnBtdS5zYW1wbGVbX19JOTE1X1NBTVBMRV9G UkVRX0FDVF0uY3VyLAotCQkJCSAgIEZSRVFVRU5DWSk7CisJCQkJICAgVVNFQ19QRVJfU0VDIC8q IHRvIE1IeiAqLyk7CiAJCQlicmVhazsKIAkJY2FzZSBJOTE1X1BNVV9SRVFVRVNURURfRlJFUVVF TkNZOgogCQkJdmFsID0KIAkJCSAgIGRpdl91NjQoaTkxNS0+cG11LnNhbXBsZVtfX0k5MTVfU0FN UExFX0ZSRVFfUkVRXS5jdXIsCi0JCQkJICAgRlJFUVVFTkNZKTsKKwkJCQkgICBVU0VDX1BFUl9T RUMgLyogdG8gTUh6ICovKTsKIAkJCWJyZWFrOwogCQljYXNlIEk5MTVfUE1VX0lOVEVSUlVQVFM6 CiAJCQl2YWwgPSBjb3VudF9pbnRlcnJ1cHRzKGk5MTUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9wbXUuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcG11LmgK aW5kZXggMmJhNzM1Mjk5ZjdjLi43ZjE2NGNhM2RiMTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfcG11LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wbXUu aApAQCAtNjUsNiArNjUsMTQgQEAgc3RydWN0IGk5MTVfcG11IHsKIAkgKiBldmVudCB0eXBlcy4K IAkgKi8KIAl1NjQgZW5hYmxlOworCisJLyoqCisJICogQHRpbWVyX2xhc3Q6CisJICoKKwkgKiBU aW1lc3RtYXAgb2YgdGhlIHByZXZpb3VzIHRpbWVyIGludm9jYXRpb24uCisJICovCisJa3RpbWVf dCB0aW1lcl9sYXN0OworCiAJLyoqCiAJICogQGVuYWJsZV9jb3VudDogUmVmZXJlbmNlIGNvdW50 cyBmb3IgdGhlIGVuYWJsZWQgZXZlbnRzLgogCSAqCi0tIAoyLjE3LjAKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=