From: sourab.gupta@intel.com Subject: [PATCH 3/6] drm/i915: Support opening multiple concurrent perf streams Date: Thu, 16 Mar 2017 11:50:08 +0530 Message-ID: <1489645211-25729-4-git-send-email-sourab.gupta@intel.com> References: <1489645211-25729-1-git-send-email-sourab.gupta@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 082996E9F1 for ; Thu, 16 Mar 2017 06:18:09 +0000 (UTC) In-Reply-To: <1489645211-25729-1-git-send-email-sourab.gupta@intel.com> 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: Daniel Vetter , Sourab Gupta , Matthew Auld List-Id: intel-gfx@lists.freedesktop.org RnJvbTogU291cmFiIEd1cHRhIDxzb3VyYWIuZ3VwdGFAaW50ZWwuY29tPgoKVGhpcyBwYXRjaCBh ZGRzIHN1cHBvcnQgZm9yIG9wZW5pbmcgbXVsdGlwbGUgY29uY3VycmVudCBwZXJmIHN0cmVhbXMg Zm9yCmRpZmZlcmVudCBncHUgZW5naW5lcywgd2hpbGUgaGF2aW5nIHRoZSByZXN0cmljdGlvbiB0 byBvcGVuIG9ubHkgYSBzaW5nbGUKc3RyZWFtIG9wZW4gZm9yIGEgcGFydGljdWxhciBncHUgZW5n aW5lLgpUaGlzIGVuYWJsZXMgdXNlcnNwYWNlIGNsaWVudCB0byBvcGVuIG11bHRpcGxlIHN0cmVh bXMsIG9uZSBwZXIgZW5naW5lLAphdCBhbnkgdGltZSB0byBjYXB0dXJlIHNhbXBsZSBkYXRhIGZv ciBtdWx0aXBsZSBncHUgZW5naW5lcy4KClNpZ25lZC1vZmYtYnk6IFNvdXJhYiBHdXB0YSA8c291 cmFiLmd1cHRhQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5o ICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BlcmYuYyB8IDQxICsrKysrKysr KysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjQgaW5z ZXJ0aW9ucygrKSwgMTkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXgg NDBhYzM2Mi4uYzAwNWZmYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yNTQ3LDcgKzI1 NDcsNyBAQCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSB7CiAJCXNwaW5sb2NrX3QgaG9va19sb2Nr OwogCiAJCXN0cnVjdCBocnRpbWVyIHBvbGxfY2hlY2tfdGltZXI7Ci0JCXN0cnVjdCBpOTE1X3Bl cmZfc3RyZWFtICpleGNsdXNpdmVfc3RyZWFtOworCQlzdHJ1Y3QgaTkxNV9wZXJmX3N0cmVhbSAq ZW5naW5lX3N0cmVhbVtJOTE1X05VTV9FTkdJTkVTXTsKIAkJd2FpdF9xdWV1ZV9oZWFkX3QgcG9s bF93cVtJOTE1X05VTV9FTkdJTkVTXTsKIAkJYm9vbCBwb2xsaW5bSTkxNV9OVU1fRU5HSU5FU107 CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGVyZi5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9wZXJmLmMKaW5kZXggZDNkOTM0ZS4uNTQzN2QwOCAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wZXJmLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9wZXJmLmMKQEAgLTEzODIsNyArMTM4Miw3IEBAIHN0YXRpYyBpbnQgZ2Vu OF9hcHBlbmRfb2FfcmVwb3J0cyhzdHJ1Y3QgaTkxNV9wZXJmX3N0cmVhbSAqc3RyZWFtLAogCQkg KiBzd2l0Y2hlcyBzaW5jZSBpdCdzIG5vdC11bmNvbW1vbiBmb3IgcGVyaW9kaWMgc2FtcGxlcyB0 bwogCQkgKiBpZGVudGlmeSBhIHN3aXRjaCBiZWZvcmUgYW55ICdjb250ZXh0IHN3aXRjaCcgcmVw b3J0LgogCQkgKi8KLQkJaWYgKCFkZXZfcHJpdi0+cGVyZi5leGNsdXNpdmVfc3RyZWFtLT5jdHgg fHwKKwkJaWYgKCFzdHJlYW0tPmN0eCB8fAogCQkgICAgZGV2X3ByaXYtPnBlcmYub2Euc3BlY2lm aWNfY3R4X2lkID09IGN0eF9pZCB8fAogCQkgICAgKGRldl9wcml2LT5wZXJmLm9hLm9hX2J1ZmZl ci5sYXN0X2N0eF9pZCA9PQogCQkgICAgIGRldl9wcml2LT5wZXJmLm9hLnNwZWNpZmljX2N0eF9p ZCkgfHwKQEAgLTEzOTEsNyArMTM5MSw3IEBAIHN0YXRpYyBpbnQgZ2VuOF9hcHBlbmRfb2FfcmVw b3J0cyhzdHJ1Y3QgaTkxNV9wZXJmX3N0cmVhbSAqc3RyZWFtLAogCQkJLyogV2hpbGUgZmlsdGVy aW5nIGZvciBhIHNpbmdsZSBjb250ZXh0IHdlIGF2b2lkCiAJCQkgKiBsZWFraW5nIHRoZSBJRHMg b2Ygb3RoZXIgY29udGV4dHMuCiAJCQkgKi8KLQkJCWlmIChkZXZfcHJpdi0+cGVyZi5leGNsdXNp dmVfc3RyZWFtLT5jdHggJiYKKwkJCWlmIChzdHJlYW0tPmN0eCAmJgogCQkJICAgIGRldl9wcml2 LT5wZXJmLm9hLnNwZWNpZmljX2N0eF9pZCAhPSBjdHhfaWQpIHsKIAkJCQlyZXBvcnQzMlsyXSA9 IElOVkFMSURfQ1RYX0lEOwogCQkJfQpAQCAtMjE5MCw3ICsyMTkwLDcgQEAgc3RhdGljIHZvaWQg aTkxNV9lbmdpbmVfc3RyZWFtX2Rlc3Ryb3koc3RydWN0IGk5MTVfcGVyZl9zdHJlYW0gKnN0cmVh bSkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBzdHJlYW0tPmRldl9w cml2OwogCi0JaWYgKFdBUk5fT04oc3RyZWFtICE9IGRldl9wcml2LT5wZXJmLmV4Y2x1c2l2ZV9z dHJlYW0pKQorCWlmIChXQVJOX09OKHN0cmVhbSAhPSBkZXZfcHJpdi0+cGVyZi5lbmdpbmVfc3Ry ZWFtW3N0cmVhbS0+ZW5naW5lXSkpCiAJCXJldHVybjsKIAogCWlmIChzdHJlYW0tPnVzaW5nX29h KSB7CkBAIC0yMjA4LDcgKzIyMDgsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X2VuZ2luZV9zdHJlYW1f ZGVzdHJveShzdHJ1Y3QgaTkxNV9wZXJmX3N0cmVhbSAqc3RyZWFtKQogCWlmIChzdHJlYW0tPmNz X21vZGUpCiAJCWZyZWVfY29tbWFuZF9zdHJlYW1fYnVmKGRldl9wcml2LCBzdHJlYW0tPmVuZ2lu ZSk7CiAKLQlkZXZfcHJpdi0+cGVyZi5leGNsdXNpdmVfc3RyZWFtID0gTlVMTDsKKwlkZXZfcHJp di0+cGVyZi5lbmdpbmVfc3RyZWFtW3N0cmVhbS0+ZW5naW5lXSA9IE5VTEw7CiB9CiAKIHN0YXRp YyB2b2lkIGdlbjdfaW5pdF9vYV9idWZmZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQpAQCAtMjc1NSwxMCArMjc1NSwxMCBAQCBzdGF0aWMgdm9pZCBnZW43X3VwZGF0ZV9vYWNv bnRyb2xfbG9ja2VkKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAlhc3Nl cnRfc3Bpbl9sb2NrZWQoJmRldl9wcml2LT5wZXJmLmhvb2tfbG9jayk7CiAKLQlpZiAoZGV2X3By aXYtPnBlcmYuZXhjbHVzaXZlX3N0cmVhbS0+c3RhdGUgIT0KKwlpZiAoZGV2X3ByaXYtPnBlcmYu ZW5naW5lX3N0cmVhbVtSQ1NdLT5zdGF0ZSAhPQogCQkJCQlJOTE1X1BFUkZfU1RSRUFNX0RJU0FC TEVEKSB7CiAJCXN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpjdHggPQotCQkJZGV2X3ByaXYtPnBl cmYuZXhjbHVzaXZlX3N0cmVhbS0+Y3R4OworCQkJZGV2X3ByaXYtPnBlcmYuZW5naW5lX3N0cmVh bVtSQ1NdLT5jdHg7CiAJCXUzMiBjdHhfaWQgPSBkZXZfcHJpdi0+cGVyZi5vYS5zcGVjaWZpY19j dHhfaWQ7CiAKIAkJYm9vbCBwZXJpb2RpYyA9IGRldl9wcml2LT5wZXJmLm9hLnBlcmlvZGljOwpA QCAtMjkzMSw4ICsyOTMxLDkgQEAgc3RhdGljIGludCBpOTE1X2VuZ2luZV9zdHJlYW1faW5pdChz dHJ1Y3QgaTkxNV9wZXJmX3N0cmVhbSAqc3RyZWFtLAogCSAqIGNvdW50ZXIgcmVwb3J0cyBhbmQg bWFyc2hhbCB0byB0aGUgYXBwcm9wcmlhdGUgY2xpZW50CiAJICogd2UgY3VycmVudGx5IG9ubHkg YWxsb3cgZXhjbHVzaXZlIGFjY2VzcwogCSAqLwotCWlmIChkZXZfcHJpdi0+cGVyZi5leGNsdXNp dmVfc3RyZWFtKSB7Ci0JCURSTV9ERUJVRygiSTkxNSBwZXJmIHN0cmVhbSBhbHJlYWR5IGluIHVz ZVxuIik7CisJaWYgKGRldl9wcml2LT5wZXJmLmVuZ2luZV9zdHJlYW1bcHJvcHMtPmVuZ2luZV0p IHsKKwkJRFJNX0RFQlVHKCJJOTE1IHBlcmYgc3RyZWFtIDogJWQgYWxyZWFkeSBpbiB1c2VcbiIs CisJCQkJcHJvcHMtPmVuZ2luZSk7CiAJCXJldHVybiAtRUJVU1k7CiAJfQogCkBAIC0zMTIwLDcg KzMxMjEsNyBAQCBzdGF0aWMgaW50IGk5MTVfZW5naW5lX3N0cmVhbV9pbml0KHN0cnVjdCBpOTE1 X3BlcmZfc3RyZWFtICpzdHJlYW0sCiAJfQogCiAJc3RyZWFtLT5vcHMgPSAmaTkxNV9lbmdpbmVf c3RyZWFtX29wczsKLQlkZXZfcHJpdi0+cGVyZi5leGNsdXNpdmVfc3RyZWFtID0gc3RyZWFtOwor CWRldl9wcml2LT5wZXJmLmVuZ2luZV9zdHJlYW1bc3RyZWFtLT5lbmdpbmVdID0gc3RyZWFtOwog CiAJcmV0dXJuIDA7CiAKQEAgLTMzNDMsMjQgKzMzNDQsMjggQEAgc3RhdGljIHNzaXplX3QgaTkx NV9wZXJmX3JlYWQoc3RydWN0IGZpbGUgKmZpbGUsCiAJcmV0dXJuIHJldDsKIH0KIAotc3RhdGlj IGVudW0gaHJ0aW1lcl9yZXN0YXJ0IHBvbGxfY2hlY2tfdGltZXJfY2Ioc3RydWN0IGhydGltZXIg KmhydGltZXIpCitzdGF0aWMgdm9pZCB3YWtlX3VwX3BlcmZfc3RyZWFtcyh2b2lkICpkYXRhLCBh c3luY19jb29raWVfdCBjb29raWUpCiB7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gZGF0YTsKIAlzdHJ1Y3QgaTkxNV9wZXJmX3N0cmVhbSAqc3RyZWFtOwotCXN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9Ci0JCWNvbnRhaW5lcl9vZihocnRpbWVyLCB0eXBl b2YoKmRldl9wcml2KSwKLQkJCSAgICAgcGVyZi5wb2xsX2NoZWNrX3RpbWVyKTsKIAotCS8qIE5v IG5lZWQgdG8gcHJvdGVjdCB0aGUgc3RyZWFtcyBsaXN0IGhlcmUsIHNpbmNlIHRoZSBocnRpbWVy IGlzCi0JICogZGlzYWJsZWQgYmVmb3JlIHRoZSBzdHJlYW0gaXMgcmVtb3ZlZCBmcm9tIGxpc3Qs IGFuZCBjdXJyZW50bHkgYQotCSAqIHNpbmdsZSBleGNsdXNpdmVfc3RyZWFtIGlzIHN1cHBvcnRl ZC4KLQkgKiBYWFg6IHJldmlzaXQgdGhpcyB3aGVuIG11bHRpcGxlIGNvbmN1cnJlbnQgc3RyZWFt cyBhcmUgc3VwcG9ydGVkLgotCSAqLworCW11dGV4X2xvY2soJmRldl9wcml2LT5wZXJmLnN0cmVh bXNfbG9jayk7CiAJbGlzdF9mb3JfZWFjaF9lbnRyeShzdHJlYW0sICZkZXZfcHJpdi0+cGVyZi5z dHJlYW1zLCBsaW5rKSB7CiAJCWlmIChzdHJlYW1faGF2ZV9kYXRhX3VubG9ja2VkKHN0cmVhbSkp IHsKIAkJCWRldl9wcml2LT5wZXJmLnBvbGxpbltzdHJlYW0tPmVuZ2luZV0gPSB0cnVlOwogCQkJ d2FrZV91cCgmZGV2X3ByaXYtPnBlcmYucG9sbF93cVtzdHJlYW0tPmVuZ2luZV0pOwogCQl9CiAJ fQorCW11dGV4X3VubG9jaygmZGV2X3ByaXYtPnBlcmYuc3RyZWFtc19sb2NrKTsKK30KKworc3Rh dGljIGVudW0gaHJ0aW1lcl9yZXN0YXJ0IHBvbGxfY2hlY2tfdGltZXJfY2Ioc3RydWN0IGhydGlt ZXIgKmhydGltZXIpCit7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0KKwkJ Y29udGFpbmVyX29mKGhydGltZXIsIHR5cGVvZigqZGV2X3ByaXYpLAorCQkJICAgICBwZXJmLnBv bGxfY2hlY2tfdGltZXIpOworCisJYXN5bmNfc2NoZWR1bGUod2FrZV91cF9wZXJmX3N0cmVhbXMs IGRldl9wcml2KTsKIAogCWhydGltZXJfZm9yd2FyZF9ub3coaHJ0aW1lciwgbnNfdG9fa3RpbWUo UE9MTF9QRVJJT0QpKTsKIAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2ludGVsLWdmeAo=