From: Dave Gordon Subject: [PATCH 3/3, v2] drm/i915: Track & check calls to intel(_logical)_ring_{begin, advance} Date: Mon, 15 Dec 2014 14:31:40 +0000 Message-ID: <1418653900-6178-1-git-send-email-david.s.gordon@intel.com> References: <548B33B1.2030000@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 5590A6E540 for ; Mon, 15 Dec 2014 06:32:08 -0800 (PST) In-Reply-To: <548B33B1.2030000@intel.com> References: <1418400783-5524-1-git-send-email-david.s.gordon@intel.com> <1418400783-5524-4-git-send-email-david.s.gordon@intel.com> <20141212171239.GI22904@nuc-i3427.alporthouse.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 List-Id: intel-gfx@lists.freedesktop.org V2hlbiBhZGRpbmcgaW5zdHJ1Y3Rpb25zIHRvIGEgbGVnYWN5IG9yIExSQyByaW5nYnVmZmVyLCB0 aGUgc2VxdWVuY2Ugb2YKZW1pdCgpIGNhbGxzIG11c3QgYmUgcHJlY2VkZWQgYnkgYSBjYWxsIHRv IGludGVsKF9sb2dpY2FsKV9yaW5nX2JlZ2luKCkKdG8gcmVzZXJ2ZSB0aGUgcmVxdWlyZWQgYW1v dW50IG9mIHNwYWNlLCBhbmQgZm9sbG93ZWQgYnkgYSBtYXRjaGluZyBjYWxsCnRvIGludGVsKF9s b2dpY2FsKV9yaW5nX2FkdmFuY2UoKSAobm90ZSB0aGF0IHRoaXMgdXNlZCB0byB0cmlnZ2VyCmlt bWVkaWF0ZSBzdWJtaXNzaW9uIHRvIHRoZSBoL3csIGJ1dCBub3cgYWN0dWFsIHN1Ym1pc3Npb24g aXMgZGVmZXJyZWQKdW50aWwgYWxsIHRoZSBpbnN0cnVjdGlvbnMgZm9yIGEgc2luZ2xlIGJhdGNo IHN1Ym1pc3Npb24gaGF2ZSBiZWVuCmFzc2VtYmxlZCkuIEhpc3RvcmljYWxseSBzb21lIChkaXNw bGF5KSBjb2RlIGRpZG4ndCB1c2UgYmVnaW4vYWR2YW5jZSwKYnV0IGp1c3QgaW5zZXJ0ZWQgaW5z dHJ1Y3Rpb25zIGFkIGhvYywgd2hpY2ggd291bGQgdGhlbiBiZSBzZW50IHRvIHRoZQpoYXJkd2Fy ZSBhbG9uZyB3aXRoIHRoZSBjdXJyZW50IG9yIG5leHQgYmF0Y2gsIGJ1dCB0aGlzIGlzIG5vdCBz dXBwb3J0ZWQKYW5kIGlzIG5vdyByZWdhcmRlZCBhcyBpbmNvcnJlY3QuCgpUaGlzIGNvbW1pdCB0 aGVyZWZvcmUgYWRkcyBiZWdpbi9hZHZhbmNlIHRyYWNraW5nLCB3aXRoIFdBUk5pbmdzIHdoZXJl CnZhcmlvdXMgZm9ybXMgb2YgbWlzdXNlIGFyZSBkZXRlY3RlZC4gVGhlc2UgaW5jbHVkZToKKiBh ZHZhbmNlIHdpdGhvdXQgYmVnaW4KKiBiZWdpbiB3aXRob3V0IGFkdmFuY2UgYmVmb3JlIHN1Ym1p c3Npb24gdG8gaC93CiogbXVsdGlwbGUgYmVnaW5zIHdpdGhvdXQgYW4gYWR2YW5jZSBiZXR3ZWVu CiogZXhjZWVkaW5nIHRoZSBzcGFjZSByZXNlcnZlZCBieSBiZWdpbgoqIGxlYXZpbmcgdGhlIHJp bmcgbWlzYWxpZ25lZAoqIHJpbmcgYnVmZmVyIG92ZXJydW4gKG5lZ2F0aXZlIGZyZWVzcGFjZSkK CnYyOiBtb3JlIGRlZHVwbGljYXRpb24gKENocmlzKQoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jk b24gPGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9scmMuYyAgICAgICAgfCAgICAzICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s cmMuaCAgICAgICAgfCAgICAzICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVm ZmVyLmMgfCAgICA5ICsrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVy LmggfCAgIDU3ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0KIDQgZmlsZXMgY2hhbmdl ZCwgNjYgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy Yy5jCmluZGV4IDY5YjA0MmYuLjQyMjIxNzQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCkBA IC0xMDkzLDcgKzEwOTMsOCBAQCBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHN0cnVjdCBp bnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLCBpbnQgbnVtX2R3b3JkcykKIAlpZiAocmV0KQogCQly ZXR1cm4gcmV0OwogCi0JcmluZ2J1Zi0+c3BhY2UgLT0gbnVtX2R3b3JkcyAqIHNpemVvZih1aW50 MzJfdCk7CisJX19pbnRlbF9yaW5nYnVmZmVyX2JlZ2luKHJpbmdidWYsIG51bV9kd29yZHMpOwor CiAJcmV0dXJuIDA7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2xyYy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgKaW5kZXggMTRiMjE2Yi4u NGIyOWVkNiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgKQEAgLTQ4LDggKzQ4LDkgQEAgdm9p ZCBpbnRlbF9sb2dpY2FsX3JpbmdfYWR2YW5jZV9hbmRfc3VibWl0KHN0cnVjdCBpbnRlbF9yaW5n YnVmZmVyICpyaW5nYnVmKTsKICAqLwogc3RhdGljIGlubGluZSB2b2lkIGludGVsX2xvZ2ljYWxf cmluZ19hZHZhbmNlKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmKQogewotCXJpbmdi dWYtPnRhaWwgJj0gcmluZ2J1Zi0+c2l6ZSAtIDE7CisJX19pbnRlbF9yaW5nYnVmZmVyX2FkdmFu Y2UocmluZ2J1Zik7CiB9CisKIC8qKgogICogaW50ZWxfbG9naWNhbF9yaW5nX2VtaXQoKSAtIHdy aXRlIGEgRFdPUkQgdG8gdGhlIHJpbmdidWZmZXIuCiAgKiBAcmluZ2J1ZjogUmluZ2J1ZmZlciB0 byB3cml0ZSB0by4KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Jpbmdi dWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCA2 NjBkMTBkLi4wZGU5MDY1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y aW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5j CkBAIC01NSw2ICs1NSw3IEBAIGludCBfX2ludGVsX3Jpbmdfc3BhY2UoaW50IGhlYWQsIGludCB0 YWlsLCBpbnQgc2l6ZSkKIAlpbnQgc3BhY2UgPSBoZWFkIC0gdGFpbDsKIAlpZiAoc3BhY2UgPD0g MCkKIAkJc3BhY2UgKz0gc2l6ZTsKKwlXQVJOX09OKHNwYWNlIDwgSTkxNV9SSU5HX0ZSRUVfU1BB Q0UpOwogCXJldHVybiBzcGFjZSAtIEk5MTVfUklOR19GUkVFX1NQQUNFOwogfQogCkBAIC04Miwx MCArODMsMTMgQEAgYm9vbCBpbnRlbF9yaW5nX3N0b3BwZWQoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZykKIAlyZXR1cm4gZGV2X3ByaXYtPmdwdV9lcnJvci5zdG9wX3JpbmdzICYgaW50ZWxf cmluZ19mbGFnKHJpbmcpOwogfQogCisvKiBhZHZhbmNlKCksIGFuZCB0aGVuIGFsc28gc3VibWl0 IHRvIGhhcmR3YXJlICovCiB2b2lkIF9faW50ZWxfcmluZ19hZHZhbmNlKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKnJpbmcpCiB7CiAJc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYgPSBy aW5nLT5idWZmZXI7Ci0JcmluZ2J1Zi0+dGFpbCAmPSByaW5nYnVmLT5zaXplIC0gMTsKKworCWlu dGVsX3JpbmdfYWR2YW5jZShyaW5nKTsKKwogCWlmIChpbnRlbF9yaW5nX3N0b3BwZWQocmluZykp CiAJCXJldHVybjsKIAlyaW5nLT53cml0ZV90YWlsKHJpbmcsIHJpbmdidWYtPnRhaWwpOwpAQCAt MjEwNyw3ICsyMTExLDggQEAgaW50IGludGVsX3JpbmdfYmVnaW4oc3RydWN0IGludGVsX2VuZ2lu ZV9jcyAqcmluZywKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0JcmluZy0+YnVmZmVyLT5z cGFjZSAtPSBudW1fZHdvcmRzICogc2l6ZW9mKHVpbnQzMl90KTsKKwlfX2ludGVsX3JpbmdidWZm ZXJfYmVnaW4ocmluZy0+YnVmZmVyLCBudW1fZHdvcmRzKTsKKwogCXJldHVybiAwOwogfQogCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggNmRiYjZmNC4uYjAwMjA1 NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAtMTEyLDYgKzEx MiwxMSBAQCBzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciB7CiAJaW50IHNpemU7CiAJaW50IGVmZmVj dGl2ZV9zaXplOwogCisJLyogdGhlc2UgbGV0IGJlZ2luL2FkdmFuY2UoKSBjaGVjayBmb3IgbWlz dXNlICovCisJaW50IHJzdl9sZXZlbDsJLyogcmVzZXJ2YXRpb24gbmVzdGluZyBsZXZlbCAqLwor CWludCByc3Zfc2l6ZTsJLyogc2l6ZSBwYXNzZWQgdG8gYmVnaW4oKSAqLworCWludCByc3Zfc3Rh cnQ7CS8qIHRhaWwgd2hlbiBiZWdpbigpIGxhc3QgcmV0dXJuZWQgKi8KKwogCS8qKiBXZSB0cmFj ayB0aGUgcG9zaXRpb24gb2YgdGhlIHJlcXVlc3RzIGluIHRoZSByaW5nIGJ1ZmZlciwgYW5kCiAJ ICogd2hlbiBlYWNoIGlzIHJldGlyZWQgd2UgaW5jcmVtZW50IGxhc3RfcmV0aXJlZF9oZWFkIGFz IHRoZSBHUFUKIAkgKiBtdXN0IGhhdmUgZmluaXNoZWQgcHJvY2Vzc2luZyB0aGUgcmVxdWVzdCBh bmQgc28gd2Uga25vdyB3ZQpAQCAtNDAxLDExICs0MDYsNTkgQEAgc3RhdGljIGlubGluZSB2b2lk IGludGVsX3JpbmdfZW1pdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCWlvd3JpdGUz MihkYXRhLCByaW5nYnVmLT52aXJ0dWFsX3N0YXJ0ICsgcmluZ2J1Zi0+dGFpbCk7CiAJcmluZ2J1 Zi0+dGFpbCArPSA0OwogfQorCitzdGF0aWMgaW5saW5lIHZvaWQgX19pbnRlbF9yaW5nYnVmZmVy X2JlZ2luKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAorCQkJCQkgICAgaW50IG51 bV9kd29yZHMpCit7CisJaW50IG5ieXRlcyA9IG51bV9kd29yZHMgKiBzaXplb2YodWludDMyX3Qp OworCisJLyogRmlyc3QgY2hlY2sgdGhlIGluY29taW5nIHBhcmFtZXRlciAqLworCVdBUk5fT04o bnVtX2R3b3JkcyAmIDEpOworCVdBUk5fT04obmJ5dGVzIDw9IDApOworCisJLyogQ2hlY2sgdGhh dCAndGFpbCcgaXMgc2FuZSAqLworCVdBUk5fT04ocmluZ2J1Zi0+dGFpbCAmIDcpOworCVdBUk5f T04ocmluZ2J1Zi0+dGFpbCA+IHJpbmdidWYtPmVmZmVjdGl2ZV9zaXplLTgpOworCVdBUk5fT04o cmluZ2J1Zi0+dGFpbCArIG5ieXRlcyA+IHJpbmdidWYtPmVmZmVjdGl2ZV9zaXplKTsKKworCS8q IENoZWNrIGZvciBiZWdpbigpIGNhbGxlZCB0d2ljZSBvciBtb3JlIHdpdGhvdXQgYWR2YW5jZSgp ICovCisJV0FSTl9PTihyaW5nYnVmLT5yc3ZfbGV2ZWwrKyk7CisKKwkvKiBSZWNvcmQgdGhlIHN0 YXJ0IGFuZCBzaXplLCB0aGVuIGRlY3JlbWVudCB0aGUgcmVtYWluaW5nIHNwYWNlICovCisJcmlu Z2J1Zi0+cnN2X3N0YXJ0ID0gcmluZ2J1Zi0+dGFpbDsKKwlyaW5nYnVmLT5yc3Zfc2l6ZSA9IG5i eXRlczsKKwlyaW5nYnVmLT5zcGFjZSAtPSBuYnl0ZXM7CisKKwlXQVJOX09OKHJpbmdidWYtPnNw YWNlIDwgMCk7Cit9CisKK3N0YXRpYyBpbmxpbmUgdm9pZCBfX2ludGVsX3JpbmdidWZmZXJfYWR2 YW5jZShzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZikKK3sKKwkvKiBDaGVjayB0aGF0 ICdzcGFjZScgYW5kICd0YWlsJyBhcmUgc3RpbGwgc2FuZSAqLworCVdBUk5fT04ocmluZ2J1Zi0+ c3BhY2UgPCAwKTsKKwlXQVJOX09OKHJpbmdidWYtPnRhaWwgJiA3KTsKKwlXQVJOX09OKHJpbmdi dWYtPnRhaWwgPiByaW5nYnVmLT5lZmZlY3RpdmVfc2l6ZSk7CisKKwkvKiBDaGVjayBmb3IgYWR2 YW5jZSgpIGNhbGxlZCBtb3JlIHRpbWVzIHRoYW4gYmVnaW4oKSAqLworCVdBUk5fT04oLS1yaW5n YnVmLT5yc3ZfbGV2ZWwpOworCisJaWYgKCFXQVJOX09OKHJpbmdidWYtPnJzdl9zdGFydCA8IDAg fHwgcmluZ2J1Zi0+cnN2X3NpemUgPCAwKSkgeworCQlXQVJOX09OKHJpbmdidWYtPnRhaWwgPiBy aW5nYnVmLT5yc3Zfc3RhcnQgKyByaW5nYnVmLT5yc3Zfc2l6ZSk7CisKKwkJLyogTmVnYXRlIHN0 YXJ0IGFuZCBzaXplIHRvIHNob3cgdGhhdCB0aGV5J3ZlIGJlZW4gdXNlZCB1cCAqLworCQlyaW5n YnVmLT5yc3Zfc3RhcnQgPSAtcmluZ2J1Zi0+cnN2X3NpemU7CisJCXJpbmdidWYtPnJzdl9zaXpl ID0gLXJpbmdidWYtPnJzdl9zaXplOworCX0KKworCS8qIFdyYXAgdGhlIHRhaWwgb2Zmc2V0IGJh Y2sgdG8gdGhlIHN0YXJ0IChzaXplIGlzIGEgcG93ZXIgb2YgMikgKi8KKwlyaW5nYnVmLT50YWls ICY9IHJpbmdidWYtPnNpemUtMTsKK30KKwogc3RhdGljIGlubGluZSB2b2lkIGludGVsX3Jpbmdf YWR2YW5jZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogewotCXN0cnVjdCBpbnRlbF9y aW5nYnVmZmVyICpyaW5nYnVmID0gcmluZy0+YnVmZmVyOwotCXJpbmdidWYtPnRhaWwgJj0gcmlu Z2J1Zi0+c2l6ZSAtIDE7CisJX19pbnRlbF9yaW5nYnVmZmVyX2FkdmFuY2UocmluZy0+YnVmZmVy KTsKIH0KKwogaW50IF9faW50ZWxfcmluZ19zcGFjZShpbnQgaGVhZCwgaW50IHRhaWwsIGludCBz aXplKTsKIHZvaWQgaW50ZWxfcmluZ191cGRhdGVfc3BhY2Uoc3RydWN0IGludGVsX3JpbmdidWZm ZXIgKnJpbmdidWYpOwogaW50IGludGVsX3Jpbmdfc3BhY2Uoc3RydWN0IGludGVsX3JpbmdidWZm ZXIgKnJpbmdidWYpOwotLSAKMS43LjkuNQpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=