From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7EC886E29D for ; Thu, 17 Jun 2021 19:13:43 +0000 (UTC) Received: by mail-pf1-x42a.google.com with SMTP id k6so5762585pfk.12 for ; Thu, 17 Jun 2021 12:13:43 -0700 (PDT) From: Jason Ekstrand Date: Thu, 17 Jun 2021 14:12:29 -0500 Message-Id: <20210617191256.577244-23-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 22/79] tests/i915/gem_ctx_exec: 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: djIgKEphc29uIEVrc3RyYW5kKToKIC0gQWxzbyB1c2UgYW4gaW50ZWxfY3R4X3QgZm9yIGJhc2lj LW5vcmVjb3ZlcnkKClNpZ25lZC1vZmYtYnk6IEphc29uIEVrc3RyYW5kIDxqYXNvbkBqbGVrc3Ry YW5kLm5ldD4KUmV2aWV3ZWQtYnk6IFpiaWduaWV3IEtlbXBjennFhHNraSA8emJpZ25pZXcua2Vt cGN6eW5za2lAaW50ZWwuY29tPgotLS0KIHRlc3RzL2k5MTUvZ2VtX2N0eF9leGVjLmMgfCA1OSAr KysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAz NSBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90ZXN0cy9pOTE1 L2dlbV9jdHhfZXhlYy5jIGIvdGVzdHMvaTkxNS9nZW1fY3R4X2V4ZWMuYwppbmRleCA2ZGIyZDU5 ODMuLjRkM2QxYzEyZiAxMDA2NDQKLS0tIGEvdGVzdHMvaTkxNS9nZW1fY3R4X2V4ZWMuYworKysg Yi90ZXN0cy9pOTE1L2dlbV9jdHhfZXhlYy5jCkBAIC0xNzAsOCArMTcwLDkgQEAgc3RhdGljIHZv aWQgbm9yZWNvdmVyeShpbnQgaTkxNSkKIAloYW5nID0gaWd0X2FsbG93X2hhbmcoaTkxNSwgMCwg MCk7CiAKIAlmb3IgKGludCBwYXNzID0gMTsgcGFzcyA+PSAwOyBwYXNzLS0pIHsKKwkJY29uc3Qg aW50ZWxfY3R4X3QgKmN0eCA9IGludGVsX2N0eF9jcmVhdGUoaTkxNSwgTlVMTCk7CiAJCXN0cnVj dCBkcm1faTkxNV9nZW1fY29udGV4dF9wYXJhbSBwYXJhbSA9IHsKLQkJCS5jdHhfaWQgPSBnZW1f Y29udGV4dF9jcmVhdGUoaTkxNSksCisJCQkuY3R4X2lkID0gY3R4LT5pZCwKIAkJCS5wYXJhbSA9 IEk5MTVfQ09OVEVYVF9QQVJBTV9SRUNPVkVSQUJMRSwKIAkJCS52YWx1ZSA9IHBhc3MsCiAJCX07 CkBAIC0xODQsOCArMTg1LDcgQEAgc3RhdGljIHZvaWQgbm9yZWNvdmVyeShpbnQgaTkxNSkKIAkJ Z2VtX2NvbnRleHRfZ2V0X3BhcmFtKGk5MTUsICZwYXJhbSk7CiAJCWlndF9hc3NlcnRfZXEocGFy YW0udmFsdWUsIHBhc3MpOwogCi0JCXNwaW4gPSBfX2lndF9zcGluX25ldyhpOTE1LAotCQkJCSAg ICAgIC5jdHhfaWQgPSBwYXJhbS5jdHhfaWQsCisJCXNwaW4gPSBfX2lndF9zcGluX25ldyhpOTE1 LCAuY3R4ID0gY3R4LAogCQkJCSAgICAgIC5mbGFncyA9IElHVF9TUElOX1BPTExfUlVOKTsKIAkJ aWd0X3NwaW5fYnVzeXdhaXRfdW50aWxfc3RhcnRlZChzcGluKTsKIApAQCAtMTk1LDcgKzE5NSw3 IEBAIHN0YXRpYyB2b2lkIG5vcmVjb3ZlcnkoaW50IGk5MTUpCiAJCWlndF9hc3NlcnRfZXEoX19n ZW1fZXhlY2J1ZihpOTE1LCAmc3Bpbi0+ZXhlY2J1ZiksIGV4cGVjdCk7CiAJCWlndF9zcGluX2Zy ZWUoaTkxNSwgc3Bpbik7CiAKLQkJZ2VtX2NvbnRleHRfZGVzdHJveShpOTE1LCBwYXJhbS5jdHhf aWQpOworCQlpbnRlbF9jdHhfZGVzdHJveShpOTE1LCBjdHgpOwogCX0KIAogCSBpZ3RfZGlzYWxs b3dfaGFuZyhpOTE1LCBoYW5nKTsKQEAgLTI2OCw3ICsyNjgsNyBAQCBzdGF0aWMgdm9pZCBub2hh bmdjaGVja19ob3N0aWxlKGludCBpOTE1KQogCWNvbnN0IHN0cnVjdCBpbnRlbF9leGVjdXRpb25f ZW5naW5lMiAqZTsKIAlpZ3RfaGFuZ190IGhhbmc7CiAJaW50IGZlbmNlID0gLTE7Ci0JdWludDMy X3QgY3R4OworCWNvbnN0IGludGVsX2N0eF90ICpjdHg7CiAJaW50IGVyciA9IDA7CiAJaW50IGRp cjsKIApAQCAtMjgyLDEyICsyODIsMTIgQEAgc3RhdGljIHZvaWQgbm9oYW5nY2hlY2tfaG9zdGls ZShpbnQgaTkxNSkKIAlkaXIgPSBpZ3RfcGFyYW1zX29wZW4oaTkxNSk7CiAJaWd0X3JlcXVpcmUo ZGlyICE9IC0xKTsKIAotCWN0eCA9IGdlbV9jb250ZXh0X2NyZWF0ZShpOTE1KTsKLQloYW5nID0g aWd0X2FsbG93X2hhbmcoaTkxNSwgY3R4LCAwKTsKKwljdHggPSBpbnRlbF9jdHhfY3JlYXRlX2Fs bF9waHlzaWNhbChpOTE1KTsKKwloYW5nID0gaWd0X2FsbG93X2hhbmcoaTkxNSwgY3R4LT5pZCwg MCk7CiAKIAlpZ3RfcmVxdWlyZShfX2VuYWJsZV9oYW5nY2hlY2soZGlyLCBmYWxzZSkpOwogCi0J X19fX2Zvcl9lYWNoX3BoeXNpY2FsX2VuZ2luZShpOTE1LCBjdHgsIGUpIHsKKwlmb3JfZWFjaF9j dHhfZW5naW5lKGk5MTUsIGN0eCwgZSkgewogCQlpZ3Rfc3Bpbl90ICpzcGluOwogCQlpbnQgbmV3 OwogCkBAIC0yOTUsNyArMjk1LDcgQEAgc3RhdGljIHZvaWQgbm9oYW5nY2hlY2tfaG9zdGlsZShp bnQgaTkxNSkKIAkJZ2VtX2VuZ2luZV9wcm9wZXJ0eV9wcmludGYoaTkxNSwgZS0+bmFtZSwKIAkJ CQkJICAgInByZWVtcHRfdGltZW91dF9tcyIsICIlZCIsIDUwKTsKIAotCQlzcGluID0gX19pZ3Rf c3Bpbl9uZXcoaTkxNSwgY3R4LAorCQlzcGluID0gX19pZ3Rfc3Bpbl9uZXcoaTkxNSwgLmN0eCA9 IGN0eCwKIAkJCQkgICAgICAuZW5naW5lID0gZS0+ZmxhZ3MsCiAJCQkJICAgICAgLmZsYWdzID0g KElHVF9TUElOX05PX1BSRUVNUFRJT04gfAogCQkJCQkJSUdUX1NQSU5fRkVOQ0VfT1VUKSk7CkBA IC0zMTYsNyArMzE2LDcgQEAgc3RhdGljIHZvaWQgbm9oYW5nY2hlY2tfaG9zdGlsZShpbnQgaTkx NSkKIAkJCWZlbmNlID0gdG1wOwogCQl9CiAJfQotCWdlbV9jb250ZXh0X2Rlc3Ryb3koaTkxNSwg Y3R4KTsKKwlpbnRlbF9jdHhfZGVzdHJveShpOTE1LCBjdHgpOwogCWlndF9hc3NlcnQoZmVuY2Ug IT0gLTEpOwogCiAJaWYgKHN5bmNfZmVuY2Vfd2FpdChmZW5jZSwgTVNFQ19QRVJfU0VDKSkgeyAv KiA2NDBtcyBwcmVlbXB0LXRpbWVvdXQgKi8KQEAgLTM0MSwzMCArMzQxLDM4IEBAIHN0YXRpYyB2 b2lkIG5vaGFuZ2NoZWNrX2hvc3RpbGUoaW50IGk5MTUpCiBzdGF0aWMgdm9pZCBjbG9zZV9yYWNl KGludCBpOTE1KQogewogCWNvbnN0IGludCBuY3B1cyA9IHN5c2NvbmYoX1NDX05QUk9DRVNTT1JT X09OTE4pOwotCXVpbnQzMl90ICpjb250ZXh0czsKKwljb25zdCBpbnRlbF9jdHhfdCAqYmFzZV9j dHg7CisJY29uc3QgaW50ZWxfY3R4X3QgKipjdHg7CisJdWludDMyX3QgKmN0eF9pZDsKIAlpZ3Rf c3Bpbl90ICpzcGluOwogCiAJLyogQ2hlY2sgd2UgY2FuIGV4ZWN1dGUgYSBwb2xsaW5nIHNwaW5u ZXIgKi8KLQlpZ3Rfc3Bpbl9mcmVlKGk5MTUsIGlndF9zcGluX25ldyhpOTE1LCAuZmxhZ3MgPSBJ R1RfU1BJTl9QT0xMX1JVTikpOworCWJhc2VfY3R4ID0gaW50ZWxfY3R4X2NyZWF0ZShpOTE1LCBO VUxMKTsKKwlpZ3Rfc3Bpbl9mcmVlKGk5MTUsIGlndF9zcGluX25ldyhpOTE1LCAuY3R4ID0gYmFz ZV9jdHgsCisJCQkJCSAuZmxhZ3MgPSBJR1RfU1BJTl9QT0xMX1JVTikpOwogCi0JY29udGV4dHMg PSBtbWFwKE5VTEwsIDQwOTYsIFBST1RfV1JJVEUsIE1BUF9TSEFSRUQgfCBNQVBfQU5PTiwgLTEs IDApOwotCWlndF9hc3NlcnQoY29udGV4dHMgIT0gTUFQX0ZBSUxFRCk7CisJY3R4ID0gY2FsbG9j KG5jcHVzLCBzaXplb2YoKmN0eCkpOworCWN0eF9pZCA9IG1tYXAoTlVMTCwgNDA5NiwgUFJPVF9X UklURSwgTUFQX1NIQVJFRCB8IE1BUF9BTk9OLCAtMSwgMCk7CisJaWd0X2Fzc2VydChjdHhfaWQg IT0gTUFQX0ZBSUxFRCk7CiAKLQlmb3IgKGludCBjaGlsZCA9IDA7IGNoaWxkIDwgbmNwdXM7IGNo aWxkKyspCi0JCWNvbnRleHRzW2NoaWxkXSA9IGdlbV9jb250ZXh0X2NyZWF0ZShpOTE1KTsKKwlm b3IgKGludCBjaGlsZCA9IDA7IGNoaWxkIDwgbmNwdXM7IGNoaWxkKyspIHsKKwkJY3R4W2NoaWxk XSA9IGludGVsX2N0eF9jcmVhdGUoaTkxNSwgTlVMTCk7CisJCWN0eF9pZFtjaGlsZF0gPSBjdHhb Y2hpbGRdLT5pZDsKKwl9CiAKIAlpZ3RfZm9yayhjaGlsZCwgbmNwdXMpIHsKLQkJc3BpbiA9IF9f aWd0X3NwaW5fbmV3KGk5MTUsIC5mbGFncyA9IElHVF9TUElOX1BPTExfUlVOKTsKKwkJc3BpbiA9 IF9faWd0X3NwaW5fbmV3KGk5MTUsIC5jdHggPSBiYXNlX2N0eCwKKwkJCQkgICAgICAuZmxhZ3Mg PSBJR1RfU1BJTl9QT0xMX1JVTik7CiAJCWlndF9zcGluX2VuZChzcGluKTsKIAkJZ2VtX3N5bmMo aTkxNSwgc3Bpbi0+aGFuZGxlKTsKIAotCQl3aGlsZSAoIVJFQURfT05DRShjb250ZXh0c1tuY3B1 c10pKSB7CisJCXdoaWxlICghUkVBRF9PTkNFKGN0eF9pZFtuY3B1c10pKSB7CiAJCQlpbnQ2NF90 IHRpbWVvdXQgPSAxOwogCiAJCQlpZ3Rfc3Bpbl9yZXNldChzcGluKTsKIAkJCWlndF9hc3NlcnQo IWlndF9zcGluX2hhc19zdGFydGVkKHNwaW4pKTsKIAotCQkJc3Bpbi0+ZXhlY2J1Zi5yc3ZkMSA9 IFJFQURfT05DRShjb250ZXh0c1tjaGlsZF0pOworCQkJc3Bpbi0+ZXhlY2J1Zi5yc3ZkMSA9IFJF QURfT05DRShjdHhfaWRbY2hpbGRdKTsKIAkJCWlmIChfX2dlbV9leGVjYnVmKGk5MTUsICZzcGlu LT5leGVjYnVmKSkKIAkJCQljb250aW51ZTsKIApAQCAtNDA0LDE5ICs0MTIsMjIgQEAgc3RhdGlj IHZvaWQgY2xvc2VfcmFjZShpbnQgaTkxNSkKIAkJICogYW5kIHRoZSBrZXJuZWwncyBjb250ZXh0 L3JlcXVlc3QgaGFuZGxpbmcuCiAJCSAqLwogCQlmb3IgKGludCBjaGlsZCA9IDA7IGNoaWxkIDwg bmNwdXM7IGNoaWxkKyspIHsKLQkJCWdlbV9jb250ZXh0X2Rlc3Ryb3koaTkxNSwgY29udGV4dHNb Y2hpbGRdKTsKLQkJCWNvbnRleHRzW2NoaWxkXSA9IGdlbV9jb250ZXh0X2NyZWF0ZShpOTE1KTsK KwkJCWludGVsX2N0eF9kZXN0cm95KGk5MTUsIGN0eFtjaGlsZF0pOworCQkJY3R4W2NoaWxkXSA9 IGludGVsX2N0eF9jcmVhdGUoaTkxNSwgTlVMTCk7CisJCQljdHhfaWRbY2hpbGRdID0gY3R4W2No aWxkXS0+aWQ7CiAJCX0KIAkJdXNsZWVwKDEwMDAgKyBoYXJzX3BldHJ1c2thX2Y1NF8xX3JhbmRv bV91bnNhZmUoKSAlIDIwMDApOwogCX0KIAotCWNvbnRleHRzW25jcHVzXSA9IDE7CisJY3R4X2lk W25jcHVzXSA9IDE7CiAJaWd0X3dhaXRjaGlsZHJlbigpOwogCisJaW50ZWxfY3R4X2Rlc3Ryb3ko aTkxNSwgYmFzZV9jdHgpOwogCWZvciAoaW50IGNoaWxkID0gMDsgY2hpbGQgPCBuY3B1czsgY2hp bGQrKykKLQkJZ2VtX2NvbnRleHRfZGVzdHJveShpOTE1LCBjb250ZXh0c1tjaGlsZF0pOworCQlp bnRlbF9jdHhfZGVzdHJveShpOTE1LCBjdHhbY2hpbGRdKTsKIAotCW11bm1hcChjb250ZXh0cywg NDA5Nik7CisJZnJlZShjdHgpOworCW11bm1hcChjdHhfaWQsIDQwOTYpOwogfQogCiBpZ3RfbWFp bgotLSAKMi4zMS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwppZ3QtZGV2IG1haWxpbmcgbGlzdAppZ3QtZGV2QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lndC1kZXYK