From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: [PATCH 06/39] drm/i915: Switch to use HWS indices rather than addresses Date: Wed, 13 Mar 2019 14:43:28 +0000 Message-ID: <20190313144401.17735-6-chris@chris-wilson.co.uk> References: <20190313144401.17735-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 320DD6E0FA for ; Wed, 13 Mar 2019 14:45:09 +0000 (UTC) In-Reply-To: <20190313144401.17735-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 SWYgd2UgdXNlIHRoZSBTVE9SRV9EQVRBX0lOREVYIGZ1bmN0aW9uIHdlIGNhbiB1c2UgYSBmaXhl ZCBvZmZzZXQgYW5kCmF2b2lkIGhhdmluZyB0byBsb29rdXAgdXAgdGhlIGVuZ2luZSBIV1MgYWRk cmVzcy4gQSBzdGVwIGNsb3NlciB0byBiZWluZwphYmxlIHRvIGVtaXQgdGhlIGZpbmFsIGJyZWFk Y3J1bWIgZHVyaW5nIHJlcXVlc3RfYWRkIHJhdGhlciB0aGFuIGxhdGVyCmluIHRoZSBzdWJtaXNz aW9uIGludGVycnVwdCBoYW5kbGVyLgoKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJp c0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3Vj X3N1Ym1pc3Npb24uYyB8ICAzICsrLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMg ICAgICAgICAgICB8IDE3ICsrKysrKystLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9yaW5nYnVmZmVyLmMgICAgIHwgMTYgKysrKysrLS0tLS0tLS0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oICAgICB8ICA0ICsrLS0KIDQgZmlsZXMgY2hhbmdl ZCwgMTcgaW5zZXJ0aW9ucygrKSwgMjMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX3N1Ym1pc3Npb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2d1Y19zdWJtaXNzaW9uLmMKaW5kZXggNGE1NzI3MjMzNDE5Li5jNGFkNzM5ODA5 ODggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19zdWJtaXNzaW9u LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX3N1Ym1pc3Npb24uYwpAQCAt NTgzLDcgKzU4Myw4IEBAIHN0YXRpYyB2b2lkIGluamVjdF9wcmVlbXB0X2NvbnRleHQoc3RydWN0 IHdvcmtfc3RydWN0ICp3b3JrKQogCQl9IGVsc2UgewogCQkJY3MgPSBnZW44X2VtaXRfZ2d0dF93 cml0ZShjcywKIAkJCQkJCSAgR1VDX1BSRUVNUFRfRklOSVNIRUQsCi0JCQkJCQkgIGFkZHIpOwor CQkJCQkJICBhZGRyLAorCQkJCQkJICAwKTsKIAkJCSpjcysrID0gTUlfTk9PUDsKIAkJCSpjcysr ID0gTUlfTk9PUDsKIAkJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf bHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCA0NGU3NWJjNTIw YzEuLjU2Njk4MjNmNjkwMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf bHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTE3MywxMiAr MTczLDYgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX2luaXRfcmVnX3N0YXRlKHUzMiAqcmVnX3N0 YXRlLAogCQkJCSAgICAgc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCQkJCSAgICAg c3RydWN0IGludGVsX3JpbmcgKnJpbmcpOwogCi1zdGF0aWMgaW5saW5lIHUzMiBpbnRlbF9od3Nf aGFuZ2NoZWNrX2FkZHJlc3Moc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQotewotCXJl dHVybiAoaTkxNV9nZ3R0X29mZnNldChlbmdpbmUtPnN0YXR1c19wYWdlLnZtYSkgKwotCQlJOTE1 X0dFTV9IV1NfSEFOR0NIRUNLX0FERFIpOwotfQotCiBzdGF0aWMgaW5saW5lIHN0cnVjdCBpOTE1 X3ByaW9saXN0ICp0b19wcmlvbGlzdChzdHJ1Y3QgcmJfbm9kZSAqcmIpCiB7CiAJcmV0dXJuIHJi X2VudHJ5KHJiLCBzdHJ1Y3QgaTkxNV9wcmlvbGlzdCwgbm9kZSk7CkBAIC0yMjEyLDExICsyMjA2 LDE0IEBAIHN0YXRpYyB1MzIgKmdlbjhfZW1pdF9maW5pX2JyZWFkY3J1bWIoc3RydWN0IGk5MTVf cmVxdWVzdCAqcmVxdWVzdCwgdTMyICpjcykKIHsKIAljcyA9IGdlbjhfZW1pdF9nZ3R0X3dyaXRl KGNzLAogCQkJCSAgcmVxdWVzdC0+ZmVuY2Uuc2Vxbm8sCi0JCQkJICByZXF1ZXN0LT50aW1lbGlu ZS0+aHdzcF9vZmZzZXQpOworCQkJCSAgcmVxdWVzdC0+dGltZWxpbmUtPmh3c3Bfb2Zmc2V0LAor CQkJCSAgMCk7CiAKIAljcyA9IGdlbjhfZW1pdF9nZ3R0X3dyaXRlKGNzLAogCQkJCSAgaW50ZWxf ZW5naW5lX25leHRfaGFuZ2NoZWNrX3NlcW5vKHJlcXVlc3QtPmVuZ2luZSksCi0JCQkJICBpbnRl bF9od3NfaGFuZ2NoZWNrX2FkZHJlc3MocmVxdWVzdC0+ZW5naW5lKSk7CisJCQkJICBJOTE1X0dF TV9IV1NfSEFOR0NIRUNLX0FERFIsCisJCQkJICBNSV9GTFVTSF9EV19TVE9SRV9JTkRFWCk7CisK IAogCSpjcysrID0gTUlfVVNFUl9JTlRFUlJVUFQ7CiAJKmNzKysgPSBNSV9BUkJfT05fT0ZGIHwg TUlfQVJCX0VOQUJMRTsKQEAgLTIyNDAsOCArMjIzNyw4IEBAIHN0YXRpYyB1MzIgKmdlbjhfZW1p dF9maW5pX2JyZWFkY3J1bWJfcmNzKHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJlcXVlc3QsIHUzMiAq Y3MpCiAKIAljcyA9IGdlbjhfZW1pdF9nZ3R0X3dyaXRlX3JjcyhjcywKIAkJCQkgICAgICBpbnRl bF9lbmdpbmVfbmV4dF9oYW5nY2hlY2tfc2Vxbm8ocmVxdWVzdC0+ZW5naW5lKSwKLQkJCQkgICAg ICBpbnRlbF9od3NfaGFuZ2NoZWNrX2FkZHJlc3MocmVxdWVzdC0+ZW5naW5lKSwKLQkJCQkgICAg ICAwKTsKKwkJCQkgICAgICBJOTE1X0dFTV9IV1NfSEFOR0NIRUNLX0FERFIsCisJCQkJICAgICAg UElQRV9DT05UUk9MX1NUT1JFX0RBVEFfSU5ERVgpOwogCiAJKmNzKysgPSBNSV9VU0VSX0lOVEVS UlVQVDsKIAkqY3MrKyA9IE1JX0FSQl9PTl9PRkYgfCBNSV9BUkJfRU5BQkxFOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCmluZGV4IGEwMjFjOTU0NTY0OS4uOWU3YWQxN2I1 MjUwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCkBAIC00MywxMiAr NDMsNiBAQAogICovCiAjZGVmaW5lIExFR0FDWV9SRVFVRVNUX1NJWkUgMjAwCiAKLXN0YXRpYyBp bmxpbmUgdTMyIGh3c19oYW5nY2hlY2tfYWRkcmVzcyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpl bmdpbmUpCi17Ci0JcmV0dXJuIChpOTE1X2dndHRfb2Zmc2V0KGVuZ2luZS0+c3RhdHVzX3BhZ2Uu dm1hKSArCi0JCUk5MTVfR0VNX0hXU19IQU5HQ0hFQ0tfQUREUik7Ci19Ci0KIHVuc2lnbmVkIGlu dCBpbnRlbF9yaW5nX3VwZGF0ZV9zcGFjZShzdHJ1Y3QgaW50ZWxfcmluZyAqcmluZykKIHsKIAl1 bnNpZ25lZCBpbnQgc3BhY2U7CkBAIC0zMTcsOCArMzExLDggQEAgc3RhdGljIHUzMiAqZ2VuNl9y Y3NfZW1pdF9icmVhZGNydW1iKHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJxLCB1MzIgKmNzKQogCSpj cysrID0gcnEtPmZlbmNlLnNlcW5vOwogCiAJKmNzKysgPSBHRlhfT1BfUElQRV9DT05UUk9MKDQp OwotCSpjcysrID0gUElQRV9DT05UUk9MX1FXX1dSSVRFOwotCSpjcysrID0gaHdzX2hhbmdjaGVj a19hZGRyZXNzKHJxLT5lbmdpbmUpIHwgUElQRV9DT05UUk9MX0dMT0JBTF9HVFQ7CisJKmNzKysg PSBQSVBFX0NPTlRST0xfUVdfV1JJVEUgfCBQSVBFX0NPTlRST0xfU1RPUkVfREFUQV9JTkRFWDsK KwkqY3MrKyA9IEk5MTVfR0VNX0hXU19IQU5HQ0hFQ0tfQUREUiB8IFBJUEVfQ09OVFJPTF9HTE9C QUxfR1RUOwogCSpjcysrID0gaW50ZWxfZW5naW5lX25leHRfaGFuZ2NoZWNrX3NlcW5vKHJxLT5l bmdpbmUpOwogCiAJKmNzKysgPSBNSV9VU0VSX0lOVEVSUlVQVDsKQEAgLTQyMyw4ICs0MTcsMTAg QEAgc3RhdGljIHUzMiAqZ2VuN19yY3NfZW1pdF9icmVhZGNydW1iKHN0cnVjdCBpOTE1X3JlcXVl c3QgKnJxLCB1MzIgKmNzKQogCSpjcysrID0gcnEtPmZlbmNlLnNlcW5vOwogCiAJKmNzKysgPSBH RlhfT1BfUElQRV9DT05UUk9MKDQpOwotCSpjcysrID0gUElQRV9DT05UUk9MX1FXX1dSSVRFIHwg UElQRV9DT05UUk9MX0dMT0JBTF9HVFRfSVZCOwotCSpjcysrID0gaHdzX2hhbmdjaGVja19hZGRy ZXNzKHJxLT5lbmdpbmUpOworCSpjcysrID0gKFBJUEVfQ09OVFJPTF9RV19XUklURSB8CisJCSBQ SVBFX0NPTlRST0xfU1RPUkVfREFUQV9JTkRFWCB8CisJCSBQSVBFX0NPTlRST0xfR0xPQkFMX0dU VF9JVkIpOworCSpjcysrID0gSTkxNV9HRU1fSFdTX0hBTkdDSEVDS19BRERSOwogCSpjcysrID0g aW50ZWxfZW5naW5lX25leHRfaGFuZ2NoZWNrX3NlcW5vKHJxLT5lbmdpbmUpOwogCiAJKmNzKysg PSBNSV9VU0VSX0lOVEVSUlVQVDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3JpbmdidWZmZXIuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIu aAppbmRleCBhNTc0ODlmY2IzMDIuLmEwMmM5MmRhYzVkYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3JpbmdidWZmZXIuaApAQCAtNDE5LDE0ICs0MTksMTQgQEAgZ2VuOF9lbWl0X2dndHRf d3JpdGVfcmNzKHUzMiAqY3MsIHUzMiB2YWx1ZSwgdTMyIGd0dF9vZmZzZXQsIHUzMiBmbGFncykK IH0KIAogc3RhdGljIGlubGluZSB1MzIgKgotZ2VuOF9lbWl0X2dndHRfd3JpdGUodTMyICpjcywg dTMyIHZhbHVlLCB1MzIgZ3R0X29mZnNldCkKK2dlbjhfZW1pdF9nZ3R0X3dyaXRlKHUzMiAqY3Ms IHUzMiB2YWx1ZSwgdTMyIGd0dF9vZmZzZXQsIHUzMiBmbGFncykKIHsKIAkvKiB3L2E6IGJpdCA1 IG5lZWRzIHRvIGJlIHplcm8gZm9yIE1JX0ZMVVNIX0RXIGFkZHJlc3MuICovCiAJR0VNX0JVR19P TihndHRfb2Zmc2V0ICYgKDEgPDwgNSkpOwogCS8qIE9mZnNldCBzaG91bGQgYmUgYWxpZ25lZCB0 byA4IGJ5dGVzIGZvciBib3RoIChRVy9EVykgd3JpdGUgdHlwZXMgKi8KIAlHRU1fQlVHX09OKCFJ U19BTElHTkVEKGd0dF9vZmZzZXQsIDgpKTsKIAotCSpjcysrID0gKE1JX0ZMVVNIX0RXICsgMSkg fCBNSV9GTFVTSF9EV19PUF9TVE9SRURXOworCSpjcysrID0gKE1JX0ZMVVNIX0RXICsgMSkgfCBN SV9GTFVTSF9EV19PUF9TVE9SRURXIHwgZmxhZ3M7CiAJKmNzKysgPSBndHRfb2Zmc2V0IHwgTUlf RkxVU0hfRFdfVVNFX0dUVDsKIAkqY3MrKyA9IDA7CiAJKmNzKysgPSB2YWx1ZTsKLS0gCjIuMjAu MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4