From: Robert Bragg Subject: [PATCH 4/5] drm/i915/perf: no head/tail ref in gen7_oa_read Date: Mon, 23 Jan 2017 17:25:47 -0800 Message-ID: <20170124012548.12603-5-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-pg0-x243.google.com (mail-pg0-x243.google.com [IPv6:2607:f8b0:400e:c05::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8BFC96E6A3 for ; Tue, 24 Jan 2017 01:26:38 +0000 (UTC) Received: by mail-pg0-x243.google.com with SMTP id 194so15089838pgd.0 for ; Mon, 23 Jan 2017 17:26:38 -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 VGhpcyBhdm9pZHMgcmVkdW5kYW50bHkgcGFzc2luZyBhbiAoaW5vdXQpIGhlYWQgYW5kIHRhaWwg cG9pbnRlciB0bwpnZW43X2FwcGVuZF9vYV9yZXBvcnRzKCkgZnJvbSBnZW43X29hX3JlYWQgd2hp Y2ggZG9lc24ndCBuZWVkIHRvCnJlZmVyZW5jZSBlaXRoZXIgaXRzZWxmLgoKTW92aW5nIHRoZSBo ZWFkL3RhaWwgcmVhZHMgYW5kIHdyaXRlcyBpbnRvIGdlbjdfYXBwZW5kX29hX3JlcG9ydHMgc2hv dWxkCmhhdmUgbm8gZnVuY3Rpb25hbCBlZmZlY3QgZXhjZXB0IHRvIGF2b2lkIHNvbWUgcmVkdW5k YW50IGhlYWQgcG9pbnRlcgp3cml0ZXMgaW4gY2FzZXMgd2hlcmUgbm90aGluZyB3YXMgY29waWVk IHRvIHVzZXJzcGFjZS4KClRoaXMgaXMgYSBzdGVwcGluZyBzdG9uZSB0b3dhcmRzIHVwZGF0aW5n IGhvdyB0aGUgaGVhZCBhbmQgdGFpbCBwb2ludGVyCnN0YXRlIGlzIG1hbmFnZWQgdG8gaW1wcm92 ZSB0aGUgd29ya2Fyb3VuZCBmb3IgdGhlIE9BIHVuaXQncyB0YWlsCnBvaW50ZXIgcmFjZS4gSXQg cmVkdWNlcyB0aGUgbnVtYmVyIG9mIHBsYWNlcyB3ZSBuZWVkIHRvIHJlYWQvd3JpdGUgdGhlCmhl YWQgYW5kIHRhaWwgcG9pbnRlcnMuCgpTaWduZWQtb2ZmLWJ5OiBSb2JlcnQgQnJhZ2cgPHJvYmVy dEBzaXhieW5pbmUub3JnPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGVyZi5jIHwg NTEgKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5n ZWQsIDE5IGluc2VydGlvbnMoKyksIDMyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfcGVyZi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9w ZXJmLmMKaW5kZXggZTg1NTgzZDBiY2ZmLi40YjNiYWJkYmQ3OWUgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfcGVyZi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfcGVyZi5jCkBAIC00MjAsOCArNDIwLDYgQEAgc3RhdGljIGludCBhcHBlbmRfb2Ffc2FtcGxl KHN0cnVjdCBpOTE1X3BlcmZfc3RyZWFtICpzdHJlYW0sCiAgKiBAYnVmOiBkZXN0aW5hdGlvbiBi dWZmZXIgZ2l2ZW4gYnkgdXNlcnNwYWNlCiAgKiBAY291bnQ6IHRoZSBudW1iZXIgb2YgYnl0ZXMg dXNlcnNwYWNlIHdhbnRzIHRvIHJlYWQKICAqIEBvZmZzZXQ6IChpbm91dCk6IHRoZSBjdXJyZW50 IHBvc2l0aW9uIGZvciB3cml0aW5nIGludG8gQGJ1ZgotICogQGhlYWRfcHRyOiAoaW5vdXQpOiB0 aGUgY3VycmVudCBvYSBidWZmZXIgY3B1IHJlYWQgcG9zaXRpb24KLSAqIEB0YWlsOiB0aGUgY3Vy cmVudCBvYSBidWZmZXIgZ3B1IHdyaXRlIHBvc2l0aW9uCiAgKgogICogTm90YWJseSBhbnkgZXJy b3IgY29uZGl0aW9uIHJlc3VsdGluZyBpbiBhIHNob3J0IHJlYWQgKC0lRU5PU1BDIG9yCiAgKiAt JUVGQVVMVCkgd2lsbCBiZSByZXR1cm5lZCBldmVuIHRob3VnaCBvbmUgb3IgbW9yZSByZWNvcmRz IG1heQpAQCAtNDM5LDkgKzQzNyw3IEBAIHN0YXRpYyBpbnQgYXBwZW5kX29hX3NhbXBsZShzdHJ1 Y3QgaTkxNV9wZXJmX3N0cmVhbSAqc3RyZWFtLAogc3RhdGljIGludCBnZW43X2FwcGVuZF9vYV9y ZXBvcnRzKHN0cnVjdCBpOTE1X3BlcmZfc3RyZWFtICpzdHJlYW0sCiAJCQkJICBjaGFyIF9fdXNl ciAqYnVmLAogCQkJCSAgc2l6ZV90IGNvdW50LAotCQkJCSAgc2l6ZV90ICpvZmZzZXQsCi0JCQkJ ICB1MzIgKmhlYWRfcHRyLAotCQkJCSAgdTMyIHRhaWwpCisJCQkJICBzaXplX3QgKm9mZnNldCkK IHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBzdHJlYW0tPmRldl9wcml2 OwogCWludCByZXBvcnRfc2l6ZSA9IGRldl9wcml2LT5wZXJmLm9hLm9hX2J1ZmZlci5mb3JtYXRf c2l6ZTsKQEAgLTQ0OSwxNCArNDQ1LDE1IEBAIHN0YXRpYyBpbnQgZ2VuN19hcHBlbmRfb2FfcmVw b3J0cyhzdHJ1Y3QgaTkxNV9wZXJmX3N0cmVhbSAqc3RyZWFtLAogCWludCB0YWlsX21hcmdpbiA9 IGRldl9wcml2LT5wZXJmLm9hLnRhaWxfbWFyZ2luOwogCXUzMiBndHRfb2Zmc2V0ID0gaTkxNV9n Z3R0X29mZnNldChkZXZfcHJpdi0+cGVyZi5vYS5vYV9idWZmZXIudm1hKTsKIAl1MzIgbWFzayA9 IChPQV9CVUZGRVJfU0laRSAtIDEpOwotCXUzMiBoZWFkOworCXNpemVfdCBzdGFydF9vZmZzZXQg PSAqb2Zmc2V0OworCXUzMiBoZWFkLCBvYXN0YXR1czEsIHRhaWw7CiAJdTMyIHRha2VuOwogCWlu dCByZXQgPSAwOwogCiAJaWYgKFdBUk5fT04oIXN0cmVhbS0+ZW5hYmxlZCkpCiAJCXJldHVybiAt RUlPOwogCi0JaGVhZCA9ICpoZWFkX3B0ciAtIGd0dF9vZmZzZXQ7CisJaGVhZCA9IGRldl9wcml2 LT5wZXJmLm9hLm9hX2J1ZmZlci5oZWFkIC0gZ3R0X29mZnNldDsKIAogCS8qIEFuIG91dCBvZiBi b3VuZHMgb3IgbWlzYWxpZ25lZCBoZWFkIHBvaW50ZXIgaW1wbGllcyBhIGRyaXZlciBidWcKIAkg KiBzaW5jZSB3ZSBhcmUgaW4gZnVsbCBjb250cm9sIG9mIGhlYWQgcG9pbnRlciB3aGljaCBzaG91 bGQgb25seQpAQCAtNDY3LDcgKzQ2NCw4IEBAIHN0YXRpYyBpbnQgZ2VuN19hcHBlbmRfb2FfcmVw b3J0cyhzdHJ1Y3QgaTkxNV9wZXJmX3N0cmVhbSAqc3RyZWFtLAogCQkgICAgICAiSW5jb25zaXN0 ZW50IE9BIGJ1ZmZlciBoZWFkIHBvaW50ZXIgPSAldVxuIiwgaGVhZCkpCiAJCXJldHVybiAtRUlP OwogCi0JdGFpbCAtPSBndHRfb2Zmc2V0OworCW9hc3RhdHVzMSA9IEk5MTVfUkVBRChHRU43X09B U1RBVFVTMSk7CisJdGFpbCA9IChvYXN0YXR1czEgJiBHRU43X09BU1RBVFVTMV9UQUlMX01BU0sp IC0gZ3R0X29mZnNldDsKIAogCS8qIFRoZSBPQSB1bml0IGlzIGV4cGVjdGVkIHRvIHdyYXAgdGhl IHRhaWwgcG9pbnRlciBhY2NvcmRpbmcgdG8gdGhlIE9BCiAJICogYnVmZmVyIHNpemUKQEAgLTQ3 Nyw4ICs0NzUsNiBAQCBzdGF0aWMgaW50IGdlbjdfYXBwZW5kX29hX3JlcG9ydHMoc3RydWN0IGk5 MTVfcGVyZl9zdHJlYW0gKnN0cmVhbSwKIAkJCSAgdGFpbCk7CiAJCWRldl9wcml2LT5wZXJmLm9h Lm9wcy5vYV9kaXNhYmxlKGRldl9wcml2KTsKIAkJZGV2X3ByaXYtPnBlcmYub2Eub3BzLm9hX2Vu YWJsZShkZXZfcHJpdik7Ci0JCSpoZWFkX3B0ciA9IEk5MTVfUkVBRChHRU43X09BU1RBVFVTMikg JgotCQkJR0VON19PQVNUQVRVUzJfSEVBRF9NQVNLOwogCQlyZXR1cm4gLUVJTzsKIAl9CiAKQEAg LTU0Miw3ICs1MzgsMTggQEAgc3RhdGljIGludCBnZW43X2FwcGVuZF9vYV9yZXBvcnRzKHN0cnVj dCBpOTE1X3BlcmZfc3RyZWFtICpzdHJlYW0sCiAJCXJlcG9ydDMyWzBdID0gMDsKIAl9CiAKLQkq aGVhZF9wdHIgPSBndHRfb2Zmc2V0ICsgaGVhZDsKKworCWlmIChzdGFydF9vZmZzZXQgIT0gKm9m ZnNldCkgeworCQkvKiBXZSByZW1vdmVkIHRoZSBndHRfb2Zmc2V0IGZvciB0aGUgY29weSBsb29w IGFib3ZlLCBpbmRleGluZworCQkgKiByZWxhdGl2ZSB0byBvYV9idWZfYmFzZSBzbyBwdXQgYmFj ayBoZXJlLi4uCisJCSAqLworCQloZWFkICs9IGd0dF9vZmZzZXQ7CisKKwkJSTkxNV9XUklURShH RU43X09BU1RBVFVTMiwKKwkJCSAgICgoaGVhZCAmIEdFTjdfT0FTVEFUVVMyX0hFQURfTUFTSykg fAorCQkJICAgIE9BX01FTV9TRUxFQ1RfR0dUVCkpOworCQlkZXZfcHJpdi0+cGVyZi5vYS5vYV9i dWZmZXIuaGVhZCA9IGhlYWQ7CisJfQogCiAJcmV0dXJuIHJldDsKIH0KQEAgLTU3MCw4ICs1Nzcs NiBAQCBzdGF0aWMgaW50IGdlbjdfb2FfcmVhZChzdHJ1Y3QgaTkxNV9wZXJmX3N0cmVhbSAqc3Ry ZWFtLAogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHN0cmVhbS0+ZGV2 X3ByaXY7CiAJdTMyIG9hc3RhdHVzMTsKLQl1MzIgaGVhZDsKLQl1MzIgdGFpbDsKIAlpbnQgcmV0 OwogCiAJaWYgKFdBUk5fT04oIWRldl9wcml2LT5wZXJmLm9hLm9hX2J1ZmZlci52YWRkcikpCkBA IC01NzksOSArNTg0LDYgQEAgc3RhdGljIGludCBnZW43X29hX3JlYWQoc3RydWN0IGk5MTVfcGVy Zl9zdHJlYW0gKnN0cmVhbSwKIAogCW9hc3RhdHVzMSA9IEk5MTVfUkVBRChHRU43X09BU1RBVFVT MSk7CiAKLQloZWFkID0gZGV2X3ByaXYtPnBlcmYub2Eub2FfYnVmZmVyLmhlYWQ7Ci0JdGFpbCA9 IG9hc3RhdHVzMSAmIEdFTjdfT0FTVEFUVVMxX1RBSUxfTUFTSzsKLQogCS8qIFhYWDogT24gSGFz d2VsbCB3ZSBkb24ndCBoYXZlIGEgc2FmZSB3YXkgdG8gY2xlYXIgb2FzdGF0dXMxCiAJICogYml0 cyB3aGlsZSB0aGUgT0EgdW5pdCBpcyBlbmFibGVkICh3aGlsZSB0aGUgdGFpbCBwb2ludGVyCiAJ ICogbWF5IGJlIHVwZGF0ZWQgYXN5bmNocm9ub3VzbHkpIHNvIHdlIGlnbm9yZSBzdGF0dXMgYml0 cwpAQCAtNjIxLDkgKzYyMyw2IEBAIHN0YXRpYyBpbnQgZ2VuN19vYV9yZWFkKHN0cnVjdCBpOTE1 X3BlcmZfc3RyZWFtICpzdHJlYW0sCiAJCWRldl9wcml2LT5wZXJmLm9hLm9wcy5vYV9lbmFibGUo ZGV2X3ByaXYpOwogCiAJCW9hc3RhdHVzMSA9IEk5MTVfUkVBRChHRU43X09BU1RBVFVTMSk7Ci0K LQkJaGVhZCA9IGRldl9wcml2LT5wZXJmLm9hLm9hX2J1ZmZlci5oZWFkOwotCQl0YWlsID0gb2Fz dGF0dXMxICYgR0VON19PQVNUQVRVUzFfVEFJTF9NQVNLOwogCX0KIAogCWlmICh1bmxpa2VseShv YXN0YXR1czEgJiBHRU43X09BU1RBVFVTMV9SRVBPUlRfTE9TVCkpIHsKQEAgLTYzNSwxOSArNjM0 LDcgQEAgc3RhdGljIGludCBnZW43X29hX3JlYWQoc3RydWN0IGk5MTVfcGVyZl9zdHJlYW0gKnN0 cmVhbSwKIAkJCUdFTjdfT0FTVEFUVVMxX1JFUE9SVF9MT1NUOwogCX0KIAotCXJldCA9IGdlbjdf YXBwZW5kX29hX3JlcG9ydHMoc3RyZWFtLCBidWYsIGNvdW50LCBvZmZzZXQsCi0JCQkJICAgICAm aGVhZCwgdGFpbCk7Ci0KLQkvKiBOb3RlOiB3ZSB1cGRhdGUgdGhlIGhlYWQgcG9pbnRlciBoZXJl IGV2ZW4gaWYgYW4gZXJyb3IKLQkgKiB3YXMgcmV0dXJuZWQgc2luY2UgdGhlIGVycm9yIG1heSBy ZXByZXNlbnQgYSBzaG9ydCByZWFkCi0JICogd2hlcmUgc29tZSBzb21lIHJlcG9ydHMgd2VyZSBz dWNjZXNzZnVsbHkgY29waWVkLgotCSAqLwotCUk5MTVfV1JJVEUoR0VON19PQVNUQVRVUzIsCi0J CSAgICgoaGVhZCAmIEdFTjdfT0FTVEFUVVMyX0hFQURfTUFTSykgfAotCQkgICAgT0FfTUVNX1NF TEVDVF9HR1RUKSk7Ci0JZGV2X3ByaXYtPnBlcmYub2Eub2FfYnVmZmVyLmhlYWQgPSBoZWFkOwot Ci0JcmV0dXJuIHJldDsKKwlyZXR1cm4gZ2VuN19hcHBlbmRfb2FfcmVwb3J0cyhzdHJlYW0sIGJ1 ZiwgY291bnQsIG9mZnNldCk7CiB9CiAKIC8qKgotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK