From: Robert Bragg Subject: [PATCH v4 15/15] drm/i915/perf: remove perf.hook_lock Date: Wed, 12 Apr 2017 16:55:56 +0100 Message-ID: <20170412155556.6602-16-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-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 841CF6E76F for ; Wed, 12 Apr 2017 15:57:12 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id x75so7314092wma.1 for ; Wed, 12 Apr 2017 08:57:12 -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 SW4gZWFybGllciBpdGVyYXRpb25zIG9mIHRoZSBpOTE1LXBlcmYgZHJpdmVyIHdlIGhhZCBhIG51 bWJlciBvZgpjYWxsYmFja3MvaG9va3MgZnJvbSBvdGhlciBwYXJ0cyBvZiB0aGUgaTkxNSBkcml2 ZXIgdG8gZS5nLiBub3RpZnkgdXMKd2hlbiBhIGxlZ2FjeSBjb250ZXh0IHdhcyBwaW5uZWQgYW5k IHRoZXNlIGNvdWxkIHJ1biBhc3luY2hyb25vdXNseSB3aXRoCnJlc3BlY3QgdG8gdGhlIHN0cmVh bSBmaWxlIG9wZXJhdGlvbnMgYW5kIG1pZ2h0IGFsc28gcnVuIGluIGF0b21pYwpjb250ZXh0LgoK ZGV2X3ByaXYtPnBlcmYuaG9va19sb2NrIGhhZCBiZWVuIGZvciBzZXJpYWxpc2luZyBhY2Nlc3Mg dG8gc3RhdGUgbmVlZGVkCndpdGhpbiB0aGVzZSBjYWxsYmFja3MsIGJ1dCBhcyB0aGUgY29kZSBo YXMgZXZvbHZlZCBzb21lIG9mIHRoZSBob29rcwpoYXZlIGdvbmUgYXdheSBvciBhcmUgaW1wbGVt ZW50ZWQgdG8gYXZvaWQgbmVlZGluZyB0byBsb2NrIGFueSBzdGF0ZS4KClRoZSByZW1haW5pbmcg dXNlIG9mIHRoaXMgbG9jayB3YXMgYWN0dWFsbHkgcmVkdW5kYW50IGNvbnNpZGVyaW5nIGhvdwp0 aGUgZ2VuNyBvYWNvbnRyb2wgc3RhdGUgdXNlZCB0byBiZSB1cGRhdGVkIGFzIHBhcnQgb2YgYSBj b250ZXh0IHBpbgpob29rLgoKU2lnbmVkLW9mZi1ieTogUm9iZXJ0IEJyYWdnIDxyb2JlcnRAc2l4 YnluaW5lLm9yZz4KUmV2aWV3ZWQtYnk6IE1hdHRoZXcgQXVsZCA8bWF0dGhldy5hdWxkQGludGVs LmNvbT4KQWNrZWQtYnk6IExpb25lbCBMYW5kd2VybGluIDxsaW9uZWwuZy5sYW5kd2VybGluQGlu dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICB8ICAyIC0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BlcmYuYyB8IDMyICsrKysrKysrKystLS0tLS0tLS0t LS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDEwIGluc2VydGlvbnMoKyksIDI0IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDU5ZGNjZTNiNDBhOS4uOTRjMWY1 MzMxZGFmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI0MzgsOCArMjQzOCw2IEBAIHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlIHsKIAkJc3RydWN0IG11dGV4IGxvY2s7CiAJCXN0cnVjdCBs aXN0X2hlYWQgc3RyZWFtczsKIAotCQlzcGlubG9ja190IGhvb2tfbG9jazsKLQogCQlzdHJ1Y3Qg ewogCQkJc3RydWN0IGk5MTVfcGVyZl9zdHJlYW0gKmV4Y2x1c2l2ZV9zdHJlYW07CiAKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGVyZi5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9wZXJmLmMKaW5kZXggNWRlOGQ1N2UwYjc3Li4xZjI1YTY2OTBmNjEgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGVyZi5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfcGVyZi5jCkBAIC0xNjkwLDkgKzE2OTAsMTcgQEAgc3RhdGljIHZvaWQg Z2VuOF9kaXNhYmxlX21ldHJpY19zZXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogCS8qIE5PUCAqLwogfQogCi1zdGF0aWMgdm9pZCBnZW43X3VwZGF0ZV9vYWNvbnRyb2xfbG9j a2VkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKK3N0YXRpYyB2b2lkIGdlbjdf b2FfZW5hYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKLQlsb2NrZGVw X2Fzc2VydF9oZWxkKCZkZXZfcHJpdi0+cGVyZi5ob29rX2xvY2spOworCS8qIFJlc2V0IGJ1ZiBw b2ludGVycyBzbyB3ZSBkb24ndCBmb3J3YXJkIHJlcG9ydHMgZnJvbSBiZWZvcmUgbm93LgorCSAq CisJICogVGhpbmsgY2FyZWZ1bGx5IGlmIGNvbnNpZGVyaW5nIHRyeWluZyB0byBhdm9pZCB0aGlz LCBzaW5jZSBpdAorCSAqIGFsc28gZW5zdXJlcyBzdGF0dXMgZmxhZ3MgYW5kIHRoZSBidWZmZXIg aXRzZWxmIGFyZSBjbGVhcmVkCisJICogaW4gZXJyb3IgcGF0aHMsIGFuZCB3ZSBoYXZlIGNoZWNr cyBmb3IgaW52YWxpZCByZXBvcnRzIGJhc2VkCisJICogb24gdGhlIGFzc3VtcHRpb24gdGhhdCBj ZXJ0YWluIGZpZWxkcyBhcmUgd3JpdHRlbiB0byB6ZXJvZWQKKwkgKiBtZW1vcnkgd2hpY2ggdGhp cyBoZWxwcyBtYWludGFpbnMuCisJICovCisJZ2VuN19pbml0X29hX2J1ZmZlcihkZXZfcHJpdik7 CiAKIAlpZiAoZGV2X3ByaXYtPnBlcmYub2EuZXhjbHVzaXZlX3N0cmVhbS0+ZW5hYmxlZCkgewog CQlzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqY3R4ID0KQEAgLTE3MTUsMjUgKzE3MjMsNiBAQCBz dGF0aWMgdm9pZCBnZW43X3VwZGF0ZV9vYWNvbnRyb2xfbG9ja2VkKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKIAkJSTkxNV9XUklURShHRU43X09BQ09OVFJPTCwgMCk7CiB9CiAK LXN0YXRpYyB2b2lkIGdlbjdfb2FfZW5hYmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKLXsKLQl1bnNpZ25lZCBsb25nIGZsYWdzOwotCi0JLyogUmVzZXQgYnVmIHBvaW50ZXJz IHNvIHdlIGRvbid0IGZvcndhcmQgcmVwb3J0cyBmcm9tIGJlZm9yZSBub3cuCi0JICoKLQkgKiBU aGluayBjYXJlZnVsbHkgaWYgY29uc2lkZXJpbmcgdHJ5aW5nIHRvIGF2b2lkIHRoaXMsIHNpbmNl IGl0Ci0JICogYWxzbyBlbnN1cmVzIHN0YXR1cyBmbGFncyBhbmQgdGhlIGJ1ZmZlciBpdHNlbGYg YXJlIGNsZWFyZWQKLQkgKiBpbiBlcnJvciBwYXRocywgYW5kIHdlIGhhdmUgY2hlY2tzIGZvciBp bnZhbGlkIHJlcG9ydHMgYmFzZWQKLQkgKiBvbiB0aGUgYXNzdW1wdGlvbiB0aGF0IGNlcnRhaW4g ZmllbGRzIGFyZSB3cml0dGVuIHRvIHplcm9lZAotCSAqIG1lbW9yeSB3aGljaCB0aGlzIGhlbHBz IG1haW50YWlucy4KLQkgKi8KLQlnZW43X2luaXRfb2FfYnVmZmVyKGRldl9wcml2KTsKLQotCXNw aW5fbG9ja19pcnFzYXZlKCZkZXZfcHJpdi0+cGVyZi5ob29rX2xvY2ssIGZsYWdzKTsKLQlnZW43 X3VwZGF0ZV9vYWNvbnRyb2xfbG9ja2VkKGRldl9wcml2KTsKLQlzcGluX3VubG9ja19pcnFyZXN0 b3JlKCZkZXZfcHJpdi0+cGVyZi5ob29rX2xvY2ssIGZsYWdzKTsKLX0KLQogc3RhdGljIHZvaWQg Z2VuOF9vYV9lbmFibGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewogCXUz MiByZXBvcnRfZm9ybWF0ID0gZGV2X3ByaXYtPnBlcmYub2Eub2FfYnVmZmVyLmZvcm1hdDsKQEAg LTMwMTQsNyArMzAwMyw2IEBAIHZvaWQgaTkxNV9wZXJmX2luaXQoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogCiAJCUlOSVRfTElTVF9IRUFEKCZkZXZfcHJpdi0+cGVyZi5zdHJl YW1zKTsKIAkJbXV0ZXhfaW5pdCgmZGV2X3ByaXYtPnBlcmYubG9jayk7Ci0JCXNwaW5fbG9ja19p bml0KCZkZXZfcHJpdi0+cGVyZi5ob29rX2xvY2spOwogCQlzcGluX2xvY2tfaW5pdCgmZGV2X3By aXYtPnBlcmYub2Eub2FfYnVmZmVyLnB0cl9sb2NrKTsKIAogCQlvYV9zYW1wbGVfcmF0ZV9oYXJk X2xpbWl0ID0KLS0gCjIuMTIuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4Cg==