From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Auld Subject: [RFC PATCH 33/42] UPSTREAM: drm/i915/query: Split out query item checks Date: Thu, 14 Feb 2019 14:57:31 +0000 Message-ID: <20190214145740.14521-34-matthew.auld@intel.com> References: <20190214145740.14521-1-matthew.auld@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id D4D116E93A for ; Thu, 14 Feb 2019 14:58:24 +0000 (UTC) In-Reply-To: <20190214145740.14521-1-matthew.auld@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 RnJvbTogQWJkaWVsIEphbnVsZ3VlIDxhYmRpZWwuamFudWxndWVAbGludXguaW50ZWwuY29tPgoK VGhpcyBzaW1wbGlmaWVzIGFkZGluZyBuZXcgcXVlcnkgaXRlbSBvYmplY3RzLgoKU2lnbmVkLW9m Zi1ieTogQWJkaWVsIEphbnVsZ3VlIDxhYmRpZWwuamFudWxndWVAbGludXguaW50ZWwuY29tPgpD YzogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgotLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcXVlcnkuYyB8IDQwICsrKysrKysrKysrKysrKysr KysrLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyNiBpbnNlcnRpb25zKCspLCAxNCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3F1ZXJ5LmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3F1ZXJ5LmMKaW5kZXggY2JjYjk1N2I3MTQxLi5i NGYyNjYwNWY2MTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcXVlcnku YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3F1ZXJ5LmMKQEAgLTEwLDEyICsxMCwz MyBAQAogI2luY2x1ZGUgImk5MTVfcXVlcnkuaCIKICNpbmNsdWRlIDx1YXBpL2RybS9pOTE1X2Ry bS5oPgogCitzdGF0aWMgaW50IGluaXRfcXVlcnlfaXRlbV9jaGVjayh2b2lkKiBkYXRhX3B0ciwg c2l6ZV90IGRhdGFfc3osCisJCQkJIHUzMiB0b3RhbF9sZW5ndGgsCisJCQkJIHN0cnVjdCBkcm1f aTkxNV9xdWVyeV9pdGVtICpxdWVyeV9pdGVtKQoreworCWlmIChxdWVyeV9pdGVtLT5sZW5ndGgg PT0gMCkKKwkJcmV0dXJuIHRvdGFsX2xlbmd0aDsKKworCWlmIChxdWVyeV9pdGVtLT5sZW5ndGgg PCB0b3RhbF9sZW5ndGgpCisJCXJldHVybiAtRUlOVkFMOworCisJaWYgKGNvcHlfZnJvbV91c2Vy KGRhdGFfcHRyLCB1NjRfdG9fdXNlcl9wdHIocXVlcnlfaXRlbS0+ZGF0YV9wdHIpLAorCQkJICAg ZGF0YV9zeikpCisJCXJldHVybiAtRUZBVUxUOworCisJaWYgKCFhY2Nlc3Nfb2sodTY0X3RvX3Vz ZXJfcHRyKHF1ZXJ5X2l0ZW0tPmRhdGFfcHRyKSwKKwkJICAgICAgIHRvdGFsX2xlbmd0aCkpCisJ CXJldHVybiAtRUZBVUxUOworCisJcmV0dXJuIDA7Cit9CisKIHN0YXRpYyBpbnQgcXVlcnlfdG9w b2xvZ3lfaW5mbyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkgICAgICAg c3RydWN0IGRybV9pOTE1X3F1ZXJ5X2l0ZW0gKnF1ZXJ5X2l0ZW0pCiB7CiAJY29uc3Qgc3RydWN0 IHNzZXVfZGV2X2luZm8gKnNzZXUgPSAmUlVOVElNRV9JTkZPKGRldl9wcml2KS0+c3NldTsKIAlz dHJ1Y3QgZHJtX2k5MTVfcXVlcnlfdG9wb2xvZ3lfaW5mbyB0b3BvOwotCXUzMiBzbGljZV9sZW5n dGgsIHN1YnNsaWNlX2xlbmd0aCwgZXVfbGVuZ3RoLCB0b3RhbF9sZW5ndGg7CisJdTMyIHJldCwg c2xpY2VfbGVuZ3RoLCBzdWJzbGljZV9sZW5ndGgsIGV1X2xlbmd0aCwgdG90YWxfbGVuZ3RoOwog CiAJaWYgKHF1ZXJ5X2l0ZW0tPmZsYWdzICE9IDApCiAJCXJldHVybiAtRUlOVkFMOwpAQCAtMzMs MjMgKzU0LDE0IEBAIHN0YXRpYyBpbnQgcXVlcnlfdG9wb2xvZ3lfaW5mbyhzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAKIAl0b3RhbF9sZW5ndGggPSBzaXplb2YodG9wbykgKyBz bGljZV9sZW5ndGggKyBzdWJzbGljZV9sZW5ndGggKyBldV9sZW5ndGg7CiAKLQlpZiAocXVlcnlf aXRlbS0+bGVuZ3RoID09IDApCi0JCXJldHVybiB0b3RhbF9sZW5ndGg7Ci0KLQlpZiAocXVlcnlf aXRlbS0+bGVuZ3RoIDwgdG90YWxfbGVuZ3RoKQotCQlyZXR1cm4gLUVJTlZBTDsKLQotCWlmIChj b3B5X2Zyb21fdXNlcigmdG9wbywgdTY0X3RvX3VzZXJfcHRyKHF1ZXJ5X2l0ZW0tPmRhdGFfcHRy KSwKLQkJCSAgIHNpemVvZih0b3BvKSkpCi0JCXJldHVybiAtRUZBVUxUOworCXJldCA9IGluaXRf cXVlcnlfaXRlbV9jaGVjaygmdG9wbywgc2l6ZW9mKHRvcG8pLCB0b3RhbF9sZW5ndGgsCisJCQkJ ICAgIHF1ZXJ5X2l0ZW0pOworCWlmIChyZXQgIT0gMCkKKwkJcmV0dXJuIHJldDsKIAogCWlmICh0 b3BvLmZsYWdzICE9IDApCiAJCXJldHVybiAtRUlOVkFMOwogCi0JaWYgKCFhY2Nlc3Nfb2sodTY0 X3RvX3VzZXJfcHRyKHF1ZXJ5X2l0ZW0tPmRhdGFfcHRyKSwKLQkJICAgICAgIHRvdGFsX2xlbmd0 aCkpCi0JCXJldHVybiAtRUZBVUxUOwotCiAJbWVtc2V0KCZ0b3BvLCAwLCBzaXplb2YodG9wbykp OwogCXRvcG8ubWF4X3NsaWNlcyA9IHNzZXUtPm1heF9zbGljZXM7CiAJdG9wby5tYXhfc3Vic2xp Y2VzID0gc3NldS0+bWF4X3N1YnNsaWNlczsKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRl bC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4