From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 4/9] drm/i915/selftests: Pass around intel_context for sseu Date: Fri, 26 Apr 2019 07:27:28 +0100 Message-ID: <20190426062733.22843-4-chris@chris-wilson.co.uk> References: <20190426062733.22843-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4F10F892FD for ; Fri, 26 Apr 2019 06:29:34 +0000 (UTC) In-Reply-To: <20190426062733.22843-1-chris@chris-wilson.co.uk> 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 Q29tYmluZSB0aGUgKGk5MTVfZ2VtX2NvbnRleHQsIGludGVsX2VuZ2luZSkgaW50byBhIHNpbmds ZSBwYXJhbWV0ZXIsCnRoZSBpbnRlbF9jb250ZXh0IGZvciBjb252ZW5pZW5jZSBhbmQgbGF0ZXIg c2ltcGxpZmljYXRpb24uCgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlz LXdpbHNvbi5jby51az4KUmV2aWV3ZWQtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxp bkBpbnRlbC5jb20+Ci0tLQogLi4uL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaTkxNV9nZW1fY29u dGV4dC5jIHwgNzQgKysrKysrKysrKystLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQ0IGluc2Vy dGlvbnMoKyksIDMwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L3NlbGZ0ZXN0cy9pOTE1X2dlbV9jb250ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9z ZWxmdGVzdHMvaTkxNV9nZW1fY29udGV4dC5jCmluZGV4IDgwNzY0NGFlNjg3Ny4uOGUyYTk0MzMz NTU5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaTkxNV9nZW1f Y29udGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pOTE1X2dlbV9j b250ZXh0LmMKQEAgLTc1NSw4ICs3NTUsNyBAQCBzdGF0aWMgc3RydWN0IGk5MTVfdm1hICpycGNz X3F1ZXJ5X2JhdGNoKHN0cnVjdCBpOTE1X3ZtYSAqdm1hKQogCiBzdGF0aWMgaW50CiBlbWl0X3Jw Y3NfcXVlcnkoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKLQkJc3RydWN0IGk5MTVf Z2VtX2NvbnRleHQgKmN0eCwKLQkJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAorCQlz dHJ1Y3QgaW50ZWxfY29udGV4dCAqY2UsCiAJCXN0cnVjdCBpOTE1X3JlcXVlc3QgKipycV9vdXQp CiB7CiAJc3RydWN0IGk5MTVfcmVxdWVzdCAqcnE7CkBAIC03NjQsOSArNzYzLDkgQEAgZW1pdF9y cGNzX3F1ZXJ5KHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJc3RydWN0IGk5MTVf dm1hICp2bWE7CiAJaW50IGVycjsKIAotCUdFTV9CVUdfT04oIWludGVsX2VuZ2luZV9jYW5fc3Rv cmVfZHdvcmQoZW5naW5lKSk7CisJR0VNX0JVR19PTighaW50ZWxfZW5naW5lX2Nhbl9zdG9yZV9k d29yZChjZS0+ZW5naW5lKSk7CiAKLQl2bWEgPSBpOTE1X3ZtYV9pbnN0YW5jZShvYmosICZjdHgt PnBwZ3R0LT52bSwgTlVMTCk7CisJdm1hID0gaTkxNV92bWFfaW5zdGFuY2Uob2JqLCAmY2UtPmdl bV9jb250ZXh0LT5wcGd0dC0+dm0sIE5VTEwpOwogCWlmIChJU19FUlIodm1hKSkKIAkJcmV0dXJu IFBUUl9FUlIodm1hKTsKIApAQCAtNzg0LDEzICs3ODMsMTUgQEAgZW1pdF9ycGNzX3F1ZXJ5KHN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJCWdvdG8gZXJyX3ZtYTsKIAl9CiAKLQly cSA9IGk5MTVfcmVxdWVzdF9hbGxvYyhlbmdpbmUsIGN0eCk7CisJcnEgPSBpOTE1X3JlcXVlc3Rf Y3JlYXRlKGNlKTsKIAlpZiAoSVNfRVJSKHJxKSkgewogCQllcnIgPSBQVFJfRVJSKHJxKTsKIAkJ Z290byBlcnJfYmF0Y2g7CiAJfQogCi0JZXJyID0gZW5naW5lLT5lbWl0X2JiX3N0YXJ0KHJxLCBi YXRjaC0+bm9kZS5zdGFydCwgYmF0Y2gtPm5vZGUuc2l6ZSwgMCk7CisJZXJyID0gcnEtPmVuZ2lu ZS0+ZW1pdF9iYl9zdGFydChycSwKKwkJCQkJYmF0Y2gtPm5vZGUuc3RhcnQsIGJhdGNoLT5ub2Rl LnNpemUsCisJCQkJCTApOwogCWlmIChlcnIpCiAJCWdvdG8gZXJyX3JlcXVlc3Q7CiAKQEAgLTgz NCw4ICs4MzUsNyBAQCBzdGF0aWMgaW50CiBfX3NzZXVfcHJlcGFyZShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqaTkxNSwKIAkgICAgICAgY29uc3QgY2hhciAqbmFtZSwKIAkgICAgICAgdW5zaWdu ZWQgaW50IGZsYWdzLAotCSAgICAgICBzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqY3R4LAotCSAg ICAgICBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCisJICAgICAgIHN0cnVjdCBpbnRl bF9jb250ZXh0ICpjZSwKIAkgICAgICAgc3RydWN0IGlndF9zcGlubmVyICoqc3BpbikKIHsKIAlz dHJ1Y3QgaTkxNV9yZXF1ZXN0ICpycTsKQEAgLTg1Myw3ICs4NTMsMTAgQEAgX19zc2V1X3ByZXBh cmUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsCiAJaWYgKHJldCkKIAkJZ290byBlcnJf ZnJlZTsKIAotCXJxID0gaWd0X3NwaW5uZXJfY3JlYXRlX3JlcXVlc3QoKnNwaW4sIGN0eCwgZW5n aW5lLCBNSV9OT09QKTsKKwlycSA9IGlndF9zcGlubmVyX2NyZWF0ZV9yZXF1ZXN0KCpzcGluLAor CQkJCQljZS0+Z2VtX2NvbnRleHQsCisJCQkJCWNlLT5lbmdpbmUsCisJCQkJCU1JX05PT1ApOwog CWlmIChJU19FUlIocnEpKSB7CiAJCXJldCA9IFBUUl9FUlIocnEpOwogCQlnb3RvIGVycl9maW5p OwpAQCAtODgwLDggKzg4Myw3IEBAIF9fc3NldV9wcmVwYXJlKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICppOTE1LAogCiBzdGF0aWMgaW50CiBfX3JlYWRfc2xpY2VfY291bnQoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmk5MTUsCi0JCSAgIHN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpjdHgsCi0J CSAgIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKKwkJICAgc3RydWN0IGludGVsX2Nv bnRleHQgKmNlLAogCQkgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAogCQkgICBz dHJ1Y3QgaWd0X3NwaW5uZXIgKnNwaW4sCiAJCSAgIHUzMiAqcnBjcykKQEAgLTg5Miw3ICs4OTQs NyBAQCBfX3JlYWRfc2xpY2VfY291bnQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsCiAJ dTMyICpidWYsIHZhbDsKIAlsb25nIHJldDsKIAotCXJldCA9IGVtaXRfcnBjc19xdWVyeShvYmos IGN0eCwgZW5naW5lLCAmcnEpOworCXJldCA9IGVtaXRfcnBjc19xdWVyeShvYmosIGNlLCAmcnEp OwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTk1NiwyOSArOTU4LDI4IEBAIHN0YXRp YyBpbnQKIF9fc3NldV9maW5pc2goc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsCiAJICAg ICAgY29uc3QgY2hhciAqbmFtZSwKIAkgICAgICB1bnNpZ25lZCBpbnQgZmxhZ3MsCi0JICAgICAg c3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCwKLQkgICAgICBzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICplbmdpbmUsCisJICAgICAgc3RydWN0IGludGVsX2NvbnRleHQgKmNlLAogCSAgICAgIHN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJICAgICAgdW5zaWduZWQgaW50IGV4cGVj dGVkLAogCSAgICAgIHN0cnVjdCBpZ3Rfc3Bpbm5lciAqc3BpbikKIHsKLQl1bnNpZ25lZCBpbnQg c2xpY2VzID0gaHdlaWdodDMyKGVuZ2luZS0+c3NldS5zbGljZV9tYXNrKTsKKwl1bnNpZ25lZCBp bnQgc2xpY2VzID0gaHdlaWdodDMyKGNlLT5lbmdpbmUtPnNzZXUuc2xpY2VfbWFzayk7CiAJdTMy IHJwY3MgPSAwOwogCWludCByZXQgPSAwOwogCiAJaWYgKGZsYWdzICYgVEVTVF9SRVNFVCkgewot CQlyZXQgPSBpOTE1X3Jlc2V0X2VuZ2luZShlbmdpbmUsICJzc2V1Iik7CisJCXJldCA9IGk5MTVf cmVzZXRfZW5naW5lKGNlLT5lbmdpbmUsICJzc2V1Iik7CiAJCWlmIChyZXQpCiAJCQlnb3RvIG91 dDsKIAl9CiAKLQlyZXQgPSBfX3JlYWRfc2xpY2VfY291bnQoaTkxNSwgY3R4LCBlbmdpbmUsIG9i aiwKKwlyZXQgPSBfX3JlYWRfc2xpY2VfY291bnQoaTkxNSwgY2UsIG9iaiwKIAkJCQkgZmxhZ3Mg JiBURVNUX1JFU0VUID8gTlVMTCA6IHNwaW4sICZycGNzKTsKIAlyZXQgPSBfX2NoZWNrX3JwY3Mo bmFtZSwgcnBjcywgcmV0LCBleHBlY3RlZCwgIkNvbnRleHQiLCAiISIpOwogCWlmIChyZXQpCiAJ CWdvdG8gb3V0OwogCi0JcmV0ID0gX19yZWFkX3NsaWNlX2NvdW50KGk5MTUsIGk5MTUtPmtlcm5l bF9jb250ZXh0LCBlbmdpbmUsIG9iaiwKKwlyZXQgPSBfX3JlYWRfc2xpY2VfY291bnQoaTkxNSwg Y2UtPmVuZ2luZS0+a2VybmVsX2NvbnRleHQsIG9iaiwKIAkJCQkgTlVMTCwgJnJwY3MpOwogCXJl dCA9IF9fY2hlY2tfcnBjcyhuYW1lLCBycGNzLCByZXQsIHNsaWNlcywgIktlcm5lbCBjb250ZXh0 IiwgIiEiKTsKIApAQCAtOTkzLDcgKzk5NCw3IEBAIF9fc3NldV9maW5pc2goc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmk5MTUsCiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwogCi0JCXJldCA9 IF9fcmVhZF9zbGljZV9jb3VudChpOTE1LCBjdHgsIGVuZ2luZSwgb2JqLCBOVUxMLCAmcnBjcyk7 CisJCXJldCA9IF9fcmVhZF9zbGljZV9jb3VudChpOTE1LCBjZSwgb2JqLCBOVUxMLCAmcnBjcyk7 CiAJCXJldCA9IF9fY2hlY2tfcnBjcyhuYW1lLCBycGNzLCByZXQsIGV4cGVjdGVkLAogCQkJCSAg ICJDb250ZXh0IiwgIiBhZnRlciBpZGxlISIpOwogCX0KQEAgLTEwMDUsMjMgKzEwMDYsMjIgQEAg c3RhdGljIGludAogX19zc2V1X3Rlc3Qoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmk5MTUsCiAJ ICAgIGNvbnN0IGNoYXIgKm5hbWUsCiAJICAgIHVuc2lnbmVkIGludCBmbGFncywKLQkgICAgc3Ry dWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCwKLQkgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAq ZW5naW5lLAorCSAgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY2UsCiAJICAgIHN0cnVjdCBkcm1f aTkxNV9nZW1fb2JqZWN0ICpvYmosCiAJICAgIHN0cnVjdCBpbnRlbF9zc2V1IHNzZXUpCiB7CiAJ c3RydWN0IGlndF9zcGlubmVyICpzcGluID0gTlVMTDsKIAlpbnQgcmV0OwogCi0JcmV0ID0gX19z c2V1X3ByZXBhcmUoaTkxNSwgbmFtZSwgZmxhZ3MsIGN0eCwgZW5naW5lLCAmc3Bpbik7CisJcmV0 ID0gX19zc2V1X3ByZXBhcmUoaTkxNSwgbmFtZSwgZmxhZ3MsIGNlLCAmc3Bpbik7CiAJaWYgKHJl dCkKIAkJcmV0dXJuIHJldDsKIAotCXJldCA9IF9faTkxNV9nZW1fY29udGV4dF9yZWNvbmZpZ3Vy ZV9zc2V1KGN0eCwgZW5naW5lLCBzc2V1KTsKKwlyZXQgPSBfX2k5MTVfZ2VtX2NvbnRleHRfcmVj b25maWd1cmVfc3NldShjZS0+Z2VtX2NvbnRleHQsIGNlLT5lbmdpbmUsIHNzZXUpOwogCWlmIChy ZXQpCiAJCWdvdG8gb3V0X3NwaW47CiAKLQlyZXQgPSBfX3NzZXVfZmluaXNoKGk5MTUsIG5hbWUs IGZsYWdzLCBjdHgsIGVuZ2luZSwgb2JqLAorCXJldCA9IF9fc3NldV9maW5pc2goaTkxNSwgbmFt ZSwgZmxhZ3MsIGNlLCBvYmosCiAJCQkgICAgaHdlaWdodDMyKHNzZXUuc2xpY2VfbWFzayksIHNw aW4pOwogCiBvdXRfc3BpbjoKQEAgLTEwNDIsNiArMTA0Miw3IEBAIF9faWd0X2N0eF9zc2V1KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LAogCXN0cnVjdCBpbnRlbF9zc2V1IGRlZmF1bHRf c3NldSA9IGVuZ2luZS0+c3NldTsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOwog CXN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpjdHg7CisJc3RydWN0IGludGVsX2NvbnRleHQgKmNl OwogCXN0cnVjdCBpbnRlbF9zc2V1IHBnX3NzZXU7CiAJaW50ZWxfd2FrZXJlZl90IHdha2VyZWY7 CiAJc3RydWN0IGRybV9maWxlICpmaWxlOwpAQCAtMTA5MywyMyArMTA5NCwzMyBAQCBfX2lndF9j dHhfc3NldShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwKIAogCXdha2VyZWYgPSBpbnRl bF9ydW50aW1lX3BtX2dldChpOTE1KTsKIAorCWNlID0gaW50ZWxfY29udGV4dF9pbnN0YW5jZShj dHgsIGk5MTUtPmVuZ2luZVtSQ1MwXSk7CisJaWYgKElTX0VSUihjZSkpIHsKKwkJcmV0ID0gUFRS X0VSUihjZSk7CisJCWdvdG8gb3V0X3JwbTsKKwl9CisKKwlyZXQgPSBpbnRlbF9jb250ZXh0X3Bp bihjZSk7CisJaWYgKHJldCkKKwkJZ290byBvdXRfY29udGV4dDsKKwogCS8qIEZpcnN0IHNldCB0 aGUgZGVmYXVsdCBtYXNrLiAqLwotCXJldCA9IF9fc3NldV90ZXN0KGk5MTUsIG5hbWUsIGZsYWdz LCBjdHgsIGVuZ2luZSwgb2JqLCBkZWZhdWx0X3NzZXUpOworCXJldCA9IF9fc3NldV90ZXN0KGk5 MTUsIG5hbWUsIGZsYWdzLCBjZSwgb2JqLCBkZWZhdWx0X3NzZXUpOwogCWlmIChyZXQpCiAJCWdv dG8gb3V0X2ZhaWw7CiAKIAkvKiBUaGVuIHNldCBhIHBvd2VyLWdhdGVkIGNvbmZpZ3VyYXRpb24u ICovCi0JcmV0ID0gX19zc2V1X3Rlc3QoaTkxNSwgbmFtZSwgZmxhZ3MsIGN0eCwgZW5naW5lLCBv YmosIHBnX3NzZXUpOworCXJldCA9IF9fc3NldV90ZXN0KGk5MTUsIG5hbWUsIGZsYWdzLCBjZSwg b2JqLCBwZ19zc2V1KTsKIAlpZiAocmV0KQogCQlnb3RvIG91dF9mYWlsOwogCiAJLyogQmFjayB0 byBkZWZhdWx0cy4gKi8KLQlyZXQgPSBfX3NzZXVfdGVzdChpOTE1LCBuYW1lLCBmbGFncywgY3R4 LCBlbmdpbmUsIG9iaiwgZGVmYXVsdF9zc2V1KTsKKwlyZXQgPSBfX3NzZXVfdGVzdChpOTE1LCBu YW1lLCBmbGFncywgY2UsIG9iaiwgZGVmYXVsdF9zc2V1KTsKIAlpZiAocmV0KQogCQlnb3RvIG91 dF9mYWlsOwogCiAJLyogT25lIGxhc3QgcG93ZXItZ2F0ZWQgY29uZmlndXJhdGlvbiBmb3IgdGhl IHJvYWQuICovCi0JcmV0ID0gX19zc2V1X3Rlc3QoaTkxNSwgbmFtZSwgZmxhZ3MsIGN0eCwgZW5n aW5lLCBvYmosIHBnX3NzZXUpOworCXJldCA9IF9fc3NldV90ZXN0KGk5MTUsIG5hbWUsIGZsYWdz LCBjZSwgb2JqLCBwZ19zc2V1KTsKIAlpZiAocmV0KQogCQlnb3RvIG91dF9mYWlsOwogCkBAIC0x MTE3LDkgKzExMjgsMTIgQEAgX19pZ3RfY3R4X3NzZXUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg Kmk5MTUsCiAJaWYgKGlndF9mbHVzaF90ZXN0KGk5MTUsIEk5MTVfV0FJVF9MT0NLRUQpKQogCQly ZXQgPSAtRUlPOwogCi0JaTkxNV9nZW1fb2JqZWN0X3B1dChvYmopOwotCisJaW50ZWxfY29udGV4 dF91bnBpbihjZSk7CitvdXRfY29udGV4dDoKKwlpbnRlbF9jb250ZXh0X3B1dChjZSk7CitvdXRf cnBtOgogCWludGVsX3J1bnRpbWVfcG1fcHV0KGk5MTUsIHdha2VyZWYpOworCWk5MTVfZ2VtX29i amVjdF9wdXQob2JqKTsKIAogb3V0X3VubG9jazoKIAltdXRleF91bmxvY2soJmk5MTUtPmRybS5z dHJ1Y3RfbXV0ZXgpOwotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZng=