From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 28/38] drm/i915: Store the intel_context_ops in the intel_engine_cs Date: Fri, 1 Mar 2019 14:03:54 +0000 Message-ID: <20190301140404.26690-28-chris@chris-wilson.co.uk> References: <20190301140404.26690-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 7103A6E30B for ; Fri, 1 Mar 2019 14:04:48 +0000 (UTC) In-Reply-To: <20190301140404.26690-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 SWYgd2UgcGxhY2UgYSBwb2ludGVyIHRvIHRoZSBlbmdpbmUgc3BlY2lmaWMgaW50ZWxfY29udGV4 dF9vcHMgaW4gdGhlCmVuZ2luZSBpdHNlbGYsIHdlIGNhbiBhc3NpZ24gdGhlIG9wcyBwb2ludGVy IG9uIGluaXRpYWxpc2luZyB0aGUKY29udGV4dCwgYW5kIHRoZW4gcmVseSBvbiBpdCBiZWluZyBz ZXQuIFRoaXMgc2ltcGxpZmllcyB0aGUgY29kZSBpbgpsYXRlciBwYXRjaGVzLgoKU2lnbmVkLW9m Zi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fY29udGV4dC5jICAgICAgfCAgMSArCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfdHlwZXMuaCAgICB8ICAxICsKIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5jICAgICAgICAgICAgIHwgMTMgKysrKysrLS0tLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgICAgICB8IDIyICsrKysrKysrKy0tLS0t LS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvbW9ja19lbmdpbmUuYyB8IDEz ICsrKysrKy0tLS0tLQogNSBmaWxlcyBjaGFuZ2VkLCAyNCBpbnNlcnRpb25zKCspLCAyNiBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250 ZXh0LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKaW5kZXggZDA0 ZmE2NDliYzBlLi4wNGMyNGNhZjMwZDIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX2NvbnRleHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9j b250ZXh0LmMKQEAgLTM3Nyw2ICszNzcsNyBAQCBpbnRlbF9jb250ZXh0X2luaXQoc3RydWN0IGlu dGVsX2NvbnRleHQgKmNlLAogewogCWNlLT5nZW1fY29udGV4dCA9IGN0eDsKIAljZS0+ZW5naW5l ID0gZW5naW5lOworCWNlLT5vcHMgPSBlbmdpbmUtPmNvbnRleHQ7CiAKIAlJTklUX0xJU1RfSEVB RCgmY2UtPnNpZ25hbF9saW5rKTsKIAlJTklUX0xJU1RfSEVBRCgmY2UtPnNpZ25hbHMpOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX3R5cGVzLmggYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9lbmdpbmVfdHlwZXMuaAppbmRleCA1ZWM2ZTcyZDBmZmIu LjU0NmI3OTA4NzFhZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5n aW5lX3R5cGVzLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZW5naW5lX3R5cGVz LmgKQEAgLTM1MSw2ICszNTEsNyBAQCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzIHsKIAogCXZvaWQJ CSgqc2V0X2RlZmF1bHRfc3VibWlzc2lvbikoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l KTsKIAorCWNvbnN0IHN0cnVjdCBpbnRlbF9jb250ZXh0X29wcyAqY29udGV4dDsKIAlzdHJ1Y3Qg aW50ZWxfY29udGV4dCAqKCpjb250ZXh0X3Bpbikoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n aW5lLAogCQkJCQkgICAgIHN0cnVjdCBpOTE1X2dlbV9jb250ZXh0ICpjdHgpOwogCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2xyYy5jCmluZGV4IGEyMjEwZjc5ZGM2Ny4uNGY2ZjA5MTM3NjYyIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtMTM4MSwxMSArMTM4MSw2IEBAIF9fZXhlY2xpc3RzX2Nv bnRleHRfcGluKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKIAlyZXR1cm4gRVJSX1BU UihyZXQpOwogfQogCi1zdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2NvbnRleHRfb3BzIGV4ZWNs aXN0c19jb250ZXh0X29wcyA9IHsKLQkudW5waW4gPSBleGVjbGlzdHNfY29udGV4dF91bnBpbiwK LQkuZGVzdHJveSA9IGV4ZWNsaXN0c19jb250ZXh0X2Rlc3Ryb3ksCi19OwotCiBzdGF0aWMgc3Ry dWN0IGludGVsX2NvbnRleHQgKgogZXhlY2xpc3RzX2NvbnRleHRfcGluKHN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKmVuZ2luZSwKIAkJICAgICAgc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCkK QEAgLTEzOTksMTEgKzEzOTQsMTQgQEAgZXhlY2xpc3RzX2NvbnRleHRfcGluKHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZSwKIAkJcmV0dXJuIGNlOwogCUdFTV9CVUdfT04oIWNlLT5waW5f Y291bnQpOyAvKiBubyBvdmVyZmxvdyBwbGVhc2UhICovCiAKLQljZS0+b3BzID0gJmV4ZWNsaXN0 c19jb250ZXh0X29wczsKLQogCXJldHVybiBfX2V4ZWNsaXN0c19jb250ZXh0X3BpbihlbmdpbmUs IGN0eCwgY2UpOwogfQogCitzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2NvbnRleHRfb3BzIGV4 ZWNsaXN0c19jb250ZXh0X29wcyA9IHsKKwkudW5waW4gPSBleGVjbGlzdHNfY29udGV4dF91bnBp biwKKwkuZGVzdHJveSA9IGV4ZWNsaXN0c19jb250ZXh0X2Rlc3Ryb3ksCit9OworCiBzdGF0aWMg aW50IGdlbjhfZW1pdF9pbml0X2JyZWFkY3J1bWIoc3RydWN0IGk5MTVfcmVxdWVzdCAqcnEpCiB7 CiAJdTMyICpjczsKQEAgLTIzNDcsNiArMjM0NSw3IEBAIGxvZ2ljYWxfcmluZ19kZWZhdWx0X3Zm dW5jcyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJZW5naW5lLT5yZXNldC5yZXNl dCA9IGV4ZWNsaXN0c19yZXNldDsKIAllbmdpbmUtPnJlc2V0LmZpbmlzaCA9IGV4ZWNsaXN0c19y ZXNldF9maW5pc2g7CiAKKwllbmdpbmUtPmNvbnRleHQgPSAmZXhlY2xpc3RzX2NvbnRleHRfb3Bz OwogCWVuZ2luZS0+Y29udGV4dF9waW4gPSBleGVjbGlzdHNfY29udGV4dF9waW47CiAJZW5naW5l LT5yZXF1ZXN0X2FsbG9jID0gZXhlY2xpc3RzX3JlcXVlc3RfYWxsb2M7CiAKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwppbmRleCA3NjRkY2M1ZDU4NTYuLjg0OGI2OGUwOTBk NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpAQCAtMTM0OCw3ICsx MzQ4LDcgQEAgaW50ZWxfcmluZ19mcmVlKHN0cnVjdCBpbnRlbF9yaW5nICpyaW5nKQogCWtmcmVl KHJpbmcpOwogfQogCi1zdGF0aWMgdm9pZCBpbnRlbF9yaW5nX2NvbnRleHRfZGVzdHJveShzdHJ1 Y3QgaW50ZWxfY29udGV4dCAqY2UpCitzdGF0aWMgdm9pZCByaW5nX2NvbnRleHRfZGVzdHJveShz dHJ1Y3QgaW50ZWxfY29udGV4dCAqY2UpCiB7CiAJR0VNX0JVR19PTihjZS0+cGluX2NvdW50KTsK IApAQCAtMTQyNSw3ICsxNDI1LDcgQEAgc3RhdGljIHZvaWQgX19jb250ZXh0X3VucGluKHN0cnVj dCBpbnRlbF9jb250ZXh0ICpjZSkKIAlpOTE1X3ZtYV91bnBpbih2bWEpOwogfQogCi1zdGF0aWMg dm9pZCBpbnRlbF9yaW5nX2NvbnRleHRfdW5waW4oc3RydWN0IGludGVsX2NvbnRleHQgKmNlKQor c3RhdGljIHZvaWQgcmluZ19jb250ZXh0X3VucGluKHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjZSkK IHsKIAlfX2NvbnRleHRfdW5waW5fcHBndHQoY2UtPmdlbV9jb250ZXh0KTsKIAlfX2NvbnRleHRf dW5waW4oY2UpOwpAQCAtMTU0OCwxNCArMTU0OCw4IEBAIF9fcmluZ19jb250ZXh0X3BpbihzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJcmV0dXJuIEVSUl9QVFIoZXJyKTsKIH0KIAot c3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9jb250ZXh0X29wcyByaW5nX2NvbnRleHRfb3BzID0g ewotCS51bnBpbiA9IGludGVsX3JpbmdfY29udGV4dF91bnBpbiwKLQkuZGVzdHJveSA9IGludGVs X3JpbmdfY29udGV4dF9kZXN0cm95LAotfTsKLQogc3RhdGljIHN0cnVjdCBpbnRlbF9jb250ZXh0 ICoKLWludGVsX3JpbmdfY29udGV4dF9waW4oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l LAotCQkgICAgICAgc3RydWN0IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCkKK3JpbmdfY29udGV4dF9w aW4oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLCBzdHJ1Y3QgaTkxNV9nZW1fY29udGV4 dCAqY3R4KQogewogCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjZSA9IHRvX2ludGVsX2NvbnRleHQo Y3R4LCBlbmdpbmUpOwogCkBAIC0xNTY1LDExICsxNTU5LDE0IEBAIGludGVsX3JpbmdfY29udGV4 dF9waW4oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCQlyZXR1cm4gY2U7CiAJR0VN X0JVR19PTighY2UtPnBpbl9jb3VudCk7IC8qIG5vIG92ZXJmbG93IHBsZWFzZSEgKi8KIAotCWNl LT5vcHMgPSAmcmluZ19jb250ZXh0X29wczsKLQogCXJldHVybiBfX3JpbmdfY29udGV4dF9waW4o ZW5naW5lLCBjdHgsIGNlKTsKIH0KIAorc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9jb250ZXh0 X29wcyByaW5nX2NvbnRleHRfb3BzID0geworCS51bnBpbiA9IHJpbmdfY29udGV4dF91bnBpbiwK KwkuZGVzdHJveSA9IHJpbmdfY29udGV4dF9kZXN0cm95LAorfTsKKwogc3RhdGljIGludCBpbnRl bF9pbml0X3JpbmdfYnVmZmVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkKIHsKIAlz dHJ1Y3QgaTkxNV90aW1lbGluZSAqdGltZWxpbmU7CkBAIC0yMjc1LDcgKzIyNzIsOCBAQCBzdGF0 aWMgdm9pZCBpbnRlbF9yaW5nX2RlZmF1bHRfdmZ1bmNzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwKIAllbmdpbmUtPnJlc2V0LnJlc2V0ID0gcmVzZXRfcmluZzsKIAllbmdpbmUt PnJlc2V0LmZpbmlzaCA9IHJlc2V0X2ZpbmlzaDsKIAotCWVuZ2luZS0+Y29udGV4dF9waW4gPSBp bnRlbF9yaW5nX2NvbnRleHRfcGluOworCWVuZ2luZS0+Y29udGV4dCA9ICZyaW5nX2NvbnRleHRf b3BzOworCWVuZ2luZS0+Y29udGV4dF9waW4gPSByaW5nX2NvbnRleHRfcGluOwogCWVuZ2luZS0+ cmVxdWVzdF9hbGxvYyA9IHJpbmdfcmVxdWVzdF9hbGxvYzsKIAogCS8qCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvbW9ja19lbmdpbmUuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L3NlbGZ0ZXN0cy9tb2NrX2VuZ2luZS5jCmluZGV4IDgwMzJhOGE5NTQyZi4uNmMw OWU1MTYyZmViIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvbW9j a19lbmdpbmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvbW9ja19lbmdp bmUuYwpAQCAtMTM3LDExICsxMzcsNiBAQCBzdGF0aWMgdm9pZCBtb2NrX2NvbnRleHRfZGVzdHJv eShzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY2UpCiAJCW1vY2tfcmluZ19mcmVlKGNlLT5yaW5nKTsK IH0KIAotc3RhdGljIGNvbnN0IHN0cnVjdCBpbnRlbF9jb250ZXh0X29wcyBtb2NrX2NvbnRleHRf b3BzID0gewotCS51bnBpbiA9IG1vY2tfY29udGV4dF91bnBpbiwKLQkuZGVzdHJveSA9IG1vY2tf Y29udGV4dF9kZXN0cm95LAotfTsKLQogc3RhdGljIHN0cnVjdCBpbnRlbF9jb250ZXh0ICoKIG1v Y2tfY29udGV4dF9waW4oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCQkgc3RydWN0 IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCkKQEAgLTE2MCw4ICsxNTUsNiBAQCBtb2NrX2NvbnRleHRf cGluKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSwKIAogCW1vY2tfdGltZWxpbmVfcGlu KGNlLT5yaW5nLT50aW1lbGluZSk7CiAKLQljZS0+b3BzID0gJm1vY2tfY29udGV4dF9vcHM7Ci0K IAltdXRleF9sb2NrKCZjdHgtPm11dGV4KTsKIAlsaXN0X2FkZCgmY2UtPmFjdGl2ZV9saW5rLCAm Y3R4LT5hY3RpdmVfZW5naW5lcyk7CiAJbXV0ZXhfdW5sb2NrKCZjdHgtPm11dGV4KTsKQEAgLTE3 NCw2ICsxNjcsMTEgQEAgbW9ja19jb250ZXh0X3BpbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpl bmdpbmUsCiAJcmV0dXJuIEVSUl9QVFIoZXJyKTsKIH0KIAorc3RhdGljIGNvbnN0IHN0cnVjdCBp bnRlbF9jb250ZXh0X29wcyBtb2NrX2NvbnRleHRfb3BzID0geworCS51bnBpbiA9IG1vY2tfY29u dGV4dF91bnBpbiwKKwkuZGVzdHJveSA9IG1vY2tfY29udGV4dF9kZXN0cm95LAorfTsKKwogc3Rh dGljIGludCBtb2NrX3JlcXVlc3RfYWxsb2Moc3RydWN0IGk5MTVfcmVxdWVzdCAqcmVxdWVzdCkK IHsKIAlJTklUX0xJU1RfSEVBRCgmcmVxdWVzdC0+bW9jay5saW5rKTsKQEAgLTIzMiw2ICsyMzAs NyBAQCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICptb2NrX2VuZ2luZShzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqaTkxNSwKIAllbmdpbmUtPmJhc2UubWFzayA9IEJJVChpZCk7CiAJZW5naW5lLT5i YXNlLnN0YXR1c19wYWdlLmFkZHIgPSAodm9pZCAqKShlbmdpbmUgKyAxKTsKIAorCWVuZ2luZS0+ YmFzZS5jb250ZXh0ID0gJm1vY2tfY29udGV4dF9vcHM7CiAJZW5naW5lLT5iYXNlLmNvbnRleHRf cGluID0gbW9ja19jb250ZXh0X3BpbjsKIAllbmdpbmUtPmJhc2UucmVxdWVzdF9hbGxvYyA9IG1v Y2tfcmVxdWVzdF9hbGxvYzsKIAllbmdpbmUtPmJhc2UuZW1pdF9mbHVzaCA9IG1vY2tfZW1pdF9m bHVzaDsKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4