From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Anholt Subject: [PATCH 2/7] drm/vc4: Move validation's current/max ip into the validation struct. Date: Mon, 4 Jul 2016 18:14:35 -0700 Message-ID: <1467681280-20317-3-git-send-email-eric@anholt.net> References: <1467681280-20317-1-git-send-email-eric@anholt.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from anholt.net (anholt.net [50.246.234.109]) by gabe.freedesktop.org (Postfix) with ESMTP id 845F56E55B for ; Tue, 5 Jul 2016 01:14:46 +0000 (UTC) In-Reply-To: <1467681280-20317-1-git-send-email-eric@anholt.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org UmVkdWNlcyB0aGUgYXJndW1lbnQgY291bnQgZm9yIHNvbWUgb2YgdGhlIGZ1bmN0aW9ucywgYW5k IHdpbGwgYmUgdXNlZAptb3JlIHdpdGggdGhlIHVwY29taW5nIGxvb3Bpbmcgc3VwcG9ydC4KClNp Z25lZC1vZmYtYnk6IEVyaWMgQW5ob2x0IDxlcmljQGFuaG9sdC5uZXQ+Ci0tLQogZHJpdmVycy9n cHUvZHJtL3ZjNC92YzRfdmFsaWRhdGVfc2hhZGVycy5jIHwgNTQgKysrKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzAgaW5zZXJ0aW9ucygrKSwgMjQgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfdmFsaWRhdGVfc2hh ZGVycy5jIGIvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfdmFsaWRhdGVfc2hhZGVycy5jCmluZGV4 IGY2NzEyNGI0YzUzNC4uNzcxZDkwNDY1M2YyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v dmM0L3ZjNF92YWxpZGF0ZV9zaGFkZXJzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRf dmFsaWRhdGVfc2hhZGVycy5jCkBAIC00MCw2ICs0MCwxNCBAQAogI2luY2x1ZGUgInZjNF9xcHVf ZGVmaW5lcy5oIgogCiBzdHJ1Y3QgdmM0X3NoYWRlcl92YWxpZGF0aW9uX3N0YXRlIHsKKwkvKiBD dXJyZW50IElQIGJlaW5nIHZhbGlkYXRlZC4gKi8KKwl1aW50MzJfdCBpcDsKKworCS8qIElQIGF0 IHRoZSBlbmQgb2YgdGhlIEJPLCBkbyBub3QgcmVhZCBzaGFkZXJbbWF4X2lwXSAqLworCXVpbnQz Ml90IG1heF9pcDsKKworCXVpbnQ2NF90ICpzaGFkZXI7CisKIAlzdHJ1Y3QgdmM0X3RleHR1cmVf c2FtcGxlX2luZm8gdG11X3NldHVwWzJdOwogCWludCB0bXVfd3JpdGVfY291bnRbMl07CiAKQEAg LTEyOSwxMSArMTM3LDExIEBAIHJlY29yZF90ZXh0dXJlX3NhbXBsZShzdHJ1Y3QgdmM0X3ZhbGlk YXRlZF9zaGFkZXJfaW5mbyAqdmFsaWRhdGVkX3NoYWRlciwKIH0KIAogc3RhdGljIGJvb2wKLWNo ZWNrX3RtdV93cml0ZSh1aW50NjRfdCBpbnN0LAotCQlzdHJ1Y3QgdmM0X3ZhbGlkYXRlZF9zaGFk ZXJfaW5mbyAqdmFsaWRhdGVkX3NoYWRlciwKK2NoZWNrX3RtdV93cml0ZShzdHJ1Y3QgdmM0X3Zh bGlkYXRlZF9zaGFkZXJfaW5mbyAqdmFsaWRhdGVkX3NoYWRlciwKIAkJc3RydWN0IHZjNF9zaGFk ZXJfdmFsaWRhdGlvbl9zdGF0ZSAqdmFsaWRhdGlvbl9zdGF0ZSwKIAkJYm9vbCBpc19tdWwpCiB7 CisJdWludDY0X3QgaW5zdCA9IHZhbGlkYXRpb25fc3RhdGUtPnNoYWRlclt2YWxpZGF0aW9uX3N0 YXRlLT5pcF07CiAJdWludDMyX3Qgd2FkZHIgPSAoaXNfbXVsID8KIAkJCSAgUVBVX0dFVF9GSUVM RChpbnN0LCBRUFVfV0FERFJfTVVMKSA6CiAJCQkgIFFQVV9HRVRfRklFTEQoaW5zdCwgUVBVX1dB RERSX0FERCkpOwpAQCAtMjI4LDExICsyMzYsMTEgQEAgY2hlY2tfdG11X3dyaXRlKHVpbnQ2NF90 IGluc3QsCiB9CiAKIHN0YXRpYyBib29sCi1jaGVja19yZWdfd3JpdGUodWludDY0X3QgaW5zdCwK LQkJc3RydWN0IHZjNF92YWxpZGF0ZWRfc2hhZGVyX2luZm8gKnZhbGlkYXRlZF9zaGFkZXIsCitj aGVja19yZWdfd3JpdGUoc3RydWN0IHZjNF92YWxpZGF0ZWRfc2hhZGVyX2luZm8gKnZhbGlkYXRl ZF9zaGFkZXIsCiAJCXN0cnVjdCB2YzRfc2hhZGVyX3ZhbGlkYXRpb25fc3RhdGUgKnZhbGlkYXRp b25fc3RhdGUsCiAJCWJvb2wgaXNfbXVsKQogeworCXVpbnQ2NF90IGluc3QgPSB2YWxpZGF0aW9u X3N0YXRlLT5zaGFkZXJbdmFsaWRhdGlvbl9zdGF0ZS0+aXBdOwogCXVpbnQzMl90IHdhZGRyID0g KGlzX211bCA/CiAJCQkgIFFQVV9HRVRfRklFTEQoaW5zdCwgUVBVX1dBRERSX01VTCkgOgogCQkJ ICBRUFVfR0VUX0ZJRUxEKGluc3QsIFFQVV9XQUREUl9BREQpKTsKQEAgLTI2MSw3ICsyNjksNyBA QCBjaGVja19yZWdfd3JpdGUodWludDY0X3QgaW5zdCwKIAljYXNlIFFQVV9XX1RNVTFfVDoKIAlj YXNlIFFQVV9XX1RNVTFfUjoKIAljYXNlIFFQVV9XX1RNVTFfQjoKLQkJcmV0dXJuIGNoZWNrX3Rt dV93cml0ZShpbnN0LCB2YWxpZGF0ZWRfc2hhZGVyLCB2YWxpZGF0aW9uX3N0YXRlLAorCQlyZXR1 cm4gY2hlY2tfdG11X3dyaXRlKHZhbGlkYXRlZF9zaGFkZXIsIHZhbGlkYXRpb25fc3RhdGUsCiAJ CQkJICAgICAgIGlzX211bCk7CiAKIAljYXNlIFFQVV9XX0hPU1RfSU5UOgpAQCAtMjk0LDEwICsz MDIsMTAgQEAgY2hlY2tfcmVnX3dyaXRlKHVpbnQ2NF90IGluc3QsCiB9CiAKIHN0YXRpYyB2b2lk Ci10cmFja19saXZlX2NsYW1wcyh1aW50NjRfdCBpbnN0LAotCQkgIHN0cnVjdCB2YzRfdmFsaWRh dGVkX3NoYWRlcl9pbmZvICp2YWxpZGF0ZWRfc2hhZGVyLAordHJhY2tfbGl2ZV9jbGFtcHMoc3Ry dWN0IHZjNF92YWxpZGF0ZWRfc2hhZGVyX2luZm8gKnZhbGlkYXRlZF9zaGFkZXIsCiAJCSAgc3Ry dWN0IHZjNF9zaGFkZXJfdmFsaWRhdGlvbl9zdGF0ZSAqdmFsaWRhdGlvbl9zdGF0ZSkKIHsKKwl1 aW50NjRfdCBpbnN0ID0gdmFsaWRhdGlvbl9zdGF0ZS0+c2hhZGVyW3ZhbGlkYXRpb25fc3RhdGUt PmlwXTsKIAl1aW50MzJfdCBvcF9hZGQgPSBRUFVfR0VUX0ZJRUxEKGluc3QsIFFQVV9PUF9BREQp OwogCXVpbnQzMl90IHdhZGRyX2FkZCA9IFFQVV9HRVRfRklFTEQoaW5zdCwgUVBVX1dBRERSX0FE RCk7CiAJdWludDMyX3Qgd2FkZHJfbXVsID0gUVBVX0dFVF9GSUVMRChpbnN0LCBRUFVfV0FERFJf TVVMKTsKQEAgLTM2OSwxMCArMzc3LDEwIEBAIHRyYWNrX2xpdmVfY2xhbXBzKHVpbnQ2NF90IGlu c3QsCiB9CiAKIHN0YXRpYyBib29sCi1jaGVja19pbnN0cnVjdGlvbl93cml0ZXModWludDY0X3Qg aW5zdCwKLQkJCSBzdHJ1Y3QgdmM0X3ZhbGlkYXRlZF9zaGFkZXJfaW5mbyAqdmFsaWRhdGVkX3No YWRlciwKK2NoZWNrX2luc3RydWN0aW9uX3dyaXRlcyhzdHJ1Y3QgdmM0X3ZhbGlkYXRlZF9zaGFk ZXJfaW5mbyAqdmFsaWRhdGVkX3NoYWRlciwKIAkJCSBzdHJ1Y3QgdmM0X3NoYWRlcl92YWxpZGF0 aW9uX3N0YXRlICp2YWxpZGF0aW9uX3N0YXRlKQogeworCXVpbnQ2NF90IGluc3QgPSB2YWxpZGF0 aW9uX3N0YXRlLT5zaGFkZXJbdmFsaWRhdGlvbl9zdGF0ZS0+aXBdOwogCXVpbnQzMl90IHdhZGRy X2FkZCA9IFFQVV9HRVRfRklFTEQoaW5zdCwgUVBVX1dBRERSX0FERCk7CiAJdWludDMyX3Qgd2Fk ZHJfbXVsID0gUVBVX0dFVF9GSUVMRChpbnN0LCBRUFVfV0FERFJfTVVMKTsKIAlib29sIG9rOwpA QCAtMzgyLDEyICszOTAsMTAgQEAgY2hlY2tfaW5zdHJ1Y3Rpb25fd3JpdGVzKHVpbnQ2NF90IGlu c3QsCiAJCXJldHVybiBmYWxzZTsKIAl9CiAKLQlvayA9IChjaGVja19yZWdfd3JpdGUoaW5zdCwg dmFsaWRhdGVkX3NoYWRlciwgdmFsaWRhdGlvbl9zdGF0ZSwKLQkJCSAgICAgIGZhbHNlKSAmJgot CSAgICAgIGNoZWNrX3JlZ193cml0ZShpbnN0LCB2YWxpZGF0ZWRfc2hhZGVyLCB2YWxpZGF0aW9u X3N0YXRlLAotCQkJICAgICAgdHJ1ZSkpOworCW9rID0gKGNoZWNrX3JlZ193cml0ZSh2YWxpZGF0 ZWRfc2hhZGVyLCB2YWxpZGF0aW9uX3N0YXRlLCBmYWxzZSkgJiYKKwkgICAgICBjaGVja19yZWdf d3JpdGUodmFsaWRhdGVkX3NoYWRlciwgdmFsaWRhdGlvbl9zdGF0ZSwgdHJ1ZSkpOwogCi0JdHJh Y2tfbGl2ZV9jbGFtcHMoaW5zdCwgdmFsaWRhdGVkX3NoYWRlciwgdmFsaWRhdGlvbl9zdGF0ZSk7 CisJdHJhY2tfbGl2ZV9jbGFtcHModmFsaWRhdGVkX3NoYWRlciwgdmFsaWRhdGlvbl9zdGF0ZSk7 CiAKIAlyZXR1cm4gb2s7CiB9CkBAIC00MTcsMzAgKzQyMywzMCBAQCB2YzRfdmFsaWRhdGVfc2hh ZGVyKHN0cnVjdCBkcm1fZ2VtX2NtYV9vYmplY3QgKnNoYWRlcl9vYmopCiB7CiAJYm9vbCBmb3Vu ZF9zaGFkZXJfZW5kID0gZmFsc2U7CiAJaW50IHNoYWRlcl9lbmRfaXAgPSAwOwotCXVpbnQzMl90 IGlwLCBtYXhfaXA7Ci0JdWludDY0X3QgKnNoYWRlcjsKKwl1aW50MzJfdCBpcDsKIAlzdHJ1Y3Qg dmM0X3ZhbGlkYXRlZF9zaGFkZXJfaW5mbyAqdmFsaWRhdGVkX3NoYWRlcjsKIAlzdHJ1Y3QgdmM0 X3NoYWRlcl92YWxpZGF0aW9uX3N0YXRlIHZhbGlkYXRpb25fc3RhdGU7CiAJaW50IGk7CiAKIAlt ZW1zZXQoJnZhbGlkYXRpb25fc3RhdGUsIDAsIHNpemVvZih2YWxpZGF0aW9uX3N0YXRlKSk7CisJ dmFsaWRhdGlvbl9zdGF0ZS5zaGFkZXIgPSBzaGFkZXJfb2JqLT52YWRkcjsKKwl2YWxpZGF0aW9u X3N0YXRlLm1heF9pcCA9IHNoYWRlcl9vYmotPmJhc2Uuc2l6ZSAvIHNpemVvZih1aW50NjRfdCk7 CiAKIAlmb3IgKGkgPSAwOyBpIDwgODsgaSsrKQogCQl2YWxpZGF0aW9uX3N0YXRlLnRtdV9zZXR1 cFtpIC8gNF0ucF9vZmZzZXRbaSAlIDRdID0gfjA7CiAJZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJ WkUodmFsaWRhdGlvbl9zdGF0ZS5saXZlX21pbl9jbGFtcF9vZmZzZXRzKTsgaSsrKQogCQl2YWxp ZGF0aW9uX3N0YXRlLmxpdmVfbWluX2NsYW1wX29mZnNldHNbaV0gPSB+MDsKIAotCXNoYWRlciA9 IHNoYWRlcl9vYmotPnZhZGRyOwotCW1heF9pcCA9IHNoYWRlcl9vYmotPmJhc2Uuc2l6ZSAvIHNp emVvZih1aW50NjRfdCk7Ci0KIAl2YWxpZGF0ZWRfc2hhZGVyID0ga2NhbGxvYygxLCBzaXplb2Yo KnZhbGlkYXRlZF9zaGFkZXIpLCBHRlBfS0VSTkVMKTsKIAlpZiAoIXZhbGlkYXRlZF9zaGFkZXIp CiAJCXJldHVybiBOVUxMOwogCi0JZm9yIChpcCA9IDA7IGlwIDwgbWF4X2lwOyBpcCsrKSB7Ci0J CXVpbnQ2NF90IGluc3QgPSBzaGFkZXJbaXBdOworCWZvciAoaXAgPSAwOyBpcCA8IHZhbGlkYXRp b25fc3RhdGUubWF4X2lwOyBpcCsrKSB7CisJCXVpbnQ2NF90IGluc3QgPSB2YWxpZGF0aW9uX3N0 YXRlLnNoYWRlcltpcF07CiAJCXVpbnQzMl90IHNpZyA9IFFQVV9HRVRfRklFTEQoaW5zdCwgUVBV X1NJRyk7CiAKKwkJdmFsaWRhdGlvbl9zdGF0ZS5pcCA9IGlwOworCiAJCXN3aXRjaCAoc2lnKSB7 CiAJCWNhc2UgUVBVX1NJR19OT05FOgogCQljYXNlIFFQVV9TSUdfV0FJVF9GT1JfU0NPUkVCT0FS RDoKQEAgLTQ1MCw3ICs0NTYsNyBAQCB2YzRfdmFsaWRhdGVfc2hhZGVyKHN0cnVjdCBkcm1fZ2Vt X2NtYV9vYmplY3QgKnNoYWRlcl9vYmopCiAJCWNhc2UgUVBVX1NJR19MT0FEX1RNVTE6CiAJCWNh c2UgUVBVX1NJR19QUk9HX0VORDoKIAkJY2FzZSBRUFVfU0lHX1NNQUxMX0lNTToKLQkJCWlmICgh Y2hlY2tfaW5zdHJ1Y3Rpb25fd3JpdGVzKGluc3QsIHZhbGlkYXRlZF9zaGFkZXIsCisJCQlpZiAo IWNoZWNrX2luc3RydWN0aW9uX3dyaXRlcyh2YWxpZGF0ZWRfc2hhZGVyLAogCQkJCQkJICAgICAg JnZhbGlkYXRpb25fc3RhdGUpKSB7CiAJCQkJRFJNX0VSUk9SKCJCYWQgd3JpdGUgYXQgaXAgJWRc biIsIGlwKTsKIAkJCQlnb3RvIGZhaWw7CkBAIC00NjcsNyArNDczLDcgQEAgdmM0X3ZhbGlkYXRl X3NoYWRlcihzdHJ1Y3QgZHJtX2dlbV9jbWFfb2JqZWN0ICpzaGFkZXJfb2JqKQogCQkJYnJlYWs7 CiAKIAkJY2FzZSBRUFVfU0lHX0xPQURfSU1NOgotCQkJaWYgKCFjaGVja19pbnN0cnVjdGlvbl93 cml0ZXMoaW5zdCwgdmFsaWRhdGVkX3NoYWRlciwKKwkJCWlmICghY2hlY2tfaW5zdHJ1Y3Rpb25f d3JpdGVzKHZhbGlkYXRlZF9zaGFkZXIsCiAJCQkJCQkgICAgICAmdmFsaWRhdGlvbl9zdGF0ZSkp IHsKIAkJCQlEUk1fRVJST1IoIkJhZCBMT0FEX0lNTSB3cml0ZSBhdCBpcCAlZFxuIiwgaXApOwog CQkJCWdvdG8gZmFpbDsKQEAgLTQ4Nyw3ICs0OTMsNyBAQCB2YzRfdmFsaWRhdGVfc2hhZGVyKHN0 cnVjdCBkcm1fZ2VtX2NtYV9vYmplY3QgKnNoYWRlcl9vYmopCiAJCQlicmVhazsKIAl9CiAKLQlp ZiAoaXAgPT0gbWF4X2lwKSB7CisJaWYgKGlwID09IHZhbGlkYXRpb25fc3RhdGUubWF4X2lwKSB7 CiAJCURSTV9FUlJPUigic2hhZGVyIGZhaWxlZCB0byB0ZXJtaW5hdGUgYmVmb3JlICIKIAkJCSAg InNoYWRlciBCTyBlbmQgYXQgJXpkXG4iLAogCQkJICBzaGFkZXJfb2JqLT5iYXNlLnNpemUpOwot LSAKMi44LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=