From: Dave Gordon Subject: [PATCH 3/3] drm/i915: Track & check calls to intel(_logical)_ring_{begin, advance} Date: Fri, 12 Dec 2014 16:13:03 +0000 Message-ID: <1418400783-5524-4-git-send-email-david.s.gordon@intel.com> References: <1418400783-5524-1-git-send-email-david.s.gordon@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id AE6D56E4D7 for ; Fri, 12 Dec 2014 08:14:57 -0800 (PST) In-Reply-To: <1418400783-5524-1-git-send-email-david.s.gordon@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 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 ClNpZ25lZC1vZmYtYnk6IERhdmUgR29yZG9uIDxkYXZpZC5zLmdvcmRvbkBpbnRlbC5jb20+Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgIHwgICAgNCArKy0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oICAgICAgICB8ICAgMTEgKysrKysrLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgICAgOSArKysrLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCB8ICAgNTQgKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrLQogNCBmaWxlcyBjaGFuZ2VkLCA3MyBpbnNlcnRpb25zKCspLCA1IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5kZXggNjliMDQyZi4uNDIyZjNi OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTgyNSw2ICs4MjUsNyBAQCB2b2lkIGlu dGVsX2xvZ2ljYWxfcmluZ19hZHZhbmNlX2FuZF9zdWJtaXQoc3RydWN0IGludGVsX3JpbmdidWZm ZXIgKnJpbmdidWYpCiAJc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCA9IHJpbmdidWYtPkZJWE1F X2xyY19jdHg7CiAKIAlpbnRlbF9sb2dpY2FsX3JpbmdfYWR2YW5jZShyaW5nYnVmKTsKKwlXQVJO X09OKHJpbmdidWYtPnJzdl9sZXZlbCAhPSAwKTsKIAogCWlmIChpbnRlbF9yaW5nX3N0b3BwZWQo cmluZykpCiAJCXJldHVybjsKQEAgLTEwOTMsNyArMTA5NCw4IEBAIGludCBpbnRlbF9sb2dpY2Fs X3JpbmdfYmVnaW4oc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsIGludCBudW1fZHdv cmRzKQogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKLQlyaW5nYnVmLT5zcGFjZSAtPSBudW1f ZHdvcmRzICogc2l6ZW9mKHVpbnQzMl90KTsKKwlfX2ludGVsX3JpbmdidWZmZXJfYmVnaW4ocmlu Z2J1ZiwgbnVtX2R3b3Jkcyk7CisKIAlyZXR1cm4gMDsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s cmMuaAppbmRleCAxNGIyMTZiLi45YTA0NTdlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaApA QCAtNDgsOCArNDgsMTcgQEAgdm9pZCBpbnRlbF9sb2dpY2FsX3JpbmdfYWR2YW5jZV9hbmRfc3Vi bWl0KHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmKTsKICAqLwogc3RhdGljIGlubGlu ZSB2b2lkIGludGVsX2xvZ2ljYWxfcmluZ19hZHZhbmNlKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVy ICpyaW5nYnVmKQogewotCXJpbmdidWYtPnRhaWwgJj0gcmluZ2J1Zi0+c2l6ZSAtIDE7CisJX19p bnRlbF9yaW5nYnVmZmVyX2NoZWNrKHJpbmdidWYpOworCisJLyoKKwkgKiBUYWlsID09IGVmZmVj aXZlX3NpemUgaXMgbGVnaXRpbWF0ZSAoYnVmZmVyIGV4YWN0bHkgZnVsbCkuCisJICogVGFpbCA+ IGVmZmVjdGl2ZV9zaXplIGlzIG5vdCwgYW5kIHNob3VsZCBnaXZlIGEgd2FybmluZywKKwkgKiBi dXQgd2UnbGwgcmVzZXQgdGFpbCBpbiBib3RoIGNhc2VzIHRvIHByZXZlbnQgZnVydGhlciBjaGFv cworCSAqLworCWlmIChyaW5nYnVmLT50YWlsID49IHJpbmdidWYtPmVmZmVjdGl2ZV9zaXplKQor CQlyaW5nYnVmLT50YWlsIC09IHJpbmdidWYtPmVmZmVjdGl2ZV9zaXplOwogfQorCiAvKioKICAq IGludGVsX2xvZ2ljYWxfcmluZ19lbWl0KCkgLSB3cml0ZSBhIERXT1JEIHRvIHRoZSByaW5nYnVm ZmVyLgogICogQHJpbmdidWY6IFJpbmdidWZmZXIgdG8gd3JpdGUgdG8uCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKaW5kZXggNjYwZDEwZC4uN2ZmYWQzYSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtNTUsNiArNTUsNyBAQCBpbnQgX19p bnRlbF9yaW5nX3NwYWNlKGludCBoZWFkLCBpbnQgdGFpbCwgaW50IHNpemUpCiAJaW50IHNwYWNl ID0gaGVhZCAtIHRhaWw7CiAJaWYgKHNwYWNlIDw9IDApCiAJCXNwYWNlICs9IHNpemU7CisJV0FS Tl9PTihzcGFjZSA8IEk5MTVfUklOR19GUkVFX1NQQUNFKTsKIAlyZXR1cm4gc3BhY2UgLSBJOTE1 X1JJTkdfRlJFRV9TUEFDRTsKIH0KIApAQCAtODUsNyArODYsMTAgQEAgYm9vbCBpbnRlbF9yaW5n X3N0b3BwZWQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIHZvaWQgX19pbnRlbF9yaW5n X2FkdmFuY2Uoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIHsKIAlzdHJ1Y3QgaW50ZWxf cmluZ2J1ZmZlciAqcmluZ2J1ZiA9IHJpbmctPmJ1ZmZlcjsKLQlyaW5nYnVmLT50YWlsICY9IHJp bmdidWYtPnNpemUgLSAxOworCisJaW50ZWxfcmluZ19hZHZhbmNlKHJpbmcpOworCVdBUk5fT04o cmluZ2J1Zi0+cnN2X2xldmVsICE9IDApOworCiAJaWYgKGludGVsX3Jpbmdfc3RvcHBlZChyaW5n KSkKIAkJcmV0dXJuOwogCXJpbmctPndyaXRlX3RhaWwocmluZywgcmluZ2J1Zi0+dGFpbCk7CkBA IC0yMTA3LDcgKzIxMTEsOCBAQCBpbnQgaW50ZWxfcmluZ19iZWdpbihzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICpyaW5nLAogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKLQlyaW5nLT5idWZmZXIt PnNwYWNlIC09IG51bV9kd29yZHMgKiBzaXplb2YodWludDMyX3QpOworCV9faW50ZWxfcmluZ2J1 ZmZlcl9iZWdpbihyaW5nLT5idWZmZXIsIG51bV9kd29yZHMpOworCiAJcmV0dXJuIDA7CiB9CiAK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCA2ZGJiNmY0Li5hNjY2 MGMxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCkBAIC0xMTIsNiAr MTEyLDExIEBAIHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyIHsKIAlpbnQgc2l6ZTsKIAlpbnQgZWZm ZWN0aXZlX3NpemU7CiAKKwkvKiB0aGVzZSBsZXQgYWR2YW5jZSgpIGNoZWNrIGZvciBtaXN1c2Ug Ki8KKwlpbnQgcnN2X2xldmVsOwkvKiByZXNlcnZhdGlvbiBuZXN0aW5nIGxldmVsICovCisJaW50 IHJzdl9zaXplOwkvKiBzaXplIHBhc3NlZCB0byBiZWdpbigpICovCisJaW50IHJzdl9zdGFydDsJ LyogdGFpbCB3aGVuIGJlZ2luKCkgbGFzdCByZXR1cm5lZCAqLworCiAJLyoqIFdlIHRyYWNrIHRo ZSBwb3NpdGlvbiBvZiB0aGUgcmVxdWVzdHMgaW4gdGhlIHJpbmcgYnVmZmVyLCBhbmQKIAkgKiB3 aGVuIGVhY2ggaXMgcmV0aXJlZCB3ZSBpbmNyZW1lbnQgbGFzdF9yZXRpcmVkX2hlYWQgYXMgdGhl IEdQVQogCSAqIG11c3QgaGF2ZSBmaW5pc2hlZCBwcm9jZXNzaW5nIHRoZSByZXF1ZXN0IGFuZCBz byB3ZSBrbm93IHdlCkBAIC00MDEsMTEgKzQwNiw1OCBAQCBzdGF0aWMgaW5saW5lIHZvaWQgaW50 ZWxfcmluZ19lbWl0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJaW93cml0ZTMyKGRh dGEsIHJpbmdidWYtPnZpcnR1YWxfc3RhcnQgKyByaW5nYnVmLT50YWlsKTsKIAlyaW5nYnVmLT50 YWlsICs9IDQ7CiB9CisKK3N0YXRpYyBpbmxpbmUgdm9pZCBfX2ludGVsX3JpbmdidWZmZXJfYmVn aW4oc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCisJCQkJCSAgICBpbnQgbnVtX2R3 b3JkcykKK3sKKwlpbnQgbmJ5dGVzID0gbnVtX2R3b3JkcyAqIHNpemVvZih1aW50MzJfdCk7CisK KwlXQVJOX09OKG51bV9kd29yZHMgJiAxKTsKKwlXQVJOX09OKG5ieXRlcyA8PSAwKTsKKworCWlm IChyaW5nYnVmLT5yc3ZfbGV2ZWwrKykgeworCQkvKiBiZWdpbigpIGNhbGxlZCB0d2ljZSBvciBt b3JlIHdpdGhvdXQgYWR2YW5jZSgpICovCisJCVdBUk5fT04oMSk7CisJfSBlbHNlIHsKKwkJLyoK KwkJICogQSBuZXcgcmVzZXJ2YXRpb247IHZhbGlkYXRlIGFuZCByZWNvcmQgdGhlIHN0YXJ0IGFu ZAorCQkgKiBzaXplLCB0aGVuIGRlZHVjdCB0aGUgc2l6ZSBmcm9tIHRoZSByZW1haW5pbmcgc3Bh Y2UKKwkJICovCisJCVdBUk5fT04ocmluZ2J1Zi0+dGFpbCAmIDcpOworCQlXQVJOX09OKHJpbmdi dWYtPnRhaWwgPiByaW5nYnVmLT5lZmZlY3RpdmVfc2l6ZS04KTsKKwkJV0FSTl9PTihyaW5nYnVm LT50YWlsICsgbmJ5dGVzID4gcmluZ2J1Zi0+ZWZmZWN0aXZlX3NpemUpOworCQlXQVJOX09OKHJp bmdidWYtPnNwYWNlIDwgbmJ5dGVzKTsKKwl9CisKKwlyaW5nYnVmLT5yc3Zfc3RhcnQgPSByaW5n YnVmLT50YWlsOworCXJpbmdidWYtPnJzdl9zaXplID0gbmJ5dGVzOworCXJpbmdidWYtPnNwYWNl IC09IG5ieXRlczsKK30KKworc3RhdGljIGlubGluZSB2b2lkIF9faW50ZWxfcmluZ2J1ZmZlcl9j aGVjayhzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZikKK3sKKwlXQVJOX09OKHJpbmdi dWYtPnJzdl9sZXZlbC0tICE9IDEpOworCVdBUk5fT04ocmluZ2J1Zi0+cnN2X3N0YXJ0IDwgMCB8 fCByaW5nYnVmLT5yc3Zfc2l6ZSA8IDApOworCVdBUk5fT04ocmluZ2J1Zi0+dGFpbCAmIDcpOwor CVdBUk5fT04ocmluZ2J1Zi0+dGFpbCA+IHJpbmdidWYtPnJzdl9zdGFydCArIHJpbmdidWYtPnJz dl9zaXplKTsKKwlXQVJOX09OKHJpbmdidWYtPnRhaWwgPiByaW5nYnVmLT5lZmZlY3RpdmVfc2l6 ZSk7Cit9CisKIHN0YXRpYyBpbmxpbmUgdm9pZCBpbnRlbF9yaW5nX2FkdmFuY2Uoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqcmluZykKIHsKIAlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1 ZiA9IHJpbmctPmJ1ZmZlcjsKLQlyaW5nYnVmLT50YWlsICY9IHJpbmdidWYtPnNpemUgLSAxOwor CisJX19pbnRlbF9yaW5nYnVmZmVyX2NoZWNrKHJpbmdidWYpOworCisJLyoKKwkgKiBUYWlsID09 IGVmZmVjaXZlX3NpemUgaXMgbGVnaXRpbWF0ZSAoYnVmZmVyIGV4YWN0bHkgZnVsbCkuCisJICog VGFpbCA+IGVmZmVjdGl2ZV9zaXplIGlzIG5vdCwgYW5kIHNob3VsZCBnaXZlIGEgd2FybmluZywK KwkgKiBidXQgd2UnbGwgcmVzZXQgdGFpbCBpbiBib3RoIGNhc2VzIHRvIHByZXZlbnQgZnVydGhl ciBjaGFvcworCSAqLworCWlmIChyaW5nYnVmLT50YWlsID49IHJpbmdidWYtPmVmZmVjdGl2ZV9z aXplKQorCQlyaW5nYnVmLT50YWlsIC09IHJpbmdidWYtPmVmZmVjdGl2ZV9zaXplOwogfQorCiBp bnQgX19pbnRlbF9yaW5nX3NwYWNlKGludCBoZWFkLCBpbnQgdGFpbCwgaW50IHNpemUpOwogdm9p ZCBpbnRlbF9yaW5nX3VwZGF0ZV9zcGFjZShzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1 Zik7CiBpbnQgaW50ZWxfcmluZ19zcGFjZShzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1 Zik7Ci0tIAoxLjcuOS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=