From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lionel Landwerlin Subject: [PATCH v2] drm/i915/perf: fix perf stream opening lock Date: Thu, 1 Mar 2018 11:06:13 +0000 Message-ID: <20180301110613.1737-1-lionel.g.landwerlin@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0E3226EC32 for ; Thu, 1 Mar 2018 11:06:19 +0000 (UTC) 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 Cc: matthew.auld@intel.com List-Id: intel-gfx@lists.freedesktop.org V2UncmUgc2VlaW5nIG9uIENJIHRoYXQgc29tZSBjb250ZXh0cyBkb24ndCBoYXZlIHRoZSBwcm9n cmFtbWVkIE9BCnBlcmlvZCB0aW1lciB0aGF0IGRpcmVjdHMgdGhlIE9BIHVuaXQgb24gaG93IG9m dGVuIHRvIHdyaXRlIHJlcG9ydHMuCgpUaGUgaXNzdWUgaXMgdGhhdCB3ZSdyZSBub3QgaG9sZGlu ZyB0aGUgZHJtIGxvY2sgZnJvbSB3aGVuIHdlIGVkaXQgdGhlCmNvbnRleHQgaW1hZ2VzIGRvd24g dG8gd2hlbiB3ZSBzZXQgdGhlIGV4Y2x1c2l2ZV9zdHJlYW0gdmFyaWFibGUuIFRoaXMKbGVhdmVz IGEgd2luZG93IGZvciB0aGUgZGVmZXJyZWQgY29udGV4dCBhbGxvY2F0aW9uIHRvIGNhbGwKaTkx NV9vYV9pbml0X3JlZ19zdGF0ZSgpIHRoYXQgd2lsbCBub3QgcHJvZ3JhbSB0aGUgZXhwZWN0ZWQg T0EgdGltZXIKdmFsdWUsIGJlY2F1c2Ugd2UgaGF2ZW4ndCBzZXQgdGhlIGV4Y2x1c2l2ZV9zdHJl YW0geWV0LgoKdjI6IERyb3AgbmVlZF9sb2NrIGZyb20gZ2VuOF9jb25maWd1cmVfYWxsX2NvbnRl eHRzKCkgKE1hdHQpCgpTaWduZWQtb2ZmLWJ5OiBMaW9uZWwgTGFuZHdlcmxpbiA8bGlvbmVsLmcu bGFuZHdlcmxpbkBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBNYXR0aGV3IEF1bGQgPG1hdHRoZXcu YXVsZEBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdp bHNvbi5jby51az4KRml4ZXM6IDcwMWY4MjMxYTJmICgiZHJtL2k5MTUvcGVyZjogcHJ1bmUgT0Eg Y29uZmlncyIpCkJ1Z3ppbGxhOiBodHRwczovL2J1Z3MuZnJlZWRlc2t0b3Aub3JnL3Nob3dfYnVn LmNnaT9pZD0xMDIyNTQKQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hv d19idWcuY2dpP2lkPTEwMzcxNQpCdWd6aWxsYTogaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTAzNzU1Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9w ZXJmLmMgfCA0MCArKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZp bGUgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwgMjcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wZXJmLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X3BlcmYuYwppbmRleCAyNzQxYjFiYzcwOTUuLmFiYWNhNmVkZWI3MSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wZXJmLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9wZXJmLmMKQEAgLTEzMDMsOSArMTMwMyw4IEBAIHN0YXRpYyB2b2lkIGk5MTVf b2Ffc3RyZWFtX2Rlc3Ryb3koc3RydWN0IGk5MTVfcGVyZl9zdHJlYW0gKnN0cmVhbSkKIAkgKi8K IAltdXRleF9sb2NrKCZkZXZfcHJpdi0+ZHJtLnN0cnVjdF9tdXRleCk7CiAJZGV2X3ByaXYtPnBl cmYub2EuZXhjbHVzaXZlX3N0cmVhbSA9IE5VTEw7Ci0JbXV0ZXhfdW5sb2NrKCZkZXZfcHJpdi0+ ZHJtLnN0cnVjdF9tdXRleCk7Ci0KIAlkZXZfcHJpdi0+cGVyZi5vYS5vcHMuZGlzYWJsZV9tZXRy aWNfc2V0KGRldl9wcml2KTsKKwltdXRleF91bmxvY2soJmRldl9wcml2LT5kcm0uc3RydWN0X211 dGV4KTsKIAogCWZyZWVfb2FfYnVmZmVyKGRldl9wcml2KTsKIApAQCAtMTc1NiwyMiArMTc1NSwx MyBAQCBzdGF0aWMgaW50IGdlbjhfc3dpdGNoX3RvX3VwZGF0ZWRfa2VybmVsX2NvbnRleHQoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcgogICogTm90ZTogaXQncyBvbmx5IHRoZSBSQ1Mv UmVuZGVyIGNvbnRleHQgdGhhdCBoYXMgYW55IE9BIHN0YXRlLgogICovCiBzdGF0aWMgaW50IGdl bjhfY29uZmlndXJlX2FsbF9jb250ZXh0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYsCi0JCQkJICAgICAgIGNvbnN0IHN0cnVjdCBpOTE1X29hX2NvbmZpZyAqb2FfY29uZmlnLAot CQkJCSAgICAgICBib29sIGludGVycnVwdGlibGUpCisJCQkJICAgICAgIGNvbnN0IHN0cnVjdCBp OTE1X29hX2NvbmZpZyAqb2FfY29uZmlnKQogewogCXN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpj dHg7CiAJaW50IHJldDsKIAl1bnNpZ25lZCBpbnQgd2FpdF9mbGFncyA9IEk5MTVfV0FJVF9MT0NL RUQ7CiAKLQlpZiAoaW50ZXJydXB0aWJsZSkgewotCQlyZXQgPSBpOTE1X211dGV4X2xvY2tfaW50 ZXJydXB0aWJsZSgmZGV2X3ByaXYtPmRybSk7Ci0JCWlmIChyZXQpCi0JCQlyZXR1cm4gcmV0Owot Ci0JCXdhaXRfZmxhZ3MgfD0gSTkxNV9XQUlUX0lOVEVSUlVQVElCTEU7Ci0JfSBlbHNlIHsKLQkJ bXV0ZXhfbG9jaygmZGV2X3ByaXYtPmRybS5zdHJ1Y3RfbXV0ZXgpOwotCX0KKwlsb2NrZGVwX2Fz c2VydF9oZWxkKCZkZXZfcHJpdi0+ZHJtLnN0cnVjdF9tdXRleCk7CiAKIAkvKiBTd2l0Y2ggYXdh eSBmcm9tIGFueSB1c2VyIGNvbnRleHQuICovCiAJcmV0ID0gZ2VuOF9zd2l0Y2hfdG9fdXBkYXRl ZF9rZXJuZWxfY29udGV4dChkZXZfcHJpdiwgb2FfY29uZmlnKTsKQEAgLTE4MTksOCArMTgwOSw2 IEBAIHN0YXRpYyBpbnQgZ2VuOF9jb25maWd1cmVfYWxsX2NvbnRleHRzKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKIAl9CiAKICBvdXQ6Ci0JbXV0ZXhfdW5sb2NrKCZkZXZfcHJp di0+ZHJtLnN0cnVjdF9tdXRleCk7Ci0KIAlyZXR1cm4gcmV0OwogfQogCkBAIC0xODYzLDcgKzE4 NTEsNyBAQCBzdGF0aWMgaW50IGdlbjhfZW5hYmxlX21ldHJpY19zZXQoc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2LAogCSAqIHRvIG1ha2Ugc3VyZSBhbGwgc2xpY2VzL3N1YnNsaWNl cyBhcmUgT04gYmVmb3JlIHdyaXRpbmcgdG8gTk9BCiAJICogcmVnaXN0ZXJzLgogCSAqLwotCXJl dCA9IGdlbjhfY29uZmlndXJlX2FsbF9jb250ZXh0cyhkZXZfcHJpdiwgb2FfY29uZmlnLCB0cnVl KTsKKwlyZXQgPSBnZW44X2NvbmZpZ3VyZV9hbGxfY29udGV4dHMoZGV2X3ByaXYsIG9hX2NvbmZp Zyk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMTg3OCw3ICsxODY2LDcgQEAgc3Rh dGljIGludCBnZW44X2VuYWJsZV9tZXRyaWNfc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKIHN0YXRpYyB2b2lkIGdlbjhfZGlzYWJsZV9tZXRyaWNfc2V0KHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAkvKiBSZXNldCBhbGwgY29udGV4dHMnIHNsaWNl cy9zdWJzbGljZXMgY29uZmlndXJhdGlvbnMuICovCi0JZ2VuOF9jb25maWd1cmVfYWxsX2NvbnRl eHRzKGRldl9wcml2LCBOVUxMLCBmYWxzZSk7CisJZ2VuOF9jb25maWd1cmVfYWxsX2NvbnRleHRz KGRldl9wcml2LCBOVUxMKTsKIAogCUk5MTVfV1JJVEUoR0RUX0NISUNLRU5fQklUUywgKEk5MTVf UkVBRChHRFRfQ0hJQ0tFTl9CSVRTKSAmCiAJCQkJICAgICAgfkdUX05PQV9FTkFCTEUpKTsKQEAg LTE4ODgsNyArMTg3Niw3IEBAIHN0YXRpYyB2b2lkIGdlbjhfZGlzYWJsZV9tZXRyaWNfc2V0KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHN0YXRpYyB2b2lkIGdlbjEwX2Rpc2Fi bGVfbWV0cmljX3NldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJLyog UmVzZXQgYWxsIGNvbnRleHRzJyBzbGljZXMvc3Vic2xpY2VzIGNvbmZpZ3VyYXRpb25zLiAqLwot CWdlbjhfY29uZmlndXJlX2FsbF9jb250ZXh0cyhkZXZfcHJpdiwgTlVMTCwgZmFsc2UpOworCWdl bjhfY29uZmlndXJlX2FsbF9jb250ZXh0cyhkZXZfcHJpdiwgTlVMTCk7CiAKIAkvKiBNYWtlIHN1 cmUgd2UgZGlzYWJsZSBub2EgdG8gc2F2ZSBwb3dlci4gKi8KIAlJOTE1X1dSSVRFKFJQTV9DT05G SUcxLApAQCAtMjEzOCw2ICsyMTI2LDEwIEBAIHN0YXRpYyBpbnQgaTkxNV9vYV9zdHJlYW1faW5p dChzdHJ1Y3QgaTkxNV9wZXJmX3N0cmVhbSAqc3RyZWFtLAogCWlmIChyZXQpCiAJCWdvdG8gZXJy X29hX2J1Zl9hbGxvYzsKIAorCXJldCA9IGk5MTVfbXV0ZXhfbG9ja19pbnRlcnJ1cHRpYmxlKCZk ZXZfcHJpdi0+ZHJtKTsKKwlpZiAocmV0KQorCQlnb3RvIGVycl9sb2NrOworCiAJcmV0ID0gZGV2 X3ByaXYtPnBlcmYub2Eub3BzLmVuYWJsZV9tZXRyaWNfc2V0KGRldl9wcml2LAogCQkJCQkJICAg ICAgc3RyZWFtLT5vYV9jb25maWcpOwogCWlmIChyZXQpCkBAIC0yMTQ1LDIzICsyMTM3LDE3IEBA IHN0YXRpYyBpbnQgaTkxNV9vYV9zdHJlYW1faW5pdChzdHJ1Y3QgaTkxNV9wZXJmX3N0cmVhbSAq c3RyZWFtLAogCiAJc3RyZWFtLT5vcHMgPSAmaTkxNV9vYV9zdHJlYW1fb3BzOwogCi0JLyogTG9j ayBkZXZpY2UgZm9yIGV4Y2x1c2l2ZV9zdHJlYW0gYWNjZXNzIGxhdGUgYmVjYXVzZQotCSAqIGVu YWJsZV9tZXRyaWNfc2V0KCkgbWlnaHQgbG9jayBhcyB3ZWxsIG9uIGdlbjgrLgotCSAqLwotCXJl dCA9IGk5MTVfbXV0ZXhfbG9ja19pbnRlcnJ1cHRpYmxlKCZkZXZfcHJpdi0+ZHJtKTsKLQlpZiAo cmV0KQotCQlnb3RvIGVycl9sb2NrOwotCiAJZGV2X3ByaXYtPnBlcmYub2EuZXhjbHVzaXZlX3N0 cmVhbSA9IHN0cmVhbTsKIAogCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPmRybS5zdHJ1Y3RfbXV0 ZXgpOwogCiAJcmV0dXJuIDA7CiAKLWVycl9sb2NrOgorZXJyX2VuYWJsZToKIAlkZXZfcHJpdi0+ cGVyZi5vYS5vcHMuZGlzYWJsZV9tZXRyaWNfc2V0KGRldl9wcml2KTsKKwltdXRleF91bmxvY2so JmRldl9wcml2LT5kcm0uc3RydWN0X211dGV4KTsKIAotZXJyX2VuYWJsZToKK2Vycl9sb2NrOgog CWZyZWVfb2FfYnVmZmVyKGRldl9wcml2KTsKIAogZXJyX29hX2J1Zl9hbGxvYzoKLS0gCjIuMTYu MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==