From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Bragg Subject: [PATCH v3 7/7] drm/i915/perf: remove perf.hook_lock Date: Wed, 5 Apr 2017 17:23:20 +0100 Message-ID: <20170405162320.30094-8-robert@sixbynine.org> References: <20170405162320.30094-1-robert@sixbynine.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9C1496E83F for ; Wed, 5 Apr 2017 16:23:56 +0000 (UTC) Received: by mail-wr0-x241.google.com with SMTP id g19so4124791wrb.0 for ; Wed, 05 Apr 2017 09:23:56 -0700 (PDT) In-Reply-To: <20170405162320.30094-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 SW4gZWFybGllciBpdGVyYXRpb25zIG9mIHRoZSBpOTE1LXBlcmYgZHJpdmVyIHdlIGhhZCBhIG51 bWJlciBvZgpjYWxsYmFja3MvaG9va3MgZnJvbSBvdGhlciBwYXJ0cyBvZiB0aGUgaTkxNSBkcml2 ZXIgdG8gZS5nLiBub3RpZnkgdXMKd2hlbiBhIGxlZ2FjeSBjb250ZXh0IHdhcyBwaW5uZWQgYW5k IHRoZXNlIGNvdWxkIHJ1biBhc3luY2hyb25vdXNseSB3aXRoCnJlc3BlY3QgdG8gdGhlIHN0cmVh bSBmaWxlIG9wZXJhdGlvbnMgYW5kIG1pZ2h0IGFsc28gcnVuIGluIGF0b21pYwpjb250ZXh0LgoK ZGV2X3ByaXYtPnBlcmYuaG9va19sb2NrIGhhZCBiZWVuIGZvciBzZXJpYWxpc2luZyBhY2Nlc3Mg dG8gc3RhdGUgbmVlZGVkCndpdGhpbiB0aGVzZSBjYWxsYmFja3MsIGJ1dCBhcyB0aGUgY29kZSBo YXMgZXZvbHZlZCBzb21lIG9mIHRoZSBob29rcwpoYXZlIGdvbmUgYXdheSBvciBhcmUgaW1wbGVt ZW50ZWQgdG8gYXZvaWQgbmVlZGluZyB0byBsb2NrIGFueSBzdGF0ZS4KClRoZSByZW1haW5pbmcg dXNlIG9mIHRoaXMgbG9jayB3YXMgYWN0dWFsbHkgcmVkdW5kYW50IGNvbnNpZGVyaW5nIGhvdwp0 aGUgZ2VuNyBvYWNvbnRyb2wgc3RhdGUgdXNlZCB0byBiZSB1cGRhdGVkIGFzIHBhcnQgb2YgYSBj b250ZXh0IHBpbgpob29rLgoKU2lnbmVkLW9mZi1ieTogUm9iZXJ0IEJyYWdnIDxyb2JlcnRAc2l4 YnluaW5lLm9yZz4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICB8ICAyIC0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BlcmYuYyB8IDMyICsrKysrKysrKystLS0tLS0t LS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDEwIGluc2VydGlvbnMoKyksIDI0IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2Lmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDQ4YjA3ZDcwNmYwNi4uNjdh YzRlNmRiY2NiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI0NDQsOCArMjQ0NCw2IEBA IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlIHsKIAkJc3RydWN0IG11dGV4IGxvY2s7CiAJCXN0cnVj dCBsaXN0X2hlYWQgc3RyZWFtczsKIAotCQlzcGlubG9ja190IGhvb2tfbG9jazsKLQogCQlzdHJ1 Y3QgewogCQkJc3RydWN0IGk5MTVfcGVyZl9zdHJlYW0gKmV4Y2x1c2l2ZV9zdHJlYW07CiAKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGVyZi5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9wZXJmLmMKaW5kZXggODdjMGQxY2UxYjlmLi42M2ExMTUyNzY2ZjggMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGVyZi5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfcGVyZi5jCkBAIC0xNjc3LDkgKzE2NzcsMTcgQEAgc3RhdGljIHZv aWQgZ2VuOF9kaXNhYmxlX21ldHJpY19zZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQogCS8qIE5PUCAqLwogfQogCi1zdGF0aWMgdm9pZCBnZW43X3VwZGF0ZV9vYWNvbnRyb2xf bG9ja2VkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3N0YXRpYyB2b2lkIGdl bjdfb2FfZW5hYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlsb2Nr ZGVwX2Fzc2VydF9oZWxkKCZkZXZfcHJpdi0+cGVyZi5ob29rX2xvY2spOworCS8qIFJlc2V0IGJ1 ZiBwb2ludGVycyBzbyB3ZSBkb24ndCBmb3J3YXJkIHJlcG9ydHMgZnJvbSBiZWZvcmUgbm93Lgor CSAqCisJICogVGhpbmsgY2FyZWZ1bGx5IGlmIGNvbnNpZGVyaW5nIHRyeWluZyB0byBhdm9pZCB0 aGlzLCBzaW5jZSBpdAorCSAqIGFsc28gZW5zdXJlcyBzdGF0dXMgZmxhZ3MgYW5kIHRoZSBidWZm ZXIgaXRzZWxmIGFyZSBjbGVhcmVkCisJICogaW4gZXJyb3IgcGF0aHMsIGFuZCB3ZSBoYXZlIGNo ZWNrcyBmb3IgaW52YWxpZCByZXBvcnRzIGJhc2VkCisJICogb24gdGhlIGFzc3VtcHRpb24gdGhh dCBjZXJ0YWluIGZpZWxkcyBhcmUgd3JpdHRlbiB0byB6ZXJvZWQKKwkgKiBtZW1vcnkgd2hpY2gg dGhpcyBoZWxwcyBtYWludGFpbnMuCisJICovCisJZ2VuN19pbml0X29hX2J1ZmZlcihkZXZfcHJp dik7CiAKIAlpZiAoZGV2X3ByaXYtPnBlcmYub2EuZXhjbHVzaXZlX3N0cmVhbS0+ZW5hYmxlZCkg ewogCQlzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqY3R4ID0KQEAgLTE3MDIsMjUgKzE3MTAsNiBA QCBzdGF0aWMgdm9pZCBnZW43X3VwZGF0ZV9vYWNvbnRyb2xfbG9ja2VkKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIAkJSTkxNV9XUklURShHRU43X09BQ09OVFJPTCwgMCk7CiB9 CiAKLXN0YXRpYyB2b2lkIGdlbjdfb2FfZW5hYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKLXsKLQl1bnNpZ25lZCBsb25nIGZsYWdzOwotCi0JLyogUmVzZXQgYnVmIHBvaW50 ZXJzIHNvIHdlIGRvbid0IGZvcndhcmQgcmVwb3J0cyBmcm9tIGJlZm9yZSBub3cuCi0JICoKLQkg KiBUaGluayBjYXJlZnVsbHkgaWYgY29uc2lkZXJpbmcgdHJ5aW5nIHRvIGF2b2lkIHRoaXMsIHNp bmNlIGl0Ci0JICogYWxzbyBlbnN1cmVzIHN0YXR1cyBmbGFncyBhbmQgdGhlIGJ1ZmZlciBpdHNl bGYgYXJlIGNsZWFyZWQKLQkgKiBpbiBlcnJvciBwYXRocywgYW5kIHdlIGhhdmUgY2hlY2tzIGZv ciBpbnZhbGlkIHJlcG9ydHMgYmFzZWQKLQkgKiBvbiB0aGUgYXNzdW1wdGlvbiB0aGF0IGNlcnRh aW4gZmllbGRzIGFyZSB3cml0dGVuIHRvIHplcm9lZAotCSAqIG1lbW9yeSB3aGljaCB0aGlzIGhl bHBzIG1haW50YWlucy4KLQkgKi8KLQlnZW43X2luaXRfb2FfYnVmZmVyKGRldl9wcml2KTsKLQot CXNwaW5fbG9ja19pcnFzYXZlKCZkZXZfcHJpdi0+cGVyZi5ob29rX2xvY2ssIGZsYWdzKTsKLQln ZW43X3VwZGF0ZV9vYWNvbnRyb2xfbG9ja2VkKGRldl9wcml2KTsKLQlzcGluX3VubG9ja19pcnFy ZXN0b3JlKCZkZXZfcHJpdi0+cGVyZi5ob29rX2xvY2ssIGZsYWdzKTsKLX0KLQogc3RhdGljIHZv aWQgZ2VuOF9vYV9lbmFibGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewog CXUzMiByZXBvcnRfZm9ybWF0ID0gZGV2X3ByaXYtPnBlcmYub2Eub2FfYnVmZmVyLmZvcm1hdDsK QEAgLTI5OTksNyArMjk4OCw2IEBAIHZvaWQgaTkxNV9wZXJmX2luaXQoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2KQogCiAJCUlOSVRfTElTVF9IRUFEKCZkZXZfcHJpdi0+cGVyZi5z dHJlYW1zKTsKIAkJbXV0ZXhfaW5pdCgmZGV2X3ByaXYtPnBlcmYubG9jayk7Ci0JCXNwaW5fbG9j a19pbml0KCZkZXZfcHJpdi0+cGVyZi5ob29rX2xvY2spOwogCQlzcGluX2xvY2tfaW5pdCgmZGV2 X3ByaXYtPnBlcmYub2Eub2FfYnVmZmVyLnB0cl9sb2NrKTsKIAogCQlkZXZfcHJpdi0+cGVyZi5z eXNjdGxfaGVhZGVyID0gcmVnaXN0ZXJfc3lzY3RsX3RhYmxlKGRldl9yb290KTsKLS0gCjIuMTIu MAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==