From: Abdiel Janulgue Subject: [PATCH v3] drm/i915/query: Split out query item checks Date: Mon, 11 Feb 2019 19:32:51 +0200 Message-ID: <20190211173251.7131-1-abdiel.janulgue@linux.intel.com> References: <20190116085926.24420-1-abdiel.janulgue@linux.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 ESMTPS id 00C096E532 for ; Mon, 11 Feb 2019 17:43:56 +0000 (UTC) In-Reply-To: <20190116085926.24420-1-abdiel.janulgue@linux.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 VGhpcyBzaW1wbGlmaWVzIGFkZGluZyBuZXcgcXVlcnkgaXRlbSBvYmplY3RzLgoKdjI6IFVzZSBx dWVyeV9oZHIgKFR2cnRrbywgQ2hyaXMpLgogICAgaW50IGluc3RlYWQgb2YgdTMyIGluIHJldHVy biAoVHZydGtvKQp2MzogTW9yZSBuYW1pbmcgZml4ZXMgKFR2cnRrbykKClNpZ25lZC1vZmYtYnk6 IEFiZGllbCBKYW51bGd1ZSA8YWJkaWVsLmphbnVsZ3VlQGxpbnV4LmludGVsLmNvbT4KQ2M6IEpv b25hcyBMYWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3F1ZXJ5LmMgfCAzOSArKysrKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjYgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9xdWVyeS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9xdWVyeS5jCmluZGV4IGNiY2I5NTdiNzE0MS4uNzgyMTgz Yjc4ZjQ5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3F1ZXJ5LmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9xdWVyeS5jCkBAIC0xMCwxMiArMTAsMzQgQEAK ICNpbmNsdWRlICJpOTE1X3F1ZXJ5LmgiCiAjaW5jbHVkZSA8dWFwaS9kcm0vaTkxNV9kcm0uaD4K IAorc3RhdGljIGludCBjb3B5X3F1ZXJ5X2l0ZW0odm9pZCAqcXVlcnlfaGRyLCBzaXplX3QgcXVl cnlfc3osCisJCQkgICB1MzIgdG90YWxfbGVuZ3RoLAorCQkJICAgc3RydWN0IGRybV9pOTE1X3F1 ZXJ5X2l0ZW0gKnF1ZXJ5X2l0ZW0pCit7CisJaWYgKHF1ZXJ5X2l0ZW0tPmxlbmd0aCA9PSAwKQor CQlyZXR1cm4gdG90YWxfbGVuZ3RoOworCisJaWYgKHF1ZXJ5X2l0ZW0tPmxlbmd0aCA8IHRvdGFs X2xlbmd0aCkKKwkJcmV0dXJuIC1FSU5WQUw7CisKKwlpZiAoY29weV9mcm9tX3VzZXIocXVlcnlf aGRyLCB1NjRfdG9fdXNlcl9wdHIocXVlcnlfaXRlbS0+ZGF0YV9wdHIpLAorCQkJICAgcXVlcnlf c3opKQorCQlyZXR1cm4gLUVGQVVMVDsKKworCWlmICghYWNjZXNzX29rKHU2NF90b191c2VyX3B0 cihxdWVyeV9pdGVtLT5kYXRhX3B0ciksCisJCSAgICAgICB0b3RhbF9sZW5ndGgpKQorCQlyZXR1 cm4gLUVGQVVMVDsKKworCXJldHVybiAwOworfQorCiBzdGF0aWMgaW50IHF1ZXJ5X3RvcG9sb2d5 X2luZm8oc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQkJICAgICAgIHN0cnVj dCBkcm1faTkxNV9xdWVyeV9pdGVtICpxdWVyeV9pdGVtKQogewogCWNvbnN0IHN0cnVjdCBzc2V1 X2Rldl9pbmZvICpzc2V1ID0gJlJVTlRJTUVfSU5GTyhkZXZfcHJpdiktPnNzZXU7CiAJc3RydWN0 IGRybV9pOTE1X3F1ZXJ5X3RvcG9sb2d5X2luZm8gdG9wbzsKIAl1MzIgc2xpY2VfbGVuZ3RoLCBz dWJzbGljZV9sZW5ndGgsIGV1X2xlbmd0aCwgdG90YWxfbGVuZ3RoOworCWludCByZXQ7CiAKIAlp ZiAocXVlcnlfaXRlbS0+ZmxhZ3MgIT0gMCkKIAkJcmV0dXJuIC1FSU5WQUw7CkBAIC0zMywyMyAr NTUsMTQgQEAgc3RhdGljIGludCBxdWVyeV90b3BvbG9neV9pbmZvKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwKIAogCXRvdGFsX2xlbmd0aCA9IHNpemVvZih0b3BvKSArIHNsaWNl X2xlbmd0aCArIHN1YnNsaWNlX2xlbmd0aCArIGV1X2xlbmd0aDsKIAotCWlmIChxdWVyeV9pdGVt LT5sZW5ndGggPT0gMCkKLQkJcmV0dXJuIHRvdGFsX2xlbmd0aDsKLQotCWlmIChxdWVyeV9pdGVt LT5sZW5ndGggPCB0b3RhbF9sZW5ndGgpCi0JCXJldHVybiAtRUlOVkFMOwotCi0JaWYgKGNvcHlf ZnJvbV91c2VyKCZ0b3BvLCB1NjRfdG9fdXNlcl9wdHIocXVlcnlfaXRlbS0+ZGF0YV9wdHIpLAot CQkJICAgc2l6ZW9mKHRvcG8pKSkKLQkJcmV0dXJuIC1FRkFVTFQ7CisJcmV0ID0gY29weV9xdWVy eV9pdGVtKCZ0b3BvLCBzaXplb2YodG9wbyksIHRvdGFsX2xlbmd0aCwKKwkJCSAgICAgIHF1ZXJ5 X2l0ZW0pOworCWlmIChyZXQgIT0gMCkKKwkJcmV0dXJuIHJldDsKIAogCWlmICh0b3BvLmZsYWdz ICE9IDApCiAJCXJldHVybiAtRUlOVkFMOwogCi0JaWYgKCFhY2Nlc3Nfb2sodTY0X3RvX3VzZXJf cHRyKHF1ZXJ5X2l0ZW0tPmRhdGFfcHRyKSwKLQkJICAgICAgIHRvdGFsX2xlbmd0aCkpCi0JCXJl dHVybiAtRUZBVUxUOwotCiAJbWVtc2V0KCZ0b3BvLCAwLCBzaXplb2YodG9wbykpOwogCXRvcG8u bWF4X3NsaWNlcyA9IHNzZXUtPm1heF9zbGljZXM7CiAJdG9wby5tYXhfc3Vic2xpY2VzID0gc3Nl dS0+bWF4X3N1YnNsaWNlczsKLS0gCjIuMTkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==