From: Robert Bragg Subject: [PATCH 3/5] drm/i915/perf: avoid read back of head register Date: Mon, 23 Jan 2017 17:25:46 -0800 Message-ID: <20170124012548.12603-4-robert@sixbynine.org> References: <20170124012548.12603-1-robert@sixbynine.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pf0-x244.google.com (mail-pf0-x244.google.com [IPv6:2607:f8b0:400e:c00::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id CD9546E6A3 for ; Tue, 24 Jan 2017 01:26:37 +0000 (UTC) Received: by mail-pf0-x244.google.com with SMTP id y143so10988058pfb.1 for ; Mon, 23 Jan 2017 17:26:37 -0800 (PST) In-Reply-To: <20170124012548.12603-1-robert@sixbynine.org> 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 VGhlcmUncyBubyBuZWVkIGZvciB0aGUgZHJpdmVyIHRvIGtlZXAgcmVhZGluZyBiYWNrIHRoZSBo ZWFkIHBvaW50ZXIKZnJvbSBoYXJkd2FyZSBzaW5jZSB0aGUgaGFyZHdhcmUgZG9lc24ndCB1cGRh dGUgaXQgYXV0b21hdGljYWxseS4gVGhpcwp3YXkgd2UgY2FuIHRyZWF0IGFueSBpbnZhbGlkIGhl YWQgcG9pbnRlciB2YWx1ZSBhcyBhIHNvZnR3YXJlL2RyaXZlcgpidWcgaW5zdGVhZCBvZiBzcHVy aW91cyBoYXJkd2FyZSBiZWhhdmlvdXIuCgpUaGlzIGNoYW5nZSBpcyBhbHNvIGEgc21hbGwgc3Rl cHBpbmcgc3RvbmUgdG93YXJkcyByZS13b3JraW5nIGhvdwp0aGUgaGVhZCBhbmQgdGFpbCBzdGF0 ZSBpcyBtYW5hZ2VkIGFzIHBhcnQgb2YgYW4gaW1wcm92ZWQgd29ya2Fyb3VuZApmb3IgdGhlIHRh aWwgcmVnaXN0ZXIgcmFjZSBjb25kaXRpb24uCgpTaWduZWQtb2ZmLWJ5OiBSb2JlcnQgQnJhZ2cg PHJvYmVydEBzaXhieW5pbmUub3JnPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmggIHwgMTEgKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wZXJmLmMgfCA0 NiArKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5n ZWQsIDMyIGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCmluZGV4IDM4NTA5NTA1NDI0ZC4uZTczMmQwYjNiZjY1IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmgKQEAgLTIzOTcsNiArMjM5NywxNyBAQCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSB7CiAJ CQkJdTggKnZhZGRyOwogCQkJCWludCBmb3JtYXQ7CiAJCQkJaW50IGZvcm1hdF9zaXplOworCisJ CQkJLyoqCisJCQkJICogQWx0aG91Z2ggd2UgY2FuIGFsd2F5cyByZWFkIGJhY2sgdGhlIGhlYWQK KwkJCQkgKiBwb2ludGVyIHJlZ2lzdGVyLCB3ZSBwcmVmZXIgdG8gYXZvaWQKKwkJCQkgKiB0cnVz dGluZyB0aGUgSFcgc3RhdGUsIGp1c3QgdG8gYXZvaWQgYW55CisJCQkJICogcmlzayB0aGF0IHNv bWUgaGFyZHdhcmUgY29uZGl0aW9uIGNvdWxkCisJCQkJICogc29tZWhvdyBidW1wIHRoZSBoZWFk IHBvaW50ZXIgdW5wcmVkaWN0YWJseQorCQkJCSAqIGFuZCBjYXVzZSB1cyB0byBmb3J3YXJkIHRo ZSB3cm9uZyBPQSBidWZmZXIKKwkJCQkgKiBkYXRhIHRvIHVlc3JzcGFjZS4KKwkJCQkgKi8KKwkJ CQl1MzIgaGVhZDsKIAkJCX0gb2FfYnVmZmVyOwogCiAJCQl1MzIgZ2VuN19sYXRjaGVkX29hc3Rh dHVzMTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGVyZi5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wZXJmLmMKaW5kZXggNGJiNzMzM2RhYzQ1Li5lODU1ODNk MGJjZmYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGVyZi5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGVyZi5jCkBAIC0zMjIsOSArMzIyLDggQEAgc3Ry dWN0IHBlcmZfb3Blbl9wcm9wZXJ0aWVzIHsKIHN0YXRpYyBib29sIGdlbjdfb2FfYnVmZmVyX2lz X2VtcHR5X2ZvcF91bmxvY2tlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7 CiAJaW50IHJlcG9ydF9zaXplID0gZGV2X3ByaXYtPnBlcmYub2Eub2FfYnVmZmVyLmZvcm1hdF9z aXplOwotCXUzMiBvYXN0YXR1czIgPSBJOTE1X1JFQUQoR0VON19PQVNUQVRVUzIpOwogCXUzMiBv YXN0YXR1czEgPSBJOTE1X1JFQUQoR0VON19PQVNUQVRVUzEpOwotCXUzMiBoZWFkID0gb2FzdGF0 dXMyICYgR0VON19PQVNUQVRVUzJfSEVBRF9NQVNLOworCXUzMiBoZWFkID0gZGV2X3ByaXYtPnBl cmYub2Eub2FfYnVmZmVyLmhlYWQ7CiAJdTMyIHRhaWwgPSBvYXN0YXR1czEgJiBHRU43X09BU1RB VFVTMV9UQUlMX01BU0s7CiAKIAlyZXR1cm4gT0FfVEFLRU4odGFpbCwgaGVhZCkgPApAQCAtNDU4 LDE2ICs0NTcsMjQgQEAgc3RhdGljIGludCBnZW43X2FwcGVuZF9vYV9yZXBvcnRzKHN0cnVjdCBp OTE1X3BlcmZfc3RyZWFtICpzdHJlYW0sCiAJCXJldHVybiAtRUlPOwogCiAJaGVhZCA9ICpoZWFk X3B0ciAtIGd0dF9vZmZzZXQ7CisKKwkvKiBBbiBvdXQgb2YgYm91bmRzIG9yIG1pc2FsaWduZWQg aGVhZCBwb2ludGVyIGltcGxpZXMgYSBkcml2ZXIgYnVnCisJICogc2luY2Ugd2UgYXJlIGluIGZ1 bGwgY29udHJvbCBvZiBoZWFkIHBvaW50ZXIgd2hpY2ggc2hvdWxkIG9ubHkKKwkgKiBiZSBpbmNy ZW1lbnRlZCBieSBtdWx0aXBsZXMgb2YgdGhlIHJlcG9ydCBzaXplIChub3RhYmx5IGFsc28KKwkg KiBhbGwgYSBwb3dlciBvZiB0d28pLgorCSAqLworCWlmIChXQVJOX09OQ0UoaGVhZCA+IE9BX0JV RkZFUl9TSVpFIHx8IGhlYWQgJSByZXBvcnRfc2l6ZSwKKwkJICAgICAgIkluY29uc2lzdGVudCBP QSBidWZmZXIgaGVhZCBwb2ludGVyID0gJXVcbiIsIGhlYWQpKQorCQlyZXR1cm4gLUVJTzsKKwog CXRhaWwgLT0gZ3R0X29mZnNldDsKIAogCS8qIFRoZSBPQSB1bml0IGlzIGV4cGVjdGVkIHRvIHdy YXAgdGhlIHRhaWwgcG9pbnRlciBhY2NvcmRpbmcgdG8gdGhlIE9BCi0JICogYnVmZmVyIHNpemUg YW5kIHNpbmNlIHdlIHNob3VsZCBuZXZlciB3cml0ZSBhIG1pc2FsaWduZWQgaGVhZAotCSAqIHBv aW50ZXIgd2UgZG9uJ3QgZXhwZWN0IHRvIHJlYWQgb25lIGJhY2sgZWl0aGVyLi4uCisJICogYnVm ZmVyIHNpemUKIAkgKi8KLQlpZiAodGFpbCA+IE9BX0JVRkZFUl9TSVpFIHx8IGhlYWQgPiBPQV9C VUZGRVJfU0laRSB8fAotCSAgICBoZWFkICUgcmVwb3J0X3NpemUpIHsKLQkJRFJNX0VSUk9SKCJJ bmNvbnNpc3RlbnQgT0EgYnVmZmVyIHBvaW50ZXIgKGhlYWQgPSAldSwgdGFpbCA9ICV1KTogZm9y Y2UgcmVzdGFydFxuIiwKLQkJCSAgaGVhZCwgdGFpbCk7CisJaWYgKHRhaWwgPiBPQV9CVUZGRVJf U0laRSkgeworCQlEUk1fRVJST1IoIkluY29uc2lzdGVudCBPQSBidWZmZXIgdGFpbCBwb2ludGVy ID0gJXU6IGZvcmNlIHJlc3RhcnRcbiIsCisJCQkgIHRhaWwpOwogCQlkZXZfcHJpdi0+cGVyZi5v YS5vcHMub2FfZGlzYWJsZShkZXZfcHJpdik7CiAJCWRldl9wcml2LT5wZXJmLm9hLm9wcy5vYV9l bmFibGUoZGV2X3ByaXYpOwogCQkqaGVhZF9wdHIgPSBJOTE1X1JFQUQoR0VON19PQVNUQVRVUzIp ICYKQEAgLTU2Miw4ICs1NjksNiBAQCBzdGF0aWMgaW50IGdlbjdfb2FfcmVhZChzdHJ1Y3QgaTkx NV9wZXJmX3N0cmVhbSAqc3RyZWFtLAogCQkJc2l6ZV90ICpvZmZzZXQpCiB7CiAJc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gc3RyZWFtLT5kZXZfcHJpdjsKLQlpbnQgcmVwb3J0 X3NpemUgPSBkZXZfcHJpdi0+cGVyZi5vYS5vYV9idWZmZXIuZm9ybWF0X3NpemU7Ci0JdTMyIG9h c3RhdHVzMjsKIAl1MzIgb2FzdGF0dXMxOwogCXUzMiBoZWFkOwogCXUzMiB0YWlsOwpAQCAtNTcy LDEwICs1NzcsOSBAQCBzdGF0aWMgaW50IGdlbjdfb2FfcmVhZChzdHJ1Y3QgaTkxNV9wZXJmX3N0 cmVhbSAqc3RyZWFtLAogCWlmIChXQVJOX09OKCFkZXZfcHJpdi0+cGVyZi5vYS5vYV9idWZmZXIu dmFkZHIpKQogCQlyZXR1cm4gLUVJTzsKIAotCW9hc3RhdHVzMiA9IEk5MTVfUkVBRChHRU43X09B U1RBVFVTMik7CiAJb2FzdGF0dXMxID0gSTkxNV9SRUFEKEdFTjdfT0FTVEFUVVMxKTsKIAotCWhl YWQgPSBvYXN0YXR1czIgJiBHRU43X09BU1RBVFVTMl9IRUFEX01BU0s7CisJaGVhZCA9IGRldl9w cml2LT5wZXJmLm9hLm9hX2J1ZmZlci5oZWFkOwogCXRhaWwgPSBvYXN0YXR1czEgJiBHRU43X09B U1RBVFVTMV9UQUlMX01BU0s7CiAKIAkvKiBYWFg6IE9uIEhhc3dlbGwgd2UgZG9uJ3QgaGF2ZSBh IHNhZmUgd2F5IHRvIGNsZWFyIG9hc3RhdHVzMQpAQCAtNjE2LDEwICs2MjAsOSBAQCBzdGF0aWMg aW50IGdlbjdfb2FfcmVhZChzdHJ1Y3QgaTkxNV9wZXJmX3N0cmVhbSAqc3RyZWFtLAogCQlkZXZf cHJpdi0+cGVyZi5vYS5vcHMub2FfZGlzYWJsZShkZXZfcHJpdik7CiAJCWRldl9wcml2LT5wZXJm Lm9hLm9wcy5vYV9lbmFibGUoZGV2X3ByaXYpOwogCi0JCW9hc3RhdHVzMiA9IEk5MTVfUkVBRChH RU43X09BU1RBVFVTMik7CiAJCW9hc3RhdHVzMSA9IEk5MTVfUkVBRChHRU43X09BU1RBVFVTMSk7 CiAKLQkJaGVhZCA9IG9hc3RhdHVzMiAmIEdFTjdfT0FTVEFUVVMyX0hFQURfTUFTSzsKKwkJaGVh ZCA9IGRldl9wcml2LT5wZXJmLm9hLm9hX2J1ZmZlci5oZWFkOwogCQl0YWlsID0gb2FzdGF0dXMx ICYgR0VON19PQVNUQVRVUzFfVEFJTF9NQVNLOwogCX0KIApAQCAtNjM1LDE3ICs2MzgsNiBAQCBz dGF0aWMgaW50IGdlbjdfb2FfcmVhZChzdHJ1Y3QgaTkxNV9wZXJmX3N0cmVhbSAqc3RyZWFtLAog CXJldCA9IGdlbjdfYXBwZW5kX29hX3JlcG9ydHMoc3RyZWFtLCBidWYsIGNvdW50LCBvZmZzZXQs CiAJCQkJICAgICAmaGVhZCwgdGFpbCk7CiAKLQkvKiBBbGwgdGhlIHJlcG9ydCBzaXplcyBhcmUg YSBwb3dlciBvZiB0d28gYW5kIHRoZQotCSAqIGhlYWQgc2hvdWxkIGFsd2F5cyBiZSBpbmNyZW1l bnRlZCBieSBzb21lIG11bHRpcGxlCi0JICogb2YgdGhlIHJlcG9ydCBzaXplLgotCSAqCi0JICog QSB3YXJuaW5nIGhlcmUsIGJ1dCBub3RhYmx5IGlmIHdlIGxhdGVyIHJlYWQgYmFjayBhCi0JICog bWlzYWxpZ25lZCBwb2ludGVyIHdlIHdpbGwgdHJlYXQgdGhhdCBhcyBhIGJ1ZyBzaW5jZQotCSAq IGl0IGNvdWxkIGxlYWQgdG8gYSBidWZmZXIgb3ZlcnJ1bi4KLQkgKi8KLQlXQVJOX09OQ0UoaGVh ZCAmIChyZXBvcnRfc2l6ZSAtIDEpLAotCQkgICJpOTE1OiBXcml0aW5nIG1pc2FsaWduZWQgT0Eg aGVhZCBwb2ludGVyIik7Ci0KIAkvKiBOb3RlOiB3ZSB1cGRhdGUgdGhlIGhlYWQgcG9pbnRlciBo ZXJlIGV2ZW4gaWYgYW4gZXJyb3IKIAkgKiB3YXMgcmV0dXJuZWQgc2luY2UgdGhlIGVycm9yIG1h eSByZXByZXNlbnQgYSBzaG9ydCByZWFkCiAJICogd2hlcmUgc29tZSBzb21lIHJlcG9ydHMgd2Vy ZSBzdWNjZXNzZnVsbHkgY29waWVkLgpAQCAtNjUzLDYgKzY0NSw3IEBAIHN0YXRpYyBpbnQgZ2Vu N19vYV9yZWFkKHN0cnVjdCBpOTE1X3BlcmZfc3RyZWFtICpzdHJlYW0sCiAJSTkxNV9XUklURShH RU43X09BU1RBVFVTMiwKIAkJICAgKChoZWFkICYgR0VON19PQVNUQVRVUzJfSEVBRF9NQVNLKSB8 CiAJCSAgICBPQV9NRU1fU0VMRUNUX0dHVFQpKTsKKwlkZXZfcHJpdi0+cGVyZi5vYS5vYV9idWZm ZXIuaGVhZCA9IGhlYWQ7CiAKIAlyZXR1cm4gcmV0OwogfQpAQCAtODM0LDcgKzgyNywxMCBAQCBz dGF0aWMgdm9pZCBnZW43X2luaXRfb2FfYnVmZmVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKIAkgKiBiZWZvcmUgT0FTVEFUVVMxLCBidXQgYWZ0ZXIgT0FTVEFUVVMyCiAJICov CiAJSTkxNV9XUklURShHRU43X09BU1RBVFVTMiwgZ3R0X29mZnNldCB8IE9BX01FTV9TRUxFQ1Rf R0dUVCk7IC8qIGhlYWQgKi8KKwlkZXZfcHJpdi0+cGVyZi5vYS5vYV9idWZmZXIuaGVhZCA9IGd0 dF9vZmZzZXQ7CisKIAlJOTE1X1dSSVRFKEdFTjdfT0FCVUZGRVIsIGd0dF9vZmZzZXQpOworCiAJ STkxNV9XUklURShHRU43X09BU1RBVFVTMSwgZ3R0X29mZnNldCB8IE9BQlVGRkVSX1NJWkVfMTZN KTsgLyogdGFpbCAqLwogCiAJLyogT24gSGFzd2VsbCB3ZSBoYXZlIHRvIHRyYWNrIHdoaWNoIE9B U1RBVFVTMSBmbGFncyB3ZSd2ZQotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK