From: Abdiel Janulgue Subject: [PATCH v2] drm/i915/query: Split out query item checks Date: Wed, 16 Jan 2019 10:59:26 +0200 Message-ID: <20190116085926.24420-1-abdiel.janulgue@linux.intel.com> References: <20190109075108.16779-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 mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3648C6EF51 for ; Wed, 16 Jan 2019 09:08:20 +0000 (UTC) In-Reply-To: <20190109075108.16779-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 biAoVHZydGtvKQoKU2lnbmVkLW9mZi1ieTogQWJkaWVsIEphbnVsZ3VlIDxhYmRpZWwuamFudWxn dWVAbGludXguaW50ZWwuY29tPgpDYzogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5A bGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcXVlcnkuYyB8 IDM5ICsrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyNiBp bnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X3F1ZXJ5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3F1ZXJ5LmMK aW5kZXggY2JjYjk1N2I3MTQxLi5iMjQ0OWNmZmRhNTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfcXVlcnkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3F1 ZXJ5LmMKQEAgLTEwLDEyICsxMCwzNCBAQAogI2luY2x1ZGUgImk5MTVfcXVlcnkuaCIKICNpbmNs dWRlIDx1YXBpL2RybS9pOTE1X2RybS5oPgogCitzdGF0aWMgaW50IGluaXRfcXVlcnlfaXRlbV9j aGVjayh2b2lkICpxdWVyeV9oZHIsIHNpemVfdCBkYXRhX3N6LAorCQkJCSB1MzIgdG90YWxfbGVu Z3RoLAorCQkJCSBzdHJ1Y3QgZHJtX2k5MTVfcXVlcnlfaXRlbSAqcXVlcnlfaXRlbSkKK3sKKwlp ZiAocXVlcnlfaXRlbS0+bGVuZ3RoID09IDApCisJCXJldHVybiB0b3RhbF9sZW5ndGg7CisKKwlp ZiAocXVlcnlfaXRlbS0+bGVuZ3RoIDwgdG90YWxfbGVuZ3RoKQorCQlyZXR1cm4gLUVJTlZBTDsK KworCWlmIChjb3B5X2Zyb21fdXNlcihxdWVyeV9oZHIsIHU2NF90b191c2VyX3B0cihxdWVyeV9p dGVtLT5kYXRhX3B0ciksCisJCQkgICBkYXRhX3N6KSkKKwkJcmV0dXJuIC1FRkFVTFQ7CisKKwlp ZiAoIWFjY2Vzc19vayh1NjRfdG9fdXNlcl9wdHIocXVlcnlfaXRlbS0+ZGF0YV9wdHIpLAorCQkg ICAgICAgdG90YWxfbGVuZ3RoKSkKKwkJcmV0dXJuIC1FRkFVTFQ7CisKKwlyZXR1cm4gMDsKK30K Kwogc3RhdGljIGludCBxdWVyeV90b3BvbG9neV9pbmZvKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAkJCSAgICAgICBzdHJ1Y3QgZHJtX2k5MTVfcXVlcnlfaXRlbSAqcXVlcnlf aXRlbSkKIHsKIAljb25zdCBzdHJ1Y3Qgc3NldV9kZXZfaW5mbyAqc3NldSA9ICZSVU5USU1FX0lO Rk8oZGV2X3ByaXYpLT5zc2V1OwogCXN0cnVjdCBkcm1faTkxNV9xdWVyeV90b3BvbG9neV9pbmZv IHRvcG87CiAJdTMyIHNsaWNlX2xlbmd0aCwgc3Vic2xpY2VfbGVuZ3RoLCBldV9sZW5ndGgsIHRv dGFsX2xlbmd0aDsKKwlpbnQgcmV0OwogCiAJaWYgKHF1ZXJ5X2l0ZW0tPmZsYWdzICE9IDApCiAJ CXJldHVybiAtRUlOVkFMOwpAQCAtMzMsMjMgKzU1LDE0IEBAIHN0YXRpYyBpbnQgcXVlcnlfdG9w b2xvZ3lfaW5mbyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAKIAl0b3RhbF9s ZW5ndGggPSBzaXplb2YodG9wbykgKyBzbGljZV9sZW5ndGggKyBzdWJzbGljZV9sZW5ndGggKyBl dV9sZW5ndGg7CiAKLQlpZiAocXVlcnlfaXRlbS0+bGVuZ3RoID09IDApCi0JCXJldHVybiB0b3Rh bF9sZW5ndGg7Ci0KLQlpZiAocXVlcnlfaXRlbS0+bGVuZ3RoIDwgdG90YWxfbGVuZ3RoKQotCQly ZXR1cm4gLUVJTlZBTDsKLQotCWlmIChjb3B5X2Zyb21fdXNlcigmdG9wbywgdTY0X3RvX3VzZXJf cHRyKHF1ZXJ5X2l0ZW0tPmRhdGFfcHRyKSwKLQkJCSAgIHNpemVvZih0b3BvKSkpCi0JCXJldHVy biAtRUZBVUxUOworCXJldCA9IGluaXRfcXVlcnlfaXRlbV9jaGVjaygmdG9wbywgc2l6ZW9mKHRv cG8pLCB0b3RhbF9sZW5ndGgsCisJCQkJICAgIHF1ZXJ5X2l0ZW0pOworCWlmIChyZXQgIT0gMCkK KwkJcmV0dXJuIHJldDsKIAogCWlmICh0b3BvLmZsYWdzICE9IDApCiAJCXJldHVybiAtRUlOVkFM OwogCi0JaWYgKCFhY2Nlc3Nfb2sodTY0X3RvX3VzZXJfcHRyKHF1ZXJ5X2l0ZW0tPmRhdGFfcHRy KSwKLQkJICAgICAgIHRvdGFsX2xlbmd0aCkpCi0JCXJldHVybiAtRUZBVUxUOwotCiAJbWVtc2V0 KCZ0b3BvLCAwLCBzaXplb2YodG9wbykpOwogCXRvcG8ubWF4X3NsaWNlcyA9IHNzZXUtPm1heF9z bGljZXM7CiAJdG9wby5tYXhfc3Vic2xpY2VzID0gc3NldS0+bWF4X3N1YnNsaWNlczsKLS0gCjIu MTkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==