From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH v2 3/3] drm/i915: Refactor tests for validity of RING_TAIL Date: Mon, 27 Mar 2017 14:00:09 +0100 Message-ID: <20170327130009.4678-3-chris@chris-wilson.co.uk> References: <20170327130009.4678-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id BD5D66E1E9 for ; Mon, 27 Mar 2017 13:00:18 +0000 (UTC) Received: by mail-wr0-x241.google.com with SMTP id 20so13022259wrx.0 for ; Mon, 27 Mar 2017 06:00:18 -0700 (PDT) In-Reply-To: <20170327130009.4678-1-chris@chris-wilson.co.uk> 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 V2hpbHN0IEkgbGlrZSBoYXZpbmcgdGhlIGFzc2VydGlvbnMgY2xlYXJseSB2aXNpYmxlIGluIHRo ZSBjb2RlLCB0aGV5CmFyZSBxdWl0ZSByZXBldGl0aW91cyEgQXMgd2UgZmluZCBuZXcgbGltaXRz IHdlIHdhbnQgdG8gaW5jb3Jwb3JhdGUgaW50bwp0aGUgc2V0IG9mIGFzc2VydGlvbnMsIGl0IG1h a2Ugc2Vuc2UgdG8gcmVmYWN0b3IgdGhlbSB0byBhIGNvbW1vbgpyb3V0aW5lLgoKU2lnbmVkLW9m Zi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+ClJldmlld2VkLWJ5 OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICB8IDEyICsrKystLS0tLS0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwgIDkgKysrLS0tLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggfCAxMSArKysrKysrKysrKwogMyBmaWxl cyBjaGFuZ2VkLCAxOCBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5jCmluZGV4IDM5Y2I4NGE1ZDRlNC4uYjBjM2EwMjliNTkyIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuYwpAQCAtMzI2LDggKzMyNiw3IEBAIHN0YXRpYyB1NjQgZXhlY2xpc3Rz X3VwZGF0ZV9jb250ZXh0KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcnEpCiAJCXJxLT5j dHgtPnBwZ3R0ID86IHJxLT5pOTE1LT5tbS5hbGlhc2luZ19wcGd0dDsKIAl1MzIgKnJlZ19zdGF0 ZSA9IGNlLT5scmNfcmVnX3N0YXRlOwogCi0JR0VNX0JVR19PTighSVNfQUxJR05FRChycS0+dGFp bCwgOCkpOwotCUdFTV9CVUdfT04ocnEtPnRhaWwgPj0gcnEtPnJpbmctPnNpemUpOworCWFzc2Vy dF9yaW5nX3RhaWxfdmFsaWQocnEtPnJpbmcsIHJxLT50YWlsKTsKIAlyZWdfc3RhdGVbQ1RYX1JJ TkdfVEFJTCsxXSA9IHJxLT50YWlsOwogCiAJLyogVHJ1ZSAzMmIgUFBHVFQgd2l0aCBkeW5hbWlj IHBhZ2UgYWxsb2NhdGlvbjogdXBkYXRlIFBEUApAQCAtMTI4Miw4ICsxMjgxLDcgQEAgc3RhdGlj IHZvaWQgcmVzZXRfY29tbW9uX3Jpbmcoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAog CXJlcXVlc3QtPnRhaWwgPQogCQlpbnRlbF9yaW5nX3dyYXAocmVxdWVzdC0+cmluZywKIAkJCQly ZXF1ZXN0LT53YV90YWlsIC0gV0FfVEFJTF9EV09SRFMqc2l6ZW9mKHUzMikpOwotCUdFTV9CVUdf T04oIUlTX0FMSUdORUQocmVxdWVzdC0+dGFpbCwgOCkpOwotCUdFTV9CVUdfT04ocmVxdWVzdC0+ dGFpbCA+PSByZXF1ZXN0LT5yaW5nLT5zaXplKTsKKwlhc3NlcnRfcmluZ190YWlsX3ZhbGlkKHJl cXVlc3QtPnJpbmcsIHJlcXVlc3QtPnRhaWwpOwogfQogCiBzdGF0aWMgaW50IGludGVsX2xvZ2lj YWxfcmluZ19lbWl0X3BkcHMoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXEpCkBAIC0x NDk0LDggKzE0OTIsNyBAQCBzdGF0aWMgdm9pZCBnZW44X2VtaXRfYnJlYWRjcnVtYihzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QsIHUzMiAqY3MpCiAJKmNzKysgPSBNSV9VU0VS X0lOVEVSUlVQVDsKIAkqY3MrKyA9IE1JX05PT1A7CiAJcmVxdWVzdC0+dGFpbCA9IGludGVsX3Jp bmdfb2Zmc2V0KHJlcXVlc3QsIGNzKTsKLQlHRU1fQlVHX09OKCFJU19BTElHTkVEKHJlcXVlc3Qt PnRhaWwsIDgpKTsKLQlHRU1fQlVHX09OKHJlcXVlc3QtPnRhaWwgPj0gcmVxdWVzdC0+cmluZy0+ c2l6ZSk7CisJYXNzZXJ0X3JpbmdfdGFpbF92YWxpZChyZXF1ZXN0LT5yaW5nLCByZXF1ZXN0LT50 YWlsKTsKIAogCWdlbjhfZW1pdF93YV90YWlsKHJlcXVlc3QsIGNzKTsKIH0KQEAgLTE1MjMsOCAr MTUyMCw3IEBAIHN0YXRpYyB2b2lkIGdlbjhfZW1pdF9icmVhZGNydW1iX3JlbmRlcihzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QsCiAJKmNzKysgPSBNSV9VU0VSX0lOVEVSUlVQ VDsKIAkqY3MrKyA9IE1JX05PT1A7CiAJcmVxdWVzdC0+dGFpbCA9IGludGVsX3Jpbmdfb2Zmc2V0 KHJlcXVlc3QsIGNzKTsKLQlHRU1fQlVHX09OKCFJU19BTElHTkVEKHJlcXVlc3QtPnRhaWwsIDgp KTsKLQlHRU1fQlVHX09OKHJlcXVlc3QtPnRhaWwgPj0gcmVxdWVzdC0+cmluZy0+c2l6ZSk7CisJ YXNzZXJ0X3JpbmdfdGFpbF92YWxpZChyZXF1ZXN0LT5yaW5nLCByZXF1ZXN0LT50YWlsKTsKIAog CWdlbjhfZW1pdF93YV90YWlsKHJlcXVlc3QsIGNzKTsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3JpbmdidWZmZXIuYwppbmRleCA0NzkyMWRjYmVkYjMuLjY2YTJiOGI4Mzk3MiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtNzc0LDggKzc3NCw3IEBAIHN0 YXRpYyB2b2lkIGk5eHhfc3VibWl0X3JlcXVlc3Qoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0 ICpyZXF1ZXN0KQogCiAJaTkxNV9nZW1fcmVxdWVzdF9zdWJtaXQocmVxdWVzdCk7CiAKLQlHRU1f QlVHX09OKCFJU19BTElHTkVEKHJlcXVlc3QtPnRhaWwsIDgpKTsKLQlHRU1fQlVHX09OKHJlcXVl c3QtPnRhaWwgPj0gcmVxdWVzdC0+cmluZy0+c2l6ZSk7CisJYXNzZXJ0X3JpbmdfdGFpbF92YWxp ZChyZXF1ZXN0LT5yaW5nLCByZXF1ZXN0LT50YWlsKTsKIAlJOTE1X1dSSVRFX1RBSUwocmVxdWVz dC0+ZW5naW5lLCByZXF1ZXN0LT50YWlsKTsKIH0KIApAQCAtNzg3LDggKzc4Niw3IEBAIHN0YXRp YyB2b2lkIGk5eHhfZW1pdF9icmVhZGNydW1iKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAq cmVxLCB1MzIgKmNzKQogCSpjcysrID0gTUlfVVNFUl9JTlRFUlJVUFQ7CiAKIAlyZXEtPnRhaWwg PSBpbnRlbF9yaW5nX29mZnNldChyZXEsIGNzKTsKLQlHRU1fQlVHX09OKCFJU19BTElHTkVEKHJl cS0+dGFpbCwgOCkpOwotCUdFTV9CVUdfT04ocmVxLT50YWlsID49IHJlcS0+cmluZy0+c2l6ZSk7 CisJYXNzZXJ0X3JpbmdfdGFpbF92YWxpZChyZXEtPnJpbmcsIHJlcS0+dGFpbCk7CiB9CiAKIHN0 YXRpYyBjb25zdCBpbnQgaTl4eF9lbWl0X2JyZWFkY3J1bWJfc3ogPSA0OwpAQCAtODI3LDggKzgy NSw3IEBAIHN0YXRpYyB2b2lkIGdlbjhfcmVuZGVyX2VtaXRfYnJlYWRjcnVtYihzdHJ1Y3QgZHJt X2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAkqY3MrKyA9IE1JX05PT1A7CiAKIAlyZXEtPnRhaWwg PSBpbnRlbF9yaW5nX29mZnNldChyZXEsIGNzKTsKLQlHRU1fQlVHX09OKCFJU19BTElHTkVEKHJl cS0+dGFpbCwgOCkpOwotCUdFTV9CVUdfT04ocmVxLT50YWlsID49IHJlcS0+cmluZy0+c2l6ZSk7 CisJYXNzZXJ0X3JpbmdfdGFpbF92YWxpZChyZXEtPnJpbmcsIHJlcS0+dGFpbCk7CiB9CiAKIHN0 YXRpYyBjb25zdCBpbnQgZ2VuOF9yZW5kZXJfZW1pdF9icmVhZGNydW1iX3N6ID0gODsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaAppbmRleCAxN2FjNDQ5ODBkODQuLmE4MmEw ODA3ZjY0ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAtNTI5 LDYgKzUyOSwxNyBAQCBpbnRlbF9yaW5nX29mZnNldChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfZ2Vt X3JlcXVlc3QgKnJlcSwgdm9pZCAqYWRkcikKIAlyZXR1cm4gaW50ZWxfcmluZ193cmFwKHJlcS0+ cmluZywgb2Zmc2V0KTsKIH0KIAorc3RhdGljIGlubGluZSB2b2lkCithc3NlcnRfcmluZ190YWls X3ZhbGlkKGNvbnN0IHN0cnVjdCBpbnRlbF9yaW5nICpyaW5nLCB1bnNpZ25lZCBpbnQgdGFpbCkK K3sKKwkvKiBXZSBjb3VsZCBjb21iaW5lIHRoZXNlIGludG8gYSBzaW5nbGUgdGFpbCBvcGVyYXRp b24sIGJ1dCBrZWVwaW5nCisJICogdGhlbSBhcyBzZXBlcmF0ZSB0ZXN0cyB3aWxsIGhlbHAgaWRl bnRpZnkgdGhlIGNhdXNlIHNob3VsZCBvbmUKKwkgKiBldmVyIGZpcmUuCisJICovCisJR0VNX0JV R19PTighSVNfQUxJR05FRCh0YWlsLCA4KSk7CisJR0VNX0JVR19PTih0YWlsID49IHJpbmctPnNp emUpOworfQorCiB2b2lkIGludGVsX3JpbmdfdXBkYXRlX3NwYWNlKHN0cnVjdCBpbnRlbF9yaW5n ICpyaW5nKTsKIAogdm9pZCBpbnRlbF9lbmdpbmVfaW5pdF9nbG9iYWxfc2Vxbm8oc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZW5naW5lLCB1MzIgc2Vxbm8pOwotLSAKMi4xMS4wCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK