From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) by gabe.freedesktop.org (Postfix) with ESMTPS id 995AD89F55 for ; Mon, 14 Jun 2021 16:37:33 +0000 (UTC) Received: by mail-pl1-x634.google.com with SMTP id x10so6868452plg.3 for ; Mon, 14 Jun 2021 09:37:33 -0700 (PDT) From: Jason Ekstrand Date: Mon, 14 Jun 2021 11:36:27 -0500 Message-Id: <20210614163704.365989-13-jason@jlekstrand.net> In-Reply-To: <20210614163704.365989-1-jason@jlekstrand.net> References: <20210614163704.365989-1-jason@jlekstrand.net> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t 12/77] tests/i915/gem_spin_batch: Convert to intel_ctx_t (v2) 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: djIgKFpiaWduaWV3IEtlbXBjennFhHNraSk6CiAtIERvbid0IG51bGwtaW5pdCBjdHgKClNpZ25l ZC1vZmYtYnk6IEphc29uIEVrc3RyYW5kIDxqYXNvbkBqbGVrc3RyYW5kLm5ldD4KUmV2aWV3ZWQt Ynk6IFpiaWduaWV3IEtlbXBjennFhHNraSA8emJpZ25pZXcua2VtcGN6eW5za2lAaW50ZWwuY29t PgotLS0KIHRlc3RzL2k5MTUvZ2VtX3NwaW5fYmF0Y2guYyB8IDgxICsrKysrKysrKysrKysrKysr KysrKy0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0NiBpbnNlcnRpb25zKCspLCAz NSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90ZXN0cy9pOTE1L2dlbV9zcGluX2JhdGNoLmMg Yi90ZXN0cy9pOTE1L2dlbV9zcGluX2JhdGNoLmMKaW5kZXggZGIwYWYwMThlLi40YTlkNmMyZGYg MTAwNjQ0Ci0tLSBhL3Rlc3RzL2k5MTUvZ2VtX3NwaW5fYmF0Y2guYworKysgYi90ZXN0cy9pOTE1 L2dlbV9zcGluX2JhdGNoLmMKQEAgLTM0LDcgKzM0LDcgQEAKIAkJICAgICAiJyVzJyAhPSAnJXMn ICglbGxkIG5vdCB3aXRoaW4gJWQlJSB0b2xlcmFuY2Ugb2YgJWxsZClcbiIsXAogCQkgICAgICN4 LCAjcmVmLCAobG9uZyBsb25nKXgsIHRvbGVyYW5jZSwgKGxvbmcgbG9uZylyZWYpCiAKLXN0YXRp YyB2b2lkIHNwaW4oaW50IGZkLAorc3RhdGljIHZvaWQgc3BpbihpbnQgZmQsIGNvbnN0IGludGVs X2N0eF90ICpjdHhfaWQsCiAJCSB1bnNpZ25lZCBpbnQgZW5naW5lLAogCQkgdW5zaWduZWQgaW50 IGZsYWdzLAogCQkgdW5zaWduZWQgaW50IHRpbWVvdXRfc2VjKQpAQCAtNDYsMTAgKzQ2LDEyIEBA IHN0YXRpYyB2b2lkIHNwaW4oaW50IGZkLAogCXN0cnVjdCB0aW1lc3BlYyBpdHYgPSB7IH07CiAJ dWludDY0X3QgZWxhcHNlZDsKIAotCXNwaW4gPSBfX2lndF9zcGluX25ldyhmZCwgLmVuZ2luZSA9 IGVuZ2luZSwgLmZsYWdzID0gZmxhZ3MpOworCXNwaW4gPSBfX2lndF9zcGluX25ldyhmZCwgLmN0 eCA9IGN0eF9pZCwgLmVuZ2luZSA9IGVuZ2luZSwKKwkJCSAgICAgIC5mbGFncyA9IGZsYWdzKTsK IAl3aGlsZSAoKGVsYXBzZWQgPSBpZ3RfbnNlY19lbGFwc2VkKCZ0dikpID4+IDMwIDwgdGltZW91 dF9zZWMpIHsKIAkJaWd0X3NwaW5fdCAqbmV4dCA9Ci0JCQlfX2lndF9zcGluX25ldyhmZCwgLmVu Z2luZSA9IGVuZ2luZSwgLmZsYWdzID0gZmxhZ3MpOworCQkJX19pZ3Rfc3Bpbl9uZXcoZmQsIC5j dHggPSBjdHhfaWQsIC5lbmdpbmUgPSBlbmdpbmUsCisJCQkJICAgICAgIC5mbGFncyA9IGZsYWdz KTsKIAogCQlpZ3Rfc3Bpbl9zZXRfdGltZW91dChzcGluLAogCQkJCSAgICAgdGltZW91dF8xMDBt cyAtIGlndF9uc2VjX2VsYXBzZWQoJml0dikpOwpAQCAtNzUsMjEgKzc3LDI1IEBAIHN0YXRpYyB2 b2lkIHNwaW4oaW50IGZkLAogI2RlZmluZSBSRVNVQk1JVF9ORVdfQ1RYICAgICAoMSA8PCAwKQog I2RlZmluZSBSRVNVQk1JVF9BTExfRU5HSU5FUyAoMSA8PCAxKQogCi1zdGF0aWMgdm9pZCBzcGlu X3Jlc3VibWl0KGludCBmZCwgdW5zaWduZWQgaW50IGVuZ2luZSwgdW5zaWduZWQgaW50IGZsYWdz KQorc3RhdGljIHZvaWQgc3Bpbl9yZXN1Ym1pdChpbnQgZmQsIGNvbnN0IGludGVsX2N0eF90ICpj dHgsCisJCQkgIHVuc2lnbmVkIGludCBlbmdpbmUsIHVuc2lnbmVkIGludCBmbGFncykKIHsKKwlj b25zdCBpbnRlbF9jdHhfdCAqbmV3X2N0eCA9IE5VTEw7CiAJaWd0X3NwaW5fdCAqc3BpbjsKIAog CWlmIChmbGFncyAmIFJFU1VCTUlUX05FV19DVFgpCiAJCWlndF9yZXF1aXJlKGdlbV9oYXNfY29u dGV4dHMoZmQpKTsKIAotCXNwaW4gPSBfX2lndF9zcGluX25ldyhmZCwgLmVuZ2luZSA9IGVuZ2lu ZSk7Ci0JaWYgKGZsYWdzICYgUkVTVUJNSVRfTkVXX0NUWCkKLQkJc3Bpbi0+ZXhlY2J1Zi5yc3Zk MSA9IGdlbV9jb250ZXh0X2Nsb25lX3dpdGhfZW5naW5lcyhmZCwgMCk7CisJc3BpbiA9IF9faWd0 X3NwaW5fbmV3KGZkLCAuY3R4ID0gY3R4LCAuZW5naW5lID0gZW5naW5lKTsKKwlpZiAoZmxhZ3Mg JiBSRVNVQk1JVF9ORVdfQ1RYKSB7CisJCW5ld19jdHggPSBpbnRlbF9jdHhfY3JlYXRlKGZkLCAm Y3R4LT5jZmcpOworCQlzcGluLT5leGVjYnVmLnJzdmQxID0gbmV3X2N0eC0+aWQ7CisJfQogCiAJ aWYgKGZsYWdzICYgUkVTVUJNSVRfQUxMX0VOR0lORVMpIHsKIAkJY29uc3Qgc3RydWN0IGludGVs X2V4ZWN1dGlvbl9lbmdpbmUyICpvdGhlcjsKIAotCQlmb3JfZWFjaF9jb250ZXh0X2VuZ2luZShm ZCwgc3Bpbi0+ZXhlY2J1Zi5yc3ZkMSwgb3RoZXIpIHsKKwkJZm9yX2VhY2hfY3R4X2VuZ2luZShm ZCwgY3R4LCBvdGhlcikgewogCQkJc3Bpbi0+ZXhlY2J1Zi5mbGFncyAmPSB+MHgzZjsKIAkJCXNw aW4tPmV4ZWNidWYuZmxhZ3MgfD0gb3RoZXItPmZsYWdzOwogCQkJZ2VtX2V4ZWNidWYoZmQsICZz cGluLT5leGVjYnVmKTsKQEAgLTEwMCw4ICsxMDYsOCBAQCBzdGF0aWMgdm9pZCBzcGluX3Jlc3Vi bWl0KGludCBmZCwgdW5zaWduZWQgaW50IGVuZ2luZSwgdW5zaWduZWQgaW50IGZsYWdzKQogCWln dF9zcGluX2VuZChzcGluKTsKIAlnZW1fc3luYyhmZCwgc3Bpbi0+aGFuZGxlKTsKIAotCWlmIChz cGluLT5leGVjYnVmLnJzdmQxKQotCQlnZW1fY29udGV4dF9kZXN0cm95KGZkLCBzcGluLT5leGVj YnVmLnJzdmQxKTsKKwlpZiAoZmxhZ3MgJiBSRVNVQk1JVF9ORVdfQ1RYKQorCQlpbnRlbF9jdHhf ZGVzdHJveShmZCwgbmV3X2N0eCk7CiAKIAlpZ3Rfc3Bpbl9mcmVlKGZkLCBzcGluKTsKIH0KQEAg LTExMiw0NSArMTE4LDQ0IEBAIHN0YXRpYyB2b2lkIHNwaW5fZXhpdF9oYW5kbGVyKGludCBzaWcp CiB9CiAKIHN0YXRpYyB2b2lkCi1zcGluX29uX2FsbF9lbmdpbmVzKGludCBmZCwgdW5zaWduZWQg bG9uZyBmbGFncywgdW5zaWduZWQgaW50IHRpbWVvdXRfc2VjKQorc3Bpbl9vbl9hbGxfZW5naW5l cyhpbnQgZmQsIGNvbnN0IGludGVsX2N0eF90ICpjdHgsCisJCSAgICB1bnNpZ25lZCBsb25nIGZs YWdzLCB1bnNpZ25lZCBpbnQgdGltZW91dF9zZWMpCiB7CiAJY29uc3Qgc3RydWN0IGludGVsX2V4 ZWN1dGlvbl9lbmdpbmUyICplMjsKIAotCV9fZm9yX2VhY2hfcGh5c2ljYWxfZW5naW5lKGZkLCBl MikgeworCWZvcl9lYWNoX2N0eF9lbmdpbmUoZmQsIGN0eCwgZTIpIHsKIAkJaWd0X2ZvcmsoY2hp bGQsIDEpIHsKIAkJCWlndF9pbnN0YWxsX2V4aXRfaGFuZGxlcihzcGluX2V4aXRfaGFuZGxlcik7 Ci0JCQlzcGluKGZkLCBlMi0+ZmxhZ3MsIGZsYWdzLCB0aW1lb3V0X3NlYyk7CisJCQlzcGluKGZk LCBjdHgsIGUyLT5mbGFncywgZmxhZ3MsIHRpbWVvdXRfc2VjKTsKIAkJfQogCX0KIAogCWlndF93 YWl0Y2hpbGRyZW4oKTsKIH0KIAotc3RhdGljIHZvaWQgc3Bpbl9hbGwoaW50IGk5MTUsIHVuc2ln bmVkIGludCBmbGFncykKK3N0YXRpYyB2b2lkIHNwaW5fYWxsKGludCBpOTE1LCBjb25zdCBpbnRl bF9jdHhfdCAqY3R4LCB1bnNpZ25lZCBpbnQgZmxhZ3MpCiAjZGVmaW5lIFBBUkFMTEVMX1NQSU5f TkVXX0NUWCBCSVQoMCkKIHsKIAljb25zdCBzdHJ1Y3QgaW50ZWxfZXhlY3V0aW9uX2VuZ2luZTIg KmU7CisJaW50ZWxfY3R4X2NmZ190IGNmZyA9IGN0eC0+Y2ZnOwogCXN0cnVjdCBpZ3Rfc3BpbiAq c3BpbiwgKm47CiAJSUdUX0xJU1RfSEVBRChsaXN0KTsKIAotCV9fZm9yX2VhY2hfcGh5c2ljYWxf ZW5naW5lKGk5MTUsIGUpIHsKLQkJdWludDMyX3QgY3R4OwotCisJZm9yX2VhY2hfY3R4X2NmZ19l bmdpbmUoaTkxNSwgJmNmZywgZSkgewogCQlpZiAoIWdlbV9jbGFzc19jYW5fc3RvcmVfZHdvcmQo aTkxNSwgZS0+Y2xhc3MpKQogCQkJY29udGludWU7CiAKLQkJY3R4ID0gMDsKIAkJaWYgKGZsYWdz ICYgUEFSQUxMRUxfU1BJTl9ORVdfQ1RYKQotCQkJY3R4ID0gZ2VtX2NvbnRleHRfY2xvbmVfd2l0 aF9lbmdpbmVzKGk5MTUsIDApOworCQkJY3R4ID0gaW50ZWxfY3R4X2NyZWF0ZShpOTE1LCAmY2Zn KTsKIAogCQkvKiBQcmV2ZW50IHByZWVtcHRpb24gc28gb25seSBvbmUgaXMgYWxsb3dlZCBvbiBl YWNoIGVuZ2luZSAqLwogCQlzcGluID0gaWd0X3NwaW5fbmV3KGk5MTUsCi0JCQkJICAgIC5jdHhf aWQgPSBjdHgsCisJCQkJICAgIC5jdHggPSBjdHgsCiAJCQkJICAgIC5lbmdpbmUgPSBlLT5mbGFn cywKIAkJCQkgICAgLmZsYWdzID0gKElHVF9TUElOX1BPTExfUlVOIHwKIAkJCQkJICAgICAgSUdU X1NQSU5fTk9fUFJFRU1QVElPTikpOwotCQlpZiAoY3R4KQotCQkJZ2VtX2NvbnRleHRfZGVzdHJv eShpOTE1LCBjdHgpOworCQlpZiAoZmxhZ3MgJiBQQVJBTExFTF9TUElOX05FV19DVFgpCisJCQlp bnRlbF9jdHhfZGVzdHJveShpOTE1LCBjdHgpOwogCiAJCWlndF9zcGluX2J1c3l3YWl0X3VudGls X3N0YXJ0ZWQoc3Bpbik7CiAJCWlndF9saXN0X21vdmUoJnNwaW4tPmxpbmssICZsaXN0KTsKQEAg LTE4NywxMSArMTkyLDE0IEBAIGlndF9tYWluCiB7CiAJY29uc3Qgc3RydWN0IGludGVsX2V4ZWN1 dGlvbl9lbmdpbmUyICplMjsKIAljb25zdCBzdHJ1Y3QgaW50ZWxfZXhlY3V0aW9uX3JpbmcgKmU7 CisJY29uc3QgaW50ZWxfY3R4X3QgKmN0eDsKIAlpbnQgZmQgPSAtMTsKIAogCWlndF9maXh0dXJl IHsKIAkJZmQgPSBkcm1fb3Blbl9kcml2ZXIoRFJJVkVSX0lOVEVMKTsKIAkJaWd0X3JlcXVpcmVf Z2VtKGZkKTsKKwkJY3R4ID0gaW50ZWxfY3R4X2NyZWF0ZV9hbGxfcGh5c2ljYWwoZmQpOworCiAJ CWlndF9mb3JrX2hhbmdfZGV0ZWN0b3IoZmQpOwogCX0KIApAQCAtMjAyLDUzICsyMTAsNTYgQEAg aWd0X21haW4KIAkJCQlpZ3RfZHluYW1pY19mKCIlcyIsIGUtPm5hbWUpCiAKIAl0ZXN0X2VhY2hf bGVnYWN5X3JpbmcoImxlZ2FjeSIpCi0JCXNwaW4oZmQsIGViX3JpbmcoZSksIDAsIDMpOworCQlz cGluKGZkLCBpbnRlbF9jdHhfMChmZCksIGViX3JpbmcoZSksIDAsIDMpOwogCXRlc3RfZWFjaF9s ZWdhY3lfcmluZygibGVnYWN5LXJlc3VibWl0IikKLQkJc3Bpbl9yZXN1Ym1pdChmZCwgZWJfcmlu ZyhlKSwgMCk7CisJCXNwaW5fcmVzdWJtaXQoZmQsIGludGVsX2N0eF8wKGZkKSwgZWJfcmluZyhl KSwgMCk7CiAJdGVzdF9lYWNoX2xlZ2FjeV9yaW5nKCJsZWdhY3ktcmVzdWJtaXQtbmV3IikKLQkJ c3Bpbl9yZXN1Ym1pdChmZCwgZWJfcmluZyhlKSwgUkVTVUJNSVRfTkVXX0NUWCk7CisJCXNwaW5f cmVzdWJtaXQoZmQsIGludGVsX2N0eF8wKGZkKSwgZWJfcmluZyhlKSwgUkVTVUJNSVRfTkVXX0NU WCk7CiAKICN1bmRlZiB0ZXN0X2VhY2hfbGVnY3lfcmluZwogCiAJaWd0X3N1YnRlc3QoInNwaW4t YWxsIikKLQkJc3Bpbl9hbGwoZmQsIDApOworCQlzcGluX2FsbChmZCwgY3R4LCAwKTsKIAlpZ3Rf c3VidGVzdCgic3Bpbi1hbGwtbmV3IikKLQkJc3Bpbl9hbGwoZmQsIFBBUkFMTEVMX1NQSU5fTkVX X0NUWCk7CisJCXNwaW5fYWxsKGZkLCBjdHgsIFBBUkFMTEVMX1NQSU5fTkVXX0NUWCk7CiAKICNk ZWZpbmUgdGVzdF9lYWNoX2VuZ2luZSh0ZXN0KSBcCiAJaWd0X3N1YnRlc3Rfd2l0aF9keW5hbWlj KHRlc3QpIFwKLQkJX19mb3JfZWFjaF9waHlzaWNhbF9lbmdpbmUoZmQsIGUyKSBcCisJCWZvcl9l YWNoX2N0eF9lbmdpbmUoZmQsIGN0eCwgZTIpIFwKIAkJCWlndF9keW5hbWljX2YoIiVzIiwgZTIt Pm5hbWUpCiAKIAl0ZXN0X2VhY2hfZW5naW5lKCJlbmdpbmVzIikKLQkJc3BpbihmZCwgZTItPmZs YWdzLCAwLCAzKTsKKwkJc3BpbihmZCwgY3R4LCBlMi0+ZmxhZ3MsIDAsIDMpOwogCiAJdGVzdF9l YWNoX2VuZ2luZSgicmVzdWJtaXQiKQotCQlzcGluX3Jlc3VibWl0KGZkLCBlMi0+ZmxhZ3MsIDAp OworCQlzcGluX3Jlc3VibWl0KGZkLCBjdHgsIGUyLT5mbGFncywgMCk7CiAKIAl0ZXN0X2VhY2hf ZW5naW5lKCJyZXN1Ym1pdC1uZXciKQotCQlzcGluX3Jlc3VibWl0KGZkLCBlMi0+ZmxhZ3MsIFJF U1VCTUlUX05FV19DVFgpOworCQlzcGluX3Jlc3VibWl0KGZkLCBjdHgsIGUyLT5mbGFncywKKwkJ CSAgICAgIFJFU1VCTUlUX05FV19DVFgpOwogCiAJdGVzdF9lYWNoX2VuZ2luZSgicmVzdWJtaXQt YWxsIikKLQkJc3Bpbl9yZXN1Ym1pdChmZCwgZTItPmZsYWdzLCBSRVNVQk1JVF9BTExfRU5HSU5F Uyk7CisJCXNwaW5fcmVzdWJtaXQoZmQsIGN0eCwgZTItPmZsYWdzLAorCQkJICAgICAgUkVTVUJN SVRfQUxMX0VOR0lORVMpOwogCiAJdGVzdF9lYWNoX2VuZ2luZSgicmVzdWJtaXQtbmV3LWFsbCIp Ci0JCXNwaW5fcmVzdWJtaXQoZmQsIGUyLT5mbGFncywKKwkJc3Bpbl9yZXN1Ym1pdChmZCwgY3R4 LCBlMi0+ZmxhZ3MsCiAJCQkgICAgICBSRVNVQk1JVF9ORVdfQ1RYIHwKIAkJCSAgICAgIFJFU1VC TUlUX0FMTF9FTkdJTkVTKTsKIAogI3VuZGVmIHRlc3RfZWFjaF9lbmdpbmUKIAogCWlndF9zdWJ0 ZXN0KCJzcGluLWVhY2giKQotCQlzcGluX29uX2FsbF9lbmdpbmVzKGZkLCAwLCAzKTsKKwkJc3Bp bl9vbl9hbGxfZW5naW5lcyhmZCwgY3R4LCAwLCAzKTsKIAogCWlndF9zdWJ0ZXN0KCJ1c2VyLWVh Y2giKSB7CiAJCWlndF9yZXF1aXJlKGhhc191c2VycHRyKGZkKSk7Ci0JCXNwaW5fb25fYWxsX2Vu Z2luZXMoZmQsIElHVF9TUElOX1VTRVJQVFIsIDMpOworCQlzcGluX29uX2FsbF9lbmdpbmVzKGZk LCBjdHgsIElHVF9TUElOX1VTRVJQVFIsIDMpOwogCX0KIAogCWlndF9maXh0dXJlIHsKIAkJaWd0 X3N0b3BfaGFuZ19kZXRlY3RvcigpOworCQlpbnRlbF9jdHhfZGVzdHJveShmZCwgY3R4KTsKIAkJ Y2xvc2UoZmQpOwogCX0KIH0KLS0gCjIuMzEuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KaWd0LWRldiBtYWlsaW5nIGxpc3QKaWd0LWRldkBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pZ3QtZGV2Cg==