From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by gabe.freedesktop.org (Postfix) with ESMTPS id F0C066E2E6 for ; Thu, 17 Jun 2021 19:13:34 +0000 (UTC) Received: by mail-pg1-x535.google.com with SMTP id t13so5714270pgu.11 for ; Thu, 17 Jun 2021 12:13:34 -0700 (PDT) From: Jason Ekstrand Date: Thu, 17 Jun 2021 14:12:24 -0500 Message-Id: <20210617191256.577244-18-jason@jlekstrand.net> In-Reply-To: <20210617191256.577244-1-jason@jlekstrand.net> References: <20210617191256.577244-1-jason@jlekstrand.net> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t 17/79] tests/i915/gem_ringfill: Convert to intel_ctx_t List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org List-ID: U2lnbmVkLW9mZi1ieTogSmFzb24gRWtzdHJhbmQgPGphc29uQGpsZWtzdHJhbmQubmV0PgpSZXZp ZXdlZC1ieTogWmJpZ25pZXcgS2VtcGN6ecWEc2tpIDx6Ymlnbmlldy5rZW1wY3p5bnNraUBpbnRl bC5jb20+Ci0tLQogdGVzdHMvaTkxNS9nZW1fcmluZ2ZpbGwuYyB8IDQ4ICsrKysrKysrKysrKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDI4IGluc2VydGlvbnMo KyksIDIwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rlc3RzL2k5MTUvZ2VtX3JpbmdmaWxs LmMgYi90ZXN0cy9pOTE1L2dlbV9yaW5nZmlsbC5jCmluZGV4IDlhZDk3NTMyZi4uNWQyMTY5ZDY1 IDEwMDY0NAotLS0gYS90ZXN0cy9pOTE1L2dlbV9yaW5nZmlsbC5jCisrKyBiL3Rlc3RzL2k5MTUv Z2VtX3JpbmdmaWxsLmMKQEAgLTk0LDcgKzk0LDcgQEAgc3RhdGljIHZvaWQgZmlsbF9yaW5nKGlu dCBmZCwKIAl9CiB9CiAKLXN0YXRpYyB2b2lkIHNldHVwX2V4ZWNidWYoaW50IGZkLAorc3RhdGlj IHZvaWQgc2V0dXBfZXhlY2J1ZihpbnQgZmQsIGNvbnN0IGludGVsX2N0eF90ICpjdHgsCiAJCQkg IHN0cnVjdCBkcm1faTkxNV9nZW1fZXhlY2J1ZmZlcjIgKmV4ZWNidWYsCiAJCQkgIHN0cnVjdCBk cm1faTkxNV9nZW1fZXhlY19vYmplY3QyICpvYmosCiAJCQkgIHN0cnVjdCBkcm1faTkxNV9nZW1f cmVsb2NhdGlvbl9lbnRyeSAqcmVsb2MsCkBAIC0xMTUsNiArMTE1LDggQEAgc3RhdGljIHZvaWQg c2V0dXBfZXhlY2J1ZihpbnQgZmQsCiAJaWYgKGdlbiA+IDMgJiYgZ2VuIDwgNikKIAkJZXhlY2J1 Zi0+ZmxhZ3MgfD0gSTkxNV9FWEVDX1NFQ1VSRTsKIAorCWV4ZWNidWYtPnJzdmQxID0gY3R4LT5p ZDsKKwogCW9ialswXS5oYW5kbGUgPSBnZW1fY3JlYXRlKGZkLCA0MDk2KTsKIAlnZW1fd3JpdGUo ZmQsIG9ialswXS5oYW5kbGUsIDAsICZiYmUsIHNpemVvZihiYmUpKTsKIAlleGVjYnVmLT5idWZm ZXJfY291bnQgPSAxOwpAQCAtMTY4LDcgKzE3MCw4IEBAIHN0YXRpYyB2b2lkIHNldHVwX2V4ZWNi dWYoaW50IGZkLAogCWNoZWNrX2JvKGZkLCBvYmpbMF0uaGFuZGxlKTsKIH0KIAotc3RhdGljIHZv aWQgcnVuX3Rlc3QoaW50IGZkLCB1bnNpZ25lZCByaW5nLCB1bnNpZ25lZCBmbGFncywgdW5zaWdu ZWQgdGltZW91dCkKK3N0YXRpYyB2b2lkIHJ1bl90ZXN0KGludCBmZCwgY29uc3QgaW50ZWxfY3R4 X3QgKmN0eCwgdW5zaWduZWQgcmluZywKKwkJICAgICB1bnNpZ25lZCBmbGFncywgdW5zaWduZWQg dGltZW91dCkKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX2V4ZWNfb2JqZWN0MiBvYmpbMl07CiAJ c3RydWN0IGRybV9pOTE1X2dlbV9yZWxvY2F0aW9uX2VudHJ5IHJlbG9jWzEwMjRdOwpAQCAtMTc2 LDE1ICsxNzksMTUgQEAgc3RhdGljIHZvaWQgcnVuX3Rlc3QoaW50IGZkLCB1bnNpZ25lZCByaW5n LCB1bnNpZ25lZCBmbGFncywgdW5zaWduZWQgdGltZW91dCkKIAlpZ3RfaGFuZ190IGhhbmc7CiAK IAlpZiAoZmxhZ3MgJiAoU1VTUEVORCB8IEhJQkVSTkFURSkpIHsKLQkJcnVuX3Rlc3QoZmQsIHJp bmcsIDAsIDApOworCQlydW5fdGVzdChmZCwgY3R4LCByaW5nLCAwLCAwKTsKIAkJZ2VtX3F1aWVz Y2VudF9ncHUoZmQpOwogCX0KIAotCXNldHVwX2V4ZWNidWYoZmQsICZleGVjYnVmLCBvYmosIHJl bG9jLCByaW5nKTsKKwlzZXR1cF9leGVjYnVmKGZkLCBjdHgsICZleGVjYnVmLCBvYmosIHJlbG9j LCByaW5nKTsKIAogCW1lbXNldCgmaGFuZywgMCwgc2l6ZW9mKGhhbmcpKTsKIAlpZiAoZmxhZ3Mg JiBIQU5HKQotCQloYW5nID0gaWd0X2hhbmdfcmluZyhmZCwgcmluZyAmIH4oMzw8MTMpKTsKKwkJ aGFuZyA9IGlndF9oYW5nX2N0eChmZCwgY3R4LT5pZCwgcmluZyAmIH4oMzw8MTMpLCAwKTsKIAog CWlmIChmbGFncyAmIChDSElMRCB8IEZPUktFRCB8IEJPTUIpKSB7CiAJCWludCBuY2hpbGQ7CkBA IC0xOTgsMTYgKzIwMSwxOSBAQCBzdGF0aWMgdm9pZCBydW5fdGVzdChpbnQgZmQsIHVuc2lnbmVk IHJpbmcsIHVuc2lnbmVkIGZsYWdzLCB1bnNpZ25lZCB0aW1lb3V0KQogCiAJCWlndF9kZWJ1Zygi Rm9ya2luZyAlZCBjaGlsZHJlblxuIiwgbmNoaWxkKTsKIAkJaWd0X2ZvcmsoY2hpbGQsIG5jaGls ZCkgeworCQkJY29uc3QgaW50ZWxfY3R4X3QgKmNoaWxkX2N0eCA9IE5VTEw7CiAJCQlpZiAoZmxh Z3MgJiBORVdGRCkgewogCQkJCWludCB0aGlzOwogCiAJCQkJdGhpcyA9IGdlbV9yZW9wZW5fZHJp dmVyKGZkKTsKLQkJCQlnZW1fY29udGV4dF9jb3B5X2VuZ2luZXMoZmQsIDAsIHRoaXMsIDApOwor CQkJCWNoaWxkX2N0eCA9IGludGVsX2N0eF9jcmVhdGUoZmQsICZjdHgtPmNmZyk7CiAJCQkJZmQg PSB0aGlzOwogCi0JCQkJc2V0dXBfZXhlY2J1ZihmZCwgJmV4ZWNidWYsIG9iaiwgcmVsb2MsIHJp bmcpOworCQkJCXNldHVwX2V4ZWNidWYoZmQsIGNoaWxkX2N0eCwgJmV4ZWNidWYsIG9iaiwgcmVs b2MsIHJpbmcpOwogCQkJfQogCQkJZmlsbF9yaW5nKGZkLCAmZXhlY2J1ZiwgZmxhZ3MsIHRpbWVv dXQpOworCQkJaWYgKGNoaWxkX2N0eCkKKwkJCQlpbnRlbF9jdHhfZGVzdHJveShmZCwgY2hpbGRf Y3R4KTsKIAkJfQogCiAJCWlmIChmbGFncyAmIFNVU1BFTkQpCkBAIC0yMzUsNyArMjQxLDcgQEAg c3RhdGljIHZvaWQgcnVuX3Rlc3QoaW50IGZkLCB1bnNpZ25lZCByaW5nLCB1bnNpZ25lZCBmbGFn cywgdW5zaWduZWQgdGltZW91dCkKIAogCWlmIChmbGFncyAmIChTVVNQRU5EIHwgSElCRVJOQVRF KSkgewogCQlnZW1fcXVpZXNjZW50X2dwdShmZCk7Ci0JCXJ1bl90ZXN0KGZkLCByaW5nLCAwLCAw KTsKKwkJcnVuX3Rlc3QoZmQsIGN0eCwgcmluZywgMCwgMCk7CiAJfQogfQogCkBAIC0yODYsNiAr MjkyLDcgQEAgaWd0X21haW4KIAkJeyBOVUxMIH0KIAl9LCAqbTsKIAlib29sIG1hc3RlciA9IGZh bHNlOworCWNvbnN0IGludGVsX2N0eF90ICpjdHg7CiAJaW50IGZkID0gLTE7CiAKIAlpZ3RfZml4 dHVyZSB7CkBAIC0zMDUsMjIgKzMxMiwyMCBAQCBpZ3RfbWFpbgogCQlyaW5nX3NpemUgPSBnZW1f bWVhc3VyZV9yaW5nX2luZmxpZ2h0KGZkLCBBTExfRU5HSU5FUywgMCk7CiAJCWlndF9pbmZvKCJS aW5nIHNpemU6ICVkIGJhdGNoZXNcbiIsIHJpbmdfc2l6ZSk7CiAJCWlndF9yZXF1aXJlKHJpbmdf c2l6ZSk7CisKKwkJY3R4ID0gaW50ZWxfY3R4X2NyZWF0ZV9hbGxfcGh5c2ljYWwoZmQpOwogCX0K IAogCS8qIExlZ2FjeSBwYXRoIGZvciBzZWxlY3RpbmcgInJpbmdzIi4gKi8KIAlmb3IgKG0gPSBt b2RlczsgbS0+c3VmZml4OyBtKyspIHsKIAkJaWd0X3N1YnRlc3Rfd2l0aF9keW5hbWljX2YoImxl Z2FjeS0lcyIsIG0tPnN1ZmZpeCkgewotCQkJY29uc3Qgc3RydWN0IGludGVsX2V4ZWN1dGlvbl9y aW5nICplOwotCiAJCQlpZ3Rfc2tpcF9vbihtLT5mbGFncyAmIE5FV0ZEICYmIG1hc3Rlcik7CiAK LQkJCWZvciAoZSA9IGludGVsX2V4ZWN1dGlvbl9yaW5nczsgZS0+bmFtZTsgZSsrKSB7Ci0JCQkJ aWYgKCFnZW1faGFzX3JpbmcoZmQsIGViX3JpbmcoZSkpKQotCQkJCQljb250aW51ZTsKLQorCQkJ Zm9yX2VhY2hfcmluZyhlLCBmZCkgewogCQkJCWlndF9keW5hbWljX2YoIiVzIiwgZS0+bmFtZSkg ewogCQkJCQlpZ3RfcmVxdWlyZShnZW1fY2FuX3N0b3JlX2R3b3JkKGZkLCBlYl9yaW5nKGUpKSk7 Ci0JCQkJCXJ1bl90ZXN0KGZkLCBlYl9yaW5nKGUpLAorCQkJCQlydW5fdGVzdChmZCwgaW50ZWxf Y3R4XzAoZmQpLAorCQkJCQkJIGViX3JpbmcoZSksCiAJCQkJCQkgbS0+ZmxhZ3MsCiAJCQkJCQkg bS0+dGltZW91dCk7CiAJCQkJCWdlbV9xdWllc2NlbnRfZ3B1KGZkKTsKQEAgLTMzNSwxMiArMzQw LDEzIEBAIGlndF9tYWluCiAJCQljb25zdCBzdHJ1Y3QgaW50ZWxfZXhlY3V0aW9uX2VuZ2luZTIg KmU7CiAKIAkJCWlndF9za2lwX29uKG0tPmZsYWdzICYgTkVXRkQgJiYgbWFzdGVyKTsKLQkJCV9f Zm9yX2VhY2hfcGh5c2ljYWxfZW5naW5lKGZkLCBlKSB7CisJCQlmb3JfZWFjaF9jdHhfZW5naW5l KGZkLCBjdHgsIGUpIHsKIAkJCQlpZiAoIWdlbV9jbGFzc19jYW5fc3RvcmVfZHdvcmQoZmQsIGUt PmNsYXNzKSkKIAkJCQkJY29udGludWU7CiAKIAkJCQlpZ3RfZHluYW1pY19mKCIlcyIsIGUtPm5h bWUpIHsKLQkJCQkJcnVuX3Rlc3QoZmQsIGUtPmZsYWdzLAorCQkJCQlydW5fdGVzdChmZCwgY3R4 LAorCQkJCQkJIGUtPmZsYWdzLAogCQkJCQkJIG0tPmZsYWdzLAogCQkJCQkJIG0tPnRpbWVvdXQp OwogCQkJCQlnZW1fcXVpZXNjZW50X2dwdShmZCk7CkBAIC0zNTIsMTcgKzM1OCwxOSBAQCBpZ3Rf bWFpbgogCWlndF9zdWJ0ZXN0KCJiYXNpYy1hbGwiKSB7CiAJCWNvbnN0IHN0cnVjdCBpbnRlbF9l eGVjdXRpb25fZW5naW5lMiAqZTsKIAotCQlfX2Zvcl9lYWNoX3BoeXNpY2FsX2VuZ2luZShmZCwg ZSkgeworCQlmb3JfZWFjaF9jdHhfZW5naW5lKGZkLCBjdHgsIGUpIHsKIAkJCWlmICghZ2VtX2Ns YXNzX2Nhbl9zdG9yZV9kd29yZChmZCwgZS0+Y2xhc3MpKQogCQkJCWNvbnRpbnVlOwogCiAJCQlp Z3RfZm9yayhjaGlsZCwgMSkKLQkJCQlydW5fdGVzdChmZCwgZS0+ZmxhZ3MsIDAsIDEpOworCQkJ CXJ1bl90ZXN0KGZkLCBjdHgsIGUtPmZsYWdzLCAwLCAxKTsKIAkJfQogCiAJCWlndF93YWl0Y2hp bGRyZW4oKTsKIAl9CiAKLQlpZ3RfZml4dHVyZQorCWlndF9maXh0dXJlIHsKKwkJaW50ZWxfY3R4 X2Rlc3Ryb3koZmQsIGN0eCk7CiAJCWNsb3NlKGZkKTsKKwl9CiB9Ci0tIAoyLjMxLjEKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmlndC1kZXYgbWFpbGlu ZyBsaXN0CmlndC1kZXZAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaWd0LWRldgo=