From: Robert Bragg Subject: [PATCH v4 03/15] drm/i915/perf: avoid read back of head register Date: Wed, 12 Apr 2017 16:55:44 +0100 Message-ID: <20170412155556.6602-4-robert@sixbynine.org> References: <20170412155556.6602-1-robert@sixbynine.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id C11A9891A8 for ; Wed, 12 Apr 2017 15:56:14 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id q125so7300910wmd.3 for ; Wed, 12 Apr 2017 08:56:14 -0700 (PDT) In-Reply-To: <20170412155556.6602-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 PHJvYmVydEBzaXhieW5pbmUub3JnPgpSZXZpZXdlZC1ieTogTWF0dGhldyBBdWxkIDxtYXR0aGV3 LmF1bGRAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggIHwg MTEgKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wZXJmLmMgfCA0NiArKysr KysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDMy IGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmlu ZGV4IDFhZjRlNmY1NDEwYy4uMmY4YTdhNGYyOWRmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgK QEAgLTI0NjYsNiArMjQ2NiwxNyBAQCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSB7CiAJCQkJdTgg KnZhZGRyOwogCQkJCWludCBmb3JtYXQ7CiAJCQkJaW50IGZvcm1hdF9zaXplOworCisJCQkJLyoq CisJCQkJICogQWx0aG91Z2ggd2UgY2FuIGFsd2F5cyByZWFkIGJhY2sgdGhlIGhlYWQKKwkJCQkg KiBwb2ludGVyIHJlZ2lzdGVyLCB3ZSBwcmVmZXIgdG8gYXZvaWQKKwkJCQkgKiB0cnVzdGluZyB0 aGUgSFcgc3RhdGUsIGp1c3QgdG8gYXZvaWQgYW55CisJCQkJICogcmlzayB0aGF0IHNvbWUgaGFy ZHdhcmUgY29uZGl0aW9uIGNvdWxkCisJCQkJICogc29tZWhvdyBidW1wIHRoZSBoZWFkIHBvaW50 ZXIgdW5wcmVkaWN0YWJseQorCQkJCSAqIGFuZCBjYXVzZSB1cyB0byBmb3J3YXJkIHRoZSB3cm9u ZyBPQSBidWZmZXIKKwkJCQkgKiBkYXRhIHRvIHVzZXJzcGFjZS4KKwkJCQkgKi8KKwkJCQl1MzIg aGVhZDsKIAkJCX0gb2FfYnVmZmVyOwogCiAJCQl1MzIgZ2VuN19sYXRjaGVkX29hc3RhdHVzMTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGVyZi5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9wZXJmLmMKaW5kZXggZjU5ZjZkZDIwOTIyLi5mNDdkMWNjMjE0NGIg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGVyZi5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfcGVyZi5jCkBAIC0zMjIsOSArMzIyLDggQEAgc3RydWN0IHBl cmZfb3Blbl9wcm9wZXJ0aWVzIHsKIHN0YXRpYyBib29sIGdlbjdfb2FfYnVmZmVyX2lzX2VtcHR5 X2ZvcF91bmxvY2tlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJaW50 IHJlcG9ydF9zaXplID0gZGV2X3ByaXYtPnBlcmYub2Eub2FfYnVmZmVyLmZvcm1hdF9zaXplOwot CXUzMiBvYXN0YXR1czIgPSBJOTE1X1JFQUQoR0VON19PQVNUQVRVUzIpOwogCXUzMiBvYXN0YXR1 czEgPSBJOTE1X1JFQUQoR0VON19PQVNUQVRVUzEpOwotCXUzMiBoZWFkID0gb2FzdGF0dXMyICYg R0VON19PQVNUQVRVUzJfSEVBRF9NQVNLOworCXUzMiBoZWFkID0gZGV2X3ByaXYtPnBlcmYub2Eu b2FfYnVmZmVyLmhlYWQ7CiAJdTMyIHRhaWwgPSBvYXN0YXR1czEgJiBHRU43X09BU1RBVFVTMV9U QUlMX01BU0s7CiAKIAlyZXR1cm4gT0FfVEFLRU4odGFpbCwgaGVhZCkgPApAQCAtNDU4LDE2ICs0 NTcsMjQgQEAgc3RhdGljIGludCBnZW43X2FwcGVuZF9vYV9yZXBvcnRzKHN0cnVjdCBpOTE1X3Bl cmZfc3RyZWFtICpzdHJlYW0sCiAJCXJldHVybiAtRUlPOwogCiAJaGVhZCA9ICpoZWFkX3B0ciAt IGd0dF9vZmZzZXQ7CisKKwkvKiBBbiBvdXQgb2YgYm91bmRzIG9yIG1pc2FsaWduZWQgaGVhZCBw b2ludGVyIGltcGxpZXMgYSBkcml2ZXIgYnVnCisJICogc2luY2Ugd2UgYXJlIGluIGZ1bGwgY29u dHJvbCBvZiBoZWFkIHBvaW50ZXIgd2hpY2ggc2hvdWxkIG9ubHkKKwkgKiBiZSBpbmNyZW1lbnRl ZCBieSBtdWx0aXBsZXMgb2YgdGhlIHJlcG9ydCBzaXplIChub3RhYmx5IGFsc28KKwkgKiBhbGwg YSBwb3dlciBvZiB0d28pLgorCSAqLworCWlmIChXQVJOX09OQ0UoaGVhZCA+IE9BX0JVRkZFUl9T SVpFIHx8IGhlYWQgJSByZXBvcnRfc2l6ZSwKKwkJICAgICAgIkluY29uc2lzdGVudCBPQSBidWZm ZXIgaGVhZCBwb2ludGVyID0gJXVcbiIsIGhlYWQpKQorCQlyZXR1cm4gLUVJTzsKKwogCXRhaWwg LT0gZ3R0X29mZnNldDsKIAogCS8qIFRoZSBPQSB1bml0IGlzIGV4cGVjdGVkIHRvIHdyYXAgdGhl IHRhaWwgcG9pbnRlciBhY2NvcmRpbmcgdG8gdGhlIE9BCi0JICogYnVmZmVyIHNpemUgYW5kIHNp bmNlIHdlIHNob3VsZCBuZXZlciB3cml0ZSBhIG1pc2FsaWduZWQgaGVhZAotCSAqIHBvaW50ZXIg d2UgZG9uJ3QgZXhwZWN0IHRvIHJlYWQgb25lIGJhY2sgZWl0aGVyLi4uCisJICogYnVmZmVyIHNp emUKIAkgKi8KLQlpZiAodGFpbCA+IE9BX0JVRkZFUl9TSVpFIHx8IGhlYWQgPiBPQV9CVUZGRVJf U0laRSB8fAotCSAgICBoZWFkICUgcmVwb3J0X3NpemUpIHsKLQkJRFJNX0VSUk9SKCJJbmNvbnNp c3RlbnQgT0EgYnVmZmVyIHBvaW50ZXIgKGhlYWQgPSAldSwgdGFpbCA9ICV1KTogZm9yY2UgcmVz dGFydFxuIiwKLQkJCSAgaGVhZCwgdGFpbCk7CisJaWYgKHRhaWwgPiBPQV9CVUZGRVJfU0laRSkg eworCQlEUk1fRVJST1IoIkluY29uc2lzdGVudCBPQSBidWZmZXIgdGFpbCBwb2ludGVyID0gJXU6 IGZvcmNlIHJlc3RhcnRcbiIsCisJCQkgIHRhaWwpOwogCQlkZXZfcHJpdi0+cGVyZi5vYS5vcHMu b2FfZGlzYWJsZShkZXZfcHJpdik7CiAJCWRldl9wcml2LT5wZXJmLm9hLm9wcy5vYV9lbmFibGUo ZGV2X3ByaXYpOwogCQkqaGVhZF9wdHIgPSBJOTE1X1JFQUQoR0VON19PQVNUQVRVUzIpICYKQEAg LTU2Miw4ICs1NjksNiBAQCBzdGF0aWMgaW50IGdlbjdfb2FfcmVhZChzdHJ1Y3QgaTkxNV9wZXJm X3N0cmVhbSAqc3RyZWFtLAogCQkJc2l6ZV90ICpvZmZzZXQpCiB7CiAJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gc3RyZWFtLT5kZXZfcHJpdjsKLQlpbnQgcmVwb3J0X3NpemUg PSBkZXZfcHJpdi0+cGVyZi5vYS5vYV9idWZmZXIuZm9ybWF0X3NpemU7Ci0JdTMyIG9hc3RhdHVz MjsKIAl1MzIgb2FzdGF0dXMxOwogCXUzMiBoZWFkOwogCXUzMiB0YWlsOwpAQCAtNTcyLDEwICs1 NzcsOSBAQCBzdGF0aWMgaW50IGdlbjdfb2FfcmVhZChzdHJ1Y3QgaTkxNV9wZXJmX3N0cmVhbSAq c3RyZWFtLAogCWlmIChXQVJOX09OKCFkZXZfcHJpdi0+cGVyZi5vYS5vYV9idWZmZXIudmFkZHIp KQogCQlyZXR1cm4gLUVJTzsKIAotCW9hc3RhdHVzMiA9IEk5MTVfUkVBRChHRU43X09BU1RBVFVT Mik7CiAJb2FzdGF0dXMxID0gSTkxNV9SRUFEKEdFTjdfT0FTVEFUVVMxKTsKIAotCWhlYWQgPSBv YXN0YXR1czIgJiBHRU43X09BU1RBVFVTMl9IRUFEX01BU0s7CisJaGVhZCA9IGRldl9wcml2LT5w ZXJmLm9hLm9hX2J1ZmZlci5oZWFkOwogCXRhaWwgPSBvYXN0YXR1czEgJiBHRU43X09BU1RBVFVT MV9UQUlMX01BU0s7CiAKIAkvKiBYWFg6IE9uIEhhc3dlbGwgd2UgZG9uJ3QgaGF2ZSBhIHNhZmUg d2F5IHRvIGNsZWFyIG9hc3RhdHVzMQpAQCAtNjE2LDEwICs2MjAsOSBAQCBzdGF0aWMgaW50IGdl bjdfb2FfcmVhZChzdHJ1Y3QgaTkxNV9wZXJmX3N0cmVhbSAqc3RyZWFtLAogCQlkZXZfcHJpdi0+ cGVyZi5vYS5vcHMub2FfZGlzYWJsZShkZXZfcHJpdik7CiAJCWRldl9wcml2LT5wZXJmLm9hLm9w cy5vYV9lbmFibGUoZGV2X3ByaXYpOwogCi0JCW9hc3RhdHVzMiA9IEk5MTVfUkVBRChHRU43X09B U1RBVFVTMik7CiAJCW9hc3RhdHVzMSA9IEk5MTVfUkVBRChHRU43X09BU1RBVFVTMSk7CiAKLQkJ aGVhZCA9IG9hc3RhdHVzMiAmIEdFTjdfT0FTVEFUVVMyX0hFQURfTUFTSzsKKwkJaGVhZCA9IGRl dl9wcml2LT5wZXJmLm9hLm9hX2J1ZmZlci5oZWFkOwogCQl0YWlsID0gb2FzdGF0dXMxICYgR0VO N19PQVNUQVRVUzFfVEFJTF9NQVNLOwogCX0KIApAQCAtNjM1LDE3ICs2MzgsNiBAQCBzdGF0aWMg aW50IGdlbjdfb2FfcmVhZChzdHJ1Y3QgaTkxNV9wZXJmX3N0cmVhbSAqc3RyZWFtLAogCXJldCA9 IGdlbjdfYXBwZW5kX29hX3JlcG9ydHMoc3RyZWFtLCBidWYsIGNvdW50LCBvZmZzZXQsCiAJCQkJ ICAgICAmaGVhZCwgdGFpbCk7CiAKLQkvKiBBbGwgdGhlIHJlcG9ydCBzaXplcyBhcmUgYSBwb3dl ciBvZiB0d28gYW5kIHRoZQotCSAqIGhlYWQgc2hvdWxkIGFsd2F5cyBiZSBpbmNyZW1lbnRlZCBi eSBzb21lIG11bHRpcGxlCi0JICogb2YgdGhlIHJlcG9ydCBzaXplLgotCSAqCi0JICogQSB3YXJu aW5nIGhlcmUsIGJ1dCBub3RhYmx5IGlmIHdlIGxhdGVyIHJlYWQgYmFjayBhCi0JICogbWlzYWxp Z25lZCBwb2ludGVyIHdlIHdpbGwgdHJlYXQgdGhhdCBhcyBhIGJ1ZyBzaW5jZQotCSAqIGl0IGNv dWxkIGxlYWQgdG8gYSBidWZmZXIgb3ZlcnJ1bi4KLQkgKi8KLQlXQVJOX09OQ0UoaGVhZCAmIChy ZXBvcnRfc2l6ZSAtIDEpLAotCQkgICJpOTE1OiBXcml0aW5nIG1pc2FsaWduZWQgT0EgaGVhZCBw b2ludGVyIik7Ci0KIAkvKiBOb3RlOiB3ZSB1cGRhdGUgdGhlIGhlYWQgcG9pbnRlciBoZXJlIGV2 ZW4gaWYgYW4gZXJyb3IKIAkgKiB3YXMgcmV0dXJuZWQgc2luY2UgdGhlIGVycm9yIG1heSByZXBy ZXNlbnQgYSBzaG9ydCByZWFkCiAJICogd2hlcmUgc29tZSBzb21lIHJlcG9ydHMgd2VyZSBzdWNj ZXNzZnVsbHkgY29waWVkLgpAQCAtNjUzLDYgKzY0NSw3IEBAIHN0YXRpYyBpbnQgZ2VuN19vYV9y ZWFkKHN0cnVjdCBpOTE1X3BlcmZfc3RyZWFtICpzdHJlYW0sCiAJSTkxNV9XUklURShHRU43X09B U1RBVFVTMiwKIAkJICAgKChoZWFkICYgR0VON19PQVNUQVRVUzJfSEVBRF9NQVNLKSB8CiAJCSAg ICBPQV9NRU1fU0VMRUNUX0dHVFQpKTsKKwlkZXZfcHJpdi0+cGVyZi5vYS5vYV9idWZmZXIuaGVh ZCA9IGhlYWQ7CiAKIAlyZXR1cm4gcmV0OwogfQpAQCAtODM0LDcgKzgyNywxMCBAQCBzdGF0aWMg dm9pZCBnZW43X2luaXRfb2FfYnVmZmVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dikKIAkgKiBiZWZvcmUgT0FTVEFUVVMxLCBidXQgYWZ0ZXIgT0FTVEFUVVMyCiAJICovCiAJSTkx NV9XUklURShHRU43X09BU1RBVFVTMiwgZ3R0X29mZnNldCB8IE9BX01FTV9TRUxFQ1RfR0dUVCk7 IC8qIGhlYWQgKi8KKwlkZXZfcHJpdi0+cGVyZi5vYS5vYV9idWZmZXIuaGVhZCA9IGd0dF9vZmZz ZXQ7CisKIAlJOTE1X1dSSVRFKEdFTjdfT0FCVUZGRVIsIGd0dF9vZmZzZXQpOworCiAJSTkxNV9X UklURShHRU43X09BU1RBVFVTMSwgZ3R0X29mZnNldCB8IE9BQlVGRkVSX1NJWkVfMTZNKTsgLyog dGFpbCAqLwogCiAJLyogT24gSGFzd2VsbCB3ZSBoYXZlIHRvIHRyYWNrIHdoaWNoIE9BU1RBVFVT MSBmbGFncyB3ZSd2ZQotLSAKMi4xMi4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK