From mboxrd@z Thu Jan 1 00:00:00 1970 From: sourab.gupta@intel.com Subject: [RFC 5/7] drm/i915: Wait for GPU to finish before event stop in Gen Perf PMU Date: Mon, 22 Jun 2015 15:25:07 +0530 Message-ID: <1434966909-4113-6-git-send-email-sourab.gupta@intel.com> References: <1434966909-4113-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 9462B6E5E0 for ; Mon, 22 Jun 2015 02:53:25 -0700 (PDT) In-Reply-To: <1434966909-4113-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: Insoo Woo , Peter Zijlstra , Jabin Wu , Sourab Gupta List-Id: intel-gfx@lists.freedesktop.org RnJvbTogU291cmFiIEd1cHRhIDxzb3VyYWIuZ3VwdGFAaW50ZWwuY29tPgoKVG8gY29sbGVjdCB0 aW1lc3RhbXBzIGFyb3VuZCBhbnkgR1BVIHdvcmtsb2FkLCB3ZSBuZWVkIHRvIGluc2VydApjb21t YW5kcyB0byBjYXB0dXJlIHRoZW0gaW50byB0aGUgcmluZ2J1ZmZlci4gVGhlcmVmb3JlLCBkdXJp bmcgdGhlIHN0b3AgZXZlbnQKY2FsbCwgd2UgbmVlZCB0byB3YWl0IGZvciBHUFUgdG8gY29tcGxl dGUgcHJvY2Vzc2luZyB0aGUgbGFzdCByZXF1ZXN0IGZvcgp3aGljaCB0aGVzZSBjb21tYW5kcyB3 ZXJlIGluc2VydGVkLgpXZSBuZWVkIHRvIGVuc3VyZSB0aGlzIHByb2Nlc3NpbmcgaXMgZG9uZSBi ZWZvcmUgZXZlbnRfZGVzdHJveSBjYWxsYmFjayB3aGljaApkZWFsbG9jYXRlcyB0aGUgYnVmZmVy IGZvciBob2xkaW5nIHRoZSBkYXRhLgoKU2lnbmVkLW9mZi1ieTogU291cmFiIEd1cHRhIDxzb3Vy YWIuZ3VwdGFAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2Lmgg ICAgIHwgIDIgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfb2FfcGVyZi5jIHwgNTQgKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLQogMiBmaWxlcyBjaGFuZ2VkLCA1NSBp bnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXgg MjVjMDkzOC4uYTBlMWQxNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yMDIyLDYgKzIw MjIsOCBAQCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSB7CiAJCQl1MzIgdGFpbDsKIAkJfSBidWZm ZXI7CiAJCXN0cnVjdCB3b3JrX3N0cnVjdCB3b3JrX3RpbWVyOworCQlzdHJ1Y3Qgd29ya19zdHJ1 Y3Qgd29ya19ldmVudF9zdG9wOworCQlzdHJ1Y3QgY29tcGxldGlvbiBjb21wbGV0ZTsKIAl9IGdl bl9wbXU7CiAKIAlzdHJ1Y3QgbGlzdF9oZWFkIHByb2ZpbGVfY21kOwpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9vYV9wZXJmLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X29hX3BlcmYuYwppbmRleCBlM2U4NjdmLi41NzRiNmQzIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X29hX3BlcmYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X29hX3BlcmYuYwpAQCAtMzA2LDYgKzMwNiw5IEBAIHZvaWQgZm9yd2FyZF9nZW5fcG11X3Nu YXBzaG90c193b3JrKHN0cnVjdCB3b3JrX3N0cnVjdCAqX193b3JrKQogCWludCBoZWFkLCB0YWls LCBudW1fbm9kZXMsIHJldDsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcTsKIAor CWlmIChkZXZfcHJpdi0+Z2VuX3BtdS5ldmVudF9hY3RpdmUgPT0gZmFsc2UpCisJCXJldHVybjsK KwogCWZpcnN0X25vZGUgPSAoc3RydWN0IGRybV9pOTE1X3RzX25vZGUgKikKIAkJCSgoY2hhciAq KWhkciArIGhkci0+ZGF0YV9vZmZzZXQpOwogCW51bV9ub2RlcyA9IChoZHItPnNpemVfaW5fYnl0 ZXMgLSBoZHItPmRhdGFfb2Zmc2V0KSAvCkBAIC0zMzUsNiArMzM4LDUwIEBAIHZvaWQgZm9yd2Fy ZF9nZW5fcG11X3NuYXBzaG90c193b3JrKHN0cnVjdCB3b3JrX3N0cnVjdCAqX193b3JrKQogCW11 dGV4X3VubG9jaygmZGV2X3ByaXYtPmRldi0+c3RydWN0X211dGV4KTsKIH0KIAordm9pZCBpOTE1 X2dlbl9wbXVfc3RvcF93b3JrX2ZuKHN0cnVjdCB3b3JrX3N0cnVjdCAqX193b3JrKQoreworCXN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9CisJCWNvbnRhaW5lcl9vZihfX3dvcmss IHR5cGVvZigqZGV2X3ByaXYpLAorCQkJZ2VuX3BtdS53b3JrX2V2ZW50X3N0b3ApOworCXN0cnVj dCBwZXJmX2V2ZW50ICpldmVudCA9IGRldl9wcml2LT5nZW5fcG11LmV4Y2x1c2l2ZV9ldmVudDsK KwlzdHJ1Y3QgZHJtX2k5MTVfdHNfcXVldWVfaGVhZGVyICpoZHIgPQorCQkoc3RydWN0IGRybV9p OTE1X3RzX3F1ZXVlX2hlYWRlciAqKQorCQlkZXZfcHJpdi0+Z2VuX3BtdS5idWZmZXIuYWRkcjsK KwlzdHJ1Y3QgZHJtX2k5MTVfdHNfbm9kZSAqZmlyc3Rfbm9kZSwgKm5vZGU7CisJaW50IGhlYWQs IHRhaWwsIG51bV9ub2RlcywgcmV0OworCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVx OworCisJZmlyc3Rfbm9kZSA9IChzdHJ1Y3QgZHJtX2k5MTVfdHNfbm9kZSAqKQorCQkJKChjaGFy ICopaGRyICsgaGRyLT5kYXRhX29mZnNldCk7CisJbnVtX25vZGVzID0gKGhkci0+c2l6ZV9pbl9i eXRlcyAtIGhkci0+ZGF0YV9vZmZzZXQpIC8KKwkJCXNpemVvZigqbm9kZSk7CisKKworCXJldCA9 IGk5MTVfbXV0ZXhfbG9ja19pbnRlcnJ1cHRpYmxlKGRldl9wcml2LT5kZXYpOworCWlmIChyZXQp CisJCXJldHVybjsKKworCWk5MTVfZ2VuX3BtdV93YWl0X2dwdShkZXZfcHJpdik7CisKKwkvKiBF bnN1cmUgdGhhdCBhbGwgcmVxdWVzdHMgYXJlIGNvbXBsZXRlZCovCisJdGFpbCA9IGhkci0+bm9k ZV9jb3VudDsKKwloZWFkID0gZGV2X3ByaXYtPmdlbl9wbXUuYnVmZmVyLmhlYWQ7CisJd2hpbGUg KChoZWFkICUgbnVtX25vZGVzKSAhPSAodGFpbCAlIG51bV9ub2RlcykpIHsKKwkJbm9kZSA9ICZm aXJzdF9ub2RlW2hlYWQgJSBudW1fbm9kZXNdOworCQlyZXEgPSBub2RlLT5ub2RlX2luZm8ucmVx OworCQlpZiAocmVxICYmICFpOTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRlZChyZXEsIHRydWUpKQor CQkJV0FSTl9PTigxKTsKKwkJaGVhZCsrOworCX0KKworCWV2ZW50LT5ody5zdGF0ZSA9IFBFUkZf SEVTX1NUT1BQRUQ7CisJZGV2X3ByaXYtPmdlbl9wbXUuYnVmZmVyLnRhaWwgPSAwOworCWRldl9w cml2LT5nZW5fcG11LmJ1ZmZlci5oZWFkID0gMDsKKworCW11dGV4X3VubG9jaygmZGV2X3ByaXYt PmRldi0+c3RydWN0X211dGV4KTsKKwljb21wbGV0ZSgmZGV2X3ByaXYtPmdlbl9wbXUuY29tcGxl dGUpOworfQorCiBzdGF0aWMgdm9pZCBnZW5fcG11X2ZsdXNoX3NuYXBzaG90cyhzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJV0FSTl9PTighZGV2X3ByaXYtPmdlbl9wbXUu YnVmZmVyLmFkZHIpOwpAQCAtNTYyLDYgKzYwOSw3IEBAIHN0YXRpYyB2b2lkIGk5MTVfb2FfZXZl bnRfZGVzdHJveShzdHJ1Y3QgcGVyZl9ldmVudCAqZXZlbnQpCiAKIHN0YXRpYyB2b2lkIGdlbl9i dWZmZXJfZGVzdHJveShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIHsKKwl3YWl0X2Zv cl9jb21wbGV0aW9uKCZpOTE1LT5nZW5fcG11LmNvbXBsZXRlKTsKIAltdXRleF9sb2NrKCZpOTE1 LT5kZXYtPnN0cnVjdF9tdXRleCk7CiAKIAl2dW5tYXAoaTkxNS0+Z2VuX3BtdS5idWZmZXIuYWRk cik7CkBAIC0xNDA5LDcgKzE0NTcsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X2dlbl9ldmVudF9zdG9w KHN0cnVjdCBwZXJmX2V2ZW50ICpldmVudCwgaW50IGZsYWdzKQogCWhydGltZXJfY2FuY2VsKCZk ZXZfcHJpdi0+Z2VuX3BtdS50aW1lcik7CiAJZ2VuX3BtdV9mbHVzaF9zbmFwc2hvdHMoZGV2X3By aXYpOwogCi0JZXZlbnQtPmh3LnN0YXRlID0gUEVSRl9IRVNfU1RPUFBFRDsKKwlzY2hlZHVsZV93 b3JrKCZkZXZfcHJpdi0+Z2VuX3BtdS53b3JrX2V2ZW50X3N0b3ApOwogfQogCiBzdGF0aWMgaW50 IGk5MTVfZ2VuX2V2ZW50X2FkZChzdHJ1Y3QgcGVyZl9ldmVudCAqZXZlbnQsIGludCBmbGFncykK QEAgLTE1OTUsNiArMTY0Myw5IEBAIHZvaWQgaTkxNV9nZW5fcG11X3JlZ2lzdGVyKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiAJaTkxNS0+Z2VuX3BtdS50aW1lci5mdW5jdGlvbiA9IGhydGltZXJf c2FtcGxlX2dlbjsKIAogCUlOSVRfV09SSygmaTkxNS0+Z2VuX3BtdS53b3JrX3RpbWVyLCBmb3J3 YXJkX2dlbl9wbXVfc25hcHNob3RzX3dvcmspOworCUlOSVRfV09SSygmaTkxNS0+Z2VuX3BtdS53 b3JrX2V2ZW50X3N0b3AsIGk5MTVfZ2VuX3BtdV9zdG9wX3dvcmtfZm4pOworCWluaXRfY29tcGxl dGlvbigmaTkxNS0+Z2VuX3BtdS5jb21wbGV0ZSk7CisKIAlzcGluX2xvY2tfaW5pdCgmaTkxNS0+ Z2VuX3BtdS5sb2NrKTsKIAogCWk5MTUtPmdlbl9wbXUucG11LmNhcGFiaWxpdGllcyAgPSBQRVJG X1BNVV9DQVBfSVNfREVWSUNFOwpAQCAtMTYyNSw2ICsxNjc2LDcgQEAgdm9pZCBpOTE1X2dlbl9w bXVfdW5yZWdpc3RlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlyZXR1cm47CiAKIAljYW5j ZWxfd29ya19zeW5jKCZpOTE1LT5nZW5fcG11LndvcmtfdGltZXIpOworCWNhbmNlbF93b3JrX3N5 bmMoJmk5MTUtPmdlbl9wbXUud29ya19ldmVudF9zdG9wKTsKIAogCXBlcmZfcG11X3VucmVnaXN0 ZXIoJmk5MTUtPmdlbl9wbXUucG11KTsKIAlpOTE1LT5nZW5fcG11LnBtdS5ldmVudF9pbml0ID0g TlVMTDsKLS0gCjEuOC41LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==