From: Robert Bragg Subject: [PATCH v4 04/15] drm/i915/perf: no head/tail ref in gen7_oa_read Date: Wed, 12 Apr 2017 16:55:45 +0100 Message-ID: <20170412155556.6602-5-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-pg0-x244.google.com (mail-pg0-x244.google.com [IPv6:2607:f8b0:400e:c05::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5F8CF89306 for ; Wed, 12 Apr 2017 15:56:18 +0000 (UTC) Received: by mail-pg0-x244.google.com with SMTP id 34so3293182pgx.3 for ; Wed, 12 Apr 2017 08:56:18 -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 VGhpcyBhdm9pZHMgcmVkdW5kYW50bHkgcGFzc2luZyBhbiAoaW5vdXQpIGhlYWQgYW5kIHRhaWwg cG9pbnRlciB0bwpnZW43X2FwcGVuZF9vYV9yZXBvcnRzKCkgZnJvbSBnZW43X29hX3JlYWQgd2hp Y2ggZG9lc24ndCBuZWVkIHRvCnJlZmVyZW5jZSBlaXRoZXIgaXRzZWxmLgoKTW92aW5nIHRoZSBo ZWFkL3RhaWwgcmVhZHMgYW5kIHdyaXRlcyBpbnRvIGdlbjdfYXBwZW5kX29hX3JlcG9ydHMgc2hv dWxkCmhhdmUgbm8gZnVuY3Rpb25hbCBlZmZlY3QgZXhjZXB0IHRvIGF2b2lkIHNvbWUgcmVkdW5k YW50IGhlYWQgcG9pbnRlcgp3cml0ZXMgaW4gY2FzZXMgd2hlcmUgbm90aGluZyB3YXMgY29waWVk IHRvIHVzZXJzcGFjZS4KClRoaXMgaXMgYSBzdGVwcGluZyBzdG9uZSB0b3dhcmRzIHVwZGF0aW5n IGhvdyB0aGUgaGVhZCBhbmQgdGFpbCBwb2ludGVyCnN0YXRlIGlzIG1hbmFnZWQgdG8gaW1wcm92 ZSB0aGUgd29ya2Fyb3VuZCBmb3IgdGhlIE9BIHVuaXQncyB0YWlsCnBvaW50ZXIgcmFjZS4gSXQg cmVkdWNlcyB0aGUgbnVtYmVyIG9mIHBsYWNlcyB3ZSBuZWVkIHRvIHJlYWQvd3JpdGUgdGhlCmhl YWQgYW5kIHRhaWwgcG9pbnRlcnMuCgpTaWduZWQtb2ZmLWJ5OiBSb2JlcnQgQnJhZ2cgPHJvYmVy dEBzaXhieW5pbmUub3JnPgpSZXZpZXdlZC1ieTogTWF0dGhldyBBdWxkIDxtYXR0aGV3LmF1bGRA aW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGVyZi5jIHwgNTEgKysr KysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE5 IGluc2VydGlvbnMoKyksIDMyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfcGVyZi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wZXJmLmMK aW5kZXggZjQ3ZDFjYzIxNDRiLi44M2RjNjdhNjM1ZmIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfcGVyZi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGVy Zi5jCkBAIC00MjAsOCArNDIwLDYgQEAgc3RhdGljIGludCBhcHBlbmRfb2Ffc2FtcGxlKHN0cnVj dCBpOTE1X3BlcmZfc3RyZWFtICpzdHJlYW0sCiAgKiBAYnVmOiBkZXN0aW5hdGlvbiBidWZmZXIg Z2l2ZW4gYnkgdXNlcnNwYWNlCiAgKiBAY291bnQ6IHRoZSBudW1iZXIgb2YgYnl0ZXMgdXNlcnNw YWNlIHdhbnRzIHRvIHJlYWQKICAqIEBvZmZzZXQ6IChpbm91dCk6IHRoZSBjdXJyZW50IHBvc2l0 aW9uIGZvciB3cml0aW5nIGludG8gQGJ1ZgotICogQGhlYWRfcHRyOiAoaW5vdXQpOiB0aGUgY3Vy cmVudCBvYSBidWZmZXIgY3B1IHJlYWQgcG9zaXRpb24KLSAqIEB0YWlsOiB0aGUgY3VycmVudCBv YSBidWZmZXIgZ3B1IHdyaXRlIHBvc2l0aW9uCiAgKgogICogTm90YWJseSBhbnkgZXJyb3IgY29u ZGl0aW9uIHJlc3VsdGluZyBpbiBhIHNob3J0IHJlYWQgKC0lRU5PU1BDIG9yCiAgKiAtJUVGQVVM VCkgd2lsbCBiZSByZXR1cm5lZCBldmVuIHRob3VnaCBvbmUgb3IgbW9yZSByZWNvcmRzIG1heQpA QCAtNDM5LDkgKzQzNyw3IEBAIHN0YXRpYyBpbnQgYXBwZW5kX29hX3NhbXBsZShzdHJ1Y3QgaTkx NV9wZXJmX3N0cmVhbSAqc3RyZWFtLAogc3RhdGljIGludCBnZW43X2FwcGVuZF9vYV9yZXBvcnRz KHN0cnVjdCBpOTE1X3BlcmZfc3RyZWFtICpzdHJlYW0sCiAJCQkJICBjaGFyIF9fdXNlciAqYnVm LAogCQkJCSAgc2l6ZV90IGNvdW50LAotCQkJCSAgc2l6ZV90ICpvZmZzZXQsCi0JCQkJICB1MzIg KmhlYWRfcHRyLAotCQkJCSAgdTMyIHRhaWwpCisJCQkJICBzaXplX3QgKm9mZnNldCkKIHsKIAlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBzdHJlYW0tPmRldl9wcml2OwogCWlu dCByZXBvcnRfc2l6ZSA9IGRldl9wcml2LT5wZXJmLm9hLm9hX2J1ZmZlci5mb3JtYXRfc2l6ZTsK QEAgLTQ0OSwxNCArNDQ1LDE1IEBAIHN0YXRpYyBpbnQgZ2VuN19hcHBlbmRfb2FfcmVwb3J0cyhz dHJ1Y3QgaTkxNV9wZXJmX3N0cmVhbSAqc3RyZWFtLAogCWludCB0YWlsX21hcmdpbiA9IGRldl9w cml2LT5wZXJmLm9hLnRhaWxfbWFyZ2luOwogCXUzMiBndHRfb2Zmc2V0ID0gaTkxNV9nZ3R0X29m ZnNldChkZXZfcHJpdi0+cGVyZi5vYS5vYV9idWZmZXIudm1hKTsKIAl1MzIgbWFzayA9IChPQV9C VUZGRVJfU0laRSAtIDEpOwotCXUzMiBoZWFkOworCXNpemVfdCBzdGFydF9vZmZzZXQgPSAqb2Zm c2V0OworCXUzMiBoZWFkLCBvYXN0YXR1czEsIHRhaWw7CiAJdTMyIHRha2VuOwogCWludCByZXQg PSAwOwogCiAJaWYgKFdBUk5fT04oIXN0cmVhbS0+ZW5hYmxlZCkpCiAJCXJldHVybiAtRUlPOwog Ci0JaGVhZCA9ICpoZWFkX3B0ciAtIGd0dF9vZmZzZXQ7CisJaGVhZCA9IGRldl9wcml2LT5wZXJm Lm9hLm9hX2J1ZmZlci5oZWFkIC0gZ3R0X29mZnNldDsKIAogCS8qIEFuIG91dCBvZiBib3VuZHMg b3IgbWlzYWxpZ25lZCBoZWFkIHBvaW50ZXIgaW1wbGllcyBhIGRyaXZlciBidWcKIAkgKiBzaW5j ZSB3ZSBhcmUgaW4gZnVsbCBjb250cm9sIG9mIGhlYWQgcG9pbnRlciB3aGljaCBzaG91bGQgb25s eQpAQCAtNDY3LDcgKzQ2NCw4IEBAIHN0YXRpYyBpbnQgZ2VuN19hcHBlbmRfb2FfcmVwb3J0cyhz dHJ1Y3QgaTkxNV9wZXJmX3N0cmVhbSAqc3RyZWFtLAogCQkgICAgICAiSW5jb25zaXN0ZW50IE9B IGJ1ZmZlciBoZWFkIHBvaW50ZXIgPSAldVxuIiwgaGVhZCkpCiAJCXJldHVybiAtRUlPOwogCi0J dGFpbCAtPSBndHRfb2Zmc2V0OworCW9hc3RhdHVzMSA9IEk5MTVfUkVBRChHRU43X09BU1RBVFVT MSk7CisJdGFpbCA9IChvYXN0YXR1czEgJiBHRU43X09BU1RBVFVTMV9UQUlMX01BU0spIC0gZ3R0 X29mZnNldDsKIAogCS8qIFRoZSBPQSB1bml0IGlzIGV4cGVjdGVkIHRvIHdyYXAgdGhlIHRhaWwg cG9pbnRlciBhY2NvcmRpbmcgdG8gdGhlIE9BCiAJICogYnVmZmVyIHNpemUKQEAgLTQ3Nyw4ICs0 NzUsNiBAQCBzdGF0aWMgaW50IGdlbjdfYXBwZW5kX29hX3JlcG9ydHMoc3RydWN0IGk5MTVfcGVy Zl9zdHJlYW0gKnN0cmVhbSwKIAkJCSAgdGFpbCk7CiAJCWRldl9wcml2LT5wZXJmLm9hLm9wcy5v YV9kaXNhYmxlKGRldl9wcml2KTsKIAkJZGV2X3ByaXYtPnBlcmYub2Eub3BzLm9hX2VuYWJsZShk ZXZfcHJpdik7Ci0JCSpoZWFkX3B0ciA9IEk5MTVfUkVBRChHRU43X09BU1RBVFVTMikgJgotCQkJ R0VON19PQVNUQVRVUzJfSEVBRF9NQVNLOwogCQlyZXR1cm4gLUVJTzsKIAl9CiAKQEAgLTU0Miw3 ICs1MzgsMTggQEAgc3RhdGljIGludCBnZW43X2FwcGVuZF9vYV9yZXBvcnRzKHN0cnVjdCBpOTE1 X3BlcmZfc3RyZWFtICpzdHJlYW0sCiAJCXJlcG9ydDMyWzBdID0gMDsKIAl9CiAKLQkqaGVhZF9w dHIgPSBndHRfb2Zmc2V0ICsgaGVhZDsKKworCWlmIChzdGFydF9vZmZzZXQgIT0gKm9mZnNldCkg eworCQkvKiBXZSByZW1vdmVkIHRoZSBndHRfb2Zmc2V0IGZvciB0aGUgY29weSBsb29wIGFib3Zl LCBpbmRleGluZworCQkgKiByZWxhdGl2ZSB0byBvYV9idWZfYmFzZSBzbyBwdXQgYmFjayBoZXJl Li4uCisJCSAqLworCQloZWFkICs9IGd0dF9vZmZzZXQ7CisKKwkJSTkxNV9XUklURShHRU43X09B U1RBVFVTMiwKKwkJCSAgICgoaGVhZCAmIEdFTjdfT0FTVEFUVVMyX0hFQURfTUFTSykgfAorCQkJ ICAgIE9BX01FTV9TRUxFQ1RfR0dUVCkpOworCQlkZXZfcHJpdi0+cGVyZi5vYS5vYV9idWZmZXIu aGVhZCA9IGhlYWQ7CisJfQogCiAJcmV0dXJuIHJldDsKIH0KQEAgLTU3MCw4ICs1NzcsNiBAQCBz dGF0aWMgaW50IGdlbjdfb2FfcmVhZChzdHJ1Y3QgaTkxNV9wZXJmX3N0cmVhbSAqc3RyZWFtLAog ewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHN0cmVhbS0+ZGV2X3ByaXY7 CiAJdTMyIG9hc3RhdHVzMTsKLQl1MzIgaGVhZDsKLQl1MzIgdGFpbDsKIAlpbnQgcmV0OwogCiAJ aWYgKFdBUk5fT04oIWRldl9wcml2LT5wZXJmLm9hLm9hX2J1ZmZlci52YWRkcikpCkBAIC01Nzks OSArNTg0LDYgQEAgc3RhdGljIGludCBnZW43X29hX3JlYWQoc3RydWN0IGk5MTVfcGVyZl9zdHJl YW0gKnN0cmVhbSwKIAogCW9hc3RhdHVzMSA9IEk5MTVfUkVBRChHRU43X09BU1RBVFVTMSk7CiAK LQloZWFkID0gZGV2X3ByaXYtPnBlcmYub2Eub2FfYnVmZmVyLmhlYWQ7Ci0JdGFpbCA9IG9hc3Rh dHVzMSAmIEdFTjdfT0FTVEFUVVMxX1RBSUxfTUFTSzsKLQogCS8qIFhYWDogT24gSGFzd2VsbCB3 ZSBkb24ndCBoYXZlIGEgc2FmZSB3YXkgdG8gY2xlYXIgb2FzdGF0dXMxCiAJICogYml0cyB3aGls ZSB0aGUgT0EgdW5pdCBpcyBlbmFibGVkICh3aGlsZSB0aGUgdGFpbCBwb2ludGVyCiAJICogbWF5 IGJlIHVwZGF0ZWQgYXN5bmNocm9ub3VzbHkpIHNvIHdlIGlnbm9yZSBzdGF0dXMgYml0cwpAQCAt NjIxLDkgKzYyMyw2IEBAIHN0YXRpYyBpbnQgZ2VuN19vYV9yZWFkKHN0cnVjdCBpOTE1X3BlcmZf c3RyZWFtICpzdHJlYW0sCiAJCWRldl9wcml2LT5wZXJmLm9hLm9wcy5vYV9lbmFibGUoZGV2X3By aXYpOwogCiAJCW9hc3RhdHVzMSA9IEk5MTVfUkVBRChHRU43X09BU1RBVFVTMSk7Ci0KLQkJaGVh ZCA9IGRldl9wcml2LT5wZXJmLm9hLm9hX2J1ZmZlci5oZWFkOwotCQl0YWlsID0gb2FzdGF0dXMx ICYgR0VON19PQVNUQVRVUzFfVEFJTF9NQVNLOwogCX0KIAogCWlmICh1bmxpa2VseShvYXN0YXR1 czEgJiBHRU43X09BU1RBVFVTMV9SRVBPUlRfTE9TVCkpIHsKQEAgLTYzNSwxOSArNjM0LDcgQEAg c3RhdGljIGludCBnZW43X29hX3JlYWQoc3RydWN0IGk5MTVfcGVyZl9zdHJlYW0gKnN0cmVhbSwK IAkJCUdFTjdfT0FTVEFUVVMxX1JFUE9SVF9MT1NUOwogCX0KIAotCXJldCA9IGdlbjdfYXBwZW5k X29hX3JlcG9ydHMoc3RyZWFtLCBidWYsIGNvdW50LCBvZmZzZXQsCi0JCQkJICAgICAmaGVhZCwg dGFpbCk7Ci0KLQkvKiBOb3RlOiB3ZSB1cGRhdGUgdGhlIGhlYWQgcG9pbnRlciBoZXJlIGV2ZW4g aWYgYW4gZXJyb3IKLQkgKiB3YXMgcmV0dXJuZWQgc2luY2UgdGhlIGVycm9yIG1heSByZXByZXNl bnQgYSBzaG9ydCByZWFkCi0JICogd2hlcmUgc29tZSBzb21lIHJlcG9ydHMgd2VyZSBzdWNjZXNz ZnVsbHkgY29waWVkLgotCSAqLwotCUk5MTVfV1JJVEUoR0VON19PQVNUQVRVUzIsCi0JCSAgICgo aGVhZCAmIEdFTjdfT0FTVEFUVVMyX0hFQURfTUFTSykgfAotCQkgICAgT0FfTUVNX1NFTEVDVF9H R1RUKSk7Ci0JZGV2X3ByaXYtPnBlcmYub2Eub2FfYnVmZmVyLmhlYWQgPSBoZWFkOwotCi0JcmV0 dXJuIHJldDsKKwlyZXR1cm4gZ2VuN19hcHBlbmRfb2FfcmVwb3J0cyhzdHJlYW0sIGJ1ZiwgY291 bnQsIG9mZnNldCk7CiB9CiAKIC8qKgotLSAKMi4xMi4wCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK