From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Gordon Subject: [PATCH v2 2/2] drm/i915: Track nested calls to intel(_logical)_ring_{begin, advance} Date: Wed, 10 Dec 2014 16:12:15 +0000 Message-ID: <1418227935-21630-3-git-send-email-david.s.gordon@intel.com> References: <1418224029-20055-1-git-send-email-david.s.gordon@intel.com> <1418227935-21630-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 2E5156E6AF for ; Wed, 10 Dec 2014 08:18:38 -0800 (PST) In-Reply-To: <1418227935-21630-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 V2l0aCB0aGUgY3VycmVudCBkZWZlcnJlZC1zdWJtaXNzaW9uIG1vZGVsLCBpZiBhIHByb2JsZW0g YXJpc2VzIHBhcnQtd2F5CnRocm91Z2ggdGhlIGluc2VydGlvbiBvZiBpbnN0cnVjdGlvbnMgaW50 byB0aGUgcmluZ2J1ZmZlciAoZS5nLiBkdWUgdG8Kb25lIG9mIHRoZSBiZWdpbigpIGNhbGxzIGZp bmRpbmcgdGhlcmUncyBub3QgZW5vdWdoIHNwYWNlKSwgd2UgYXZvaWQKc2VuZGluZyB0aGUgaW5j b21wbGV0ZSBzZXF1ZW5jZSB0byB0aGUgaC93OyBidXQgY3VycmVudGx5IGhhdmUgbm8gbWVhbnMK b2YgdW5kb2luZyB0aGUgd29yayBzbyBmYXIsIHdoaWNoIHdpbGwgbGVhZCB0byB1bmRlZmluZWQg YmVoYXZpb3VyIHdoZW4KdGhlIG5leHQgYmF0Y2ggaXMgc3VibWl0dGVkIChwcm9iYWJseSBURFIg d2lsbCB0cmlnZ2VyIGEgcmVzZXQgZmlyc3QsCnRob3VnaCwgYW5kIGNsZWFuIHVwIHRoZSByaW5n IHN0YXRlKS4KCkEgZnV0dXJlIGlkZWEgaXMgdG8gbW92ZSB0byBhbiBhdG9taWMtc3VibWlzc2lv biBtb2RlbCwgd2hlcmUgYWxsIHRoZQpzcGFjZSByZXF1aXJlZCBmb3IgYSBiYXRjaCBzdWJtaXNz aW9uIGlzIHJlc2VydmVkIHVwIGZyb250LCBhbmQgaW4gdGhlCmV2ZW50IG9mIGZhaWx1cmUgcGFy dHdheSB0aHJvdWdoLCB0aGUgd29yayBjYW4gYmUgYWJhbmRvbmVkIHdpdGhvdXQKc2lkZS1lZmZl Y3RzLiBUaGlzIHdpbGwgYmUgcmVxdWlyZWQgZm9yIHRoZSBmb3J0aGNvbWluZyBHUFUgc2NoZWR1 bGVyCihzcGVjaWZpY2FsbHksIGZvciBwcmVlbXB0aW9uKS4KClRvIHN1cHBvcnQgdGhpcywgd2Ug YWxsb3cgbmVzdGVkIGJlZ2luL2FkdmFuY2UgcGFpcnMuICBTcGVjaWZpY2FsbHksCnRoZSBvdXRl cm1vc3QgcGFpciBkZWZpbmVzIHRoZSB0b3RhbCBzcGFjZSByZXNlcnZhdGlvbjsgaW5uZXIgcGFp cnMKY2FuIGJlIG5lc3RlZCBhZCBsaWIsIGJ1dCBhbGwgaW5uZXIgcmVzZXJ2YXRpb25zIGF0IGFu eSBsZXZlbCBtdXN0CmZpdCBlbnRpcmVseSB3aXRoaW4gdGhlIG91dGVybW9zdCBvbmUuICBUaHVz LCB0aGlzIGlzIHBlcm1pdHRlZDoKCgliZWdpbigxMjgpIC0gZ3VhcmFudGVlcyB0aGF0IHVwIHRv IDEyOCBkd29yZHMgY2FuIG5vdyBiZQoJCQllbWl0dGVkIHdpdGhvdXQgd2FpdGluZyBmb3IgbW9y ZSBmcmVlc3BhY2UKCQliZWdpbig2KQoJCWFkdmFuY2UKCQliZWdpbigxMCkKCQlhZHZhbmNlCgkJ YmVnaW4oOCkKCQlhZHZhbmNlCgkJZXRjLCBhcyBsb25nIGFzIHRoZSB0b3RhbCBpcyBubyBtb3Jl IHRoYW4gMTI4IGR3b3JkcwoJYWR2YW5jZS1hbmQtc3VibWl0CgpUaGUgZXhlY2J1ZmZlciBjb2Rl IHdpbGwgbGF0ZXIgYmUgZW5oYW5jZWQgdG8gdXNlIHRoaXMgYXBwcm9hY2guIEluIHRoZQptZWFu IHRpbWUsIHRoZSB0cmFkaXRpb25hbCBzaW5nbGUtbGV2ZWwgYmVnaW4vYWR2YW5jZSBtZWNoYW5p c20gcmVtYWlucwpmdWxseSBzdXBwb3J0ZWQuCgpUaGlzIGNvbW1pdCBjaGFuZ2VzIG9ubHkgdGhl IGJlZ2luL2FkdmFuY2UgY2hlY2tpbmcgY29kZSwgdG8gcGVybWl0IChidXQKbm90IHJlcXVpcmUp IG5lc3RlZCBiZWdpbi9hZHZhbmNlIHBhaXJzLgoKU2lnbmVkLW9mZi1ieTogRGF2ZSBHb3Jkb24g PGRhdmlkLnMuZ29yZG9uQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9yaW5nYnVmZmVyLmggfCAgIDE1ICsrKysrKysrKysrKy0tLQogMSBmaWxlIGNoYW5nZWQsIDEy IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5oCmluZGV4IGE2NjYwYzEuLjY4NjY1YzcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9yaW5nYnVmZmVyLmgKQEAgLTQxNiw4ICs0MTYsMTcgQEAgc3RhdGljIGlubGluZSB2 b2lkIF9faW50ZWxfcmluZ2J1ZmZlcl9iZWdpbihzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmlu Z2J1ZiwKIAlXQVJOX09OKG5ieXRlcyA8PSAwKTsKIAogCWlmIChyaW5nYnVmLT5yc3ZfbGV2ZWwr KykgewotCQkvKiBiZWdpbigpIGNhbGxlZCB0d2ljZSBvciBtb3JlIHdpdGhvdXQgYWR2YW5jZSgp ICovCi0JCVdBUk5fT04oMSk7CisJCS8qCisJCSAqIEEgbmVzdGVkIHJlc2VydmF0aW9uOyBjaGVj ayB0aGF0IGl0IGZhbGxzIGVudGlyZWx5CisJCSAqIHdpdGhpbiB0aGUgb3V0ZXIgYmxvY2suIERv bid0IGFkanVzdCByZW1haW5pbmcgc3BhY2UuCisJCSAqLworCQlXQVJOX09OKHJpbmdidWYtPnJz dl9zdGFydCA8IDApOworCQlXQVJOX09OKHJpbmdidWYtPnJzdl9zdGFydCAmIDcpOworCQlXQVJO X09OKHJpbmdidWYtPnRhaWwgJiA3KTsKKwkJV0FSTl9PTihyaW5nYnVmLT50YWlsID4gcmluZ2J1 Zi0+ZWZmZWN0aXZlX3NpemUpOworCQlXQVJOX09OKHJpbmdidWYtPnRhaWwgPiByaW5nYnVmLT5y c3Zfc3RhcnQgKyByaW5nYnVmLT5yc3Zfc2l6ZSk7CisJCVdBUk5fT04ocmluZ2J1Zi0+dGFpbCAr IG5ieXRlcyA+IHJpbmdidWYtPmVmZmVjdGl2ZV9zaXplKTsKKwkJV0FSTl9PTihyaW5nYnVmLT50 YWlsICsgbmJ5dGVzID4gcmluZ2J1Zi0+cnN2X3N0YXJ0ICsgcmluZ2J1Zi0+cnN2X3NpemUpOwog CX0gZWxzZSB7CiAJCS8qCiAJCSAqIEEgbmV3IHJlc2VydmF0aW9uOyB2YWxpZGF0ZSBhbmQgcmVj b3JkIHRoZSBzdGFydCBhbmQKQEAgLTQzNiw3ICs0NDUsNyBAQCBzdGF0aWMgaW5saW5lIHZvaWQg X19pbnRlbF9yaW5nYnVmZmVyX2JlZ2luKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVm LAogCiBzdGF0aWMgaW5saW5lIHZvaWQgX19pbnRlbF9yaW5nYnVmZmVyX2NoZWNrKHN0cnVjdCBp bnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmKQogewotCVdBUk5fT04ocmluZ2J1Zi0+cnN2X2xldmVs LS0gIT0gMSk7CisJV0FSTl9PTihyaW5nYnVmLT5yc3ZfbGV2ZWwtLSA8PSAwKTsKIAlXQVJOX09O KHJpbmdidWYtPnJzdl9zdGFydCA8IDAgfHwgcmluZ2J1Zi0+cnN2X3NpemUgPCAwKTsKIAlXQVJO X09OKHJpbmdidWYtPnRhaWwgJiA3KTsKIAlXQVJOX09OKHJpbmdidWYtPnRhaWwgPiByaW5nYnVm LT5yc3Zfc3RhcnQgKyByaW5nYnVmLT5yc3Zfc2l6ZSk7Ci0tIAoxLjcuOS41CgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=