From: Thierry Reding Subject: [PATCH 1/4] drm/nouveau: Fix fallout from reservation object rework Date: Mon, 16 Sep 2019 16:19:23 +0200 Message-ID: <20190916141926.8594-2-thierry.reding@gmail.com> References: <20190916141926.8594-1-thierry.reding@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190916141926.8594-1-thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: Ben Skeggs Cc: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KCkNvbW1pdCAwMTljYmQ0 YTRmZWIgKCJkcm0vbm91dmVhdTogSW5pdGlhbGl6ZSBHRU0gb2JqZWN0IGJlZm9yZSBUVE0Kb2Jq ZWN0IikgaW50cm9kdWNlZCBhIHN1YnRsZSBjaGFuZ2UgaW4gaG93IHRoZSBidWZmZXIgYWxsb2Nh dGlvbiBzaXplIGlzCmhhbmRsZWQuIFByaW9yIHRvIHRoYXQgY2hhbmdlLCB0aGUgc2l6ZSB3b3Vs ZCBnZXQgYWxpZ25lZCB0byBhdCBsZWFzdCBhCnBhZ2UsIHdoZXJlYXMgYWZ0ZXIgdGhhdCBjaGFu Z2UgYSBub24tcGFnZS1hbGlnbmVkIHNpemUgd291bGQgZ2V0IHBhc3NlZAp0aHJvdWdoIHVubW9k aWZpZWQuIFRoaXMgdWx0aW1hdGVseSBjYXVzZXMgYSBCVUdfT04oKSB0byB0cmlnZ2VyIGluCmRy bV9nZW1fcHJpdmF0ZV9vYmplY3RfaW5pdCgpIGFuZCBjcmFzaGVzIHRoZSBzeXN0ZW0uCgpGaXgg dGhpcyBieSByZXN0b3JpbmcgdGhlIGNvZGUgdGhhdCBhbGlnbiB0aGUgYWxsb2NhdGlvbiBzaXpl LgoKRml4ZXM6IDAxOWNiZDRhNGZlYiAoImRybS9ub3V2ZWF1OiBJbml0aWFsaXplIEdFTSBvYmpl Y3QgYmVmb3JlIFRUTSBvYmplY3QiKQpSZXBvcnRlZC1ieTogSWxpYSBNaXJraW4gPGltaXJraW5A YWx1bS5taXQuZWR1PgpTaWduZWQtb2ZmLWJ5OiBUaGllcnJ5IFJlZGluZyA8dHJlZGluZ0Budmlk aWEuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfYm8uYyAgICB8IDE2 ICsrKysrKysrKy0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfYm8uaCAg ICB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfZ2VtLmMgICB8ICAz ICsrLQogZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV9wcmltZS5jIHwgIDcgKysrKy0t LQogNCBmaWxlcyBjaGFuZ2VkLCAxNyBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2JvLmMgYi9kcml2ZXJz L2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2JvLmMKaW5kZXggZTkxOGI0MzdhZjE3Li5lNzgwM2Rj YTMyYzUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfYm8uYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2JvLmMKQEAgLTE4Niw4ICsxODYs OCBAQCBub3V2ZWF1X2JvX2ZpeHVwX2FsaWduKHN0cnVjdCBub3V2ZWF1X2JvICpudmJvLCB1MzIg ZmxhZ3MsCiB9CiAKIHN0cnVjdCBub3V2ZWF1X2JvICoKLW5vdXZlYXVfYm9fYWxsb2Moc3RydWN0 IG5vdXZlYXVfY2xpICpjbGksIHU2NCBzaXplLCB1MzIgZmxhZ3MsIHUzMiB0aWxlX21vZGUsCi0J CSB1MzIgdGlsZV9mbGFncykKK25vdXZlYXVfYm9fYWxsb2Moc3RydWN0IG5vdXZlYXVfY2xpICpj bGksIHU2NCAqc2l6ZSwgaW50ICphbGlnbiwgdTMyIGZsYWdzLAorCQkgdTMyIHRpbGVfbW9kZSwg dTMyIHRpbGVfZmxhZ3MpCiB7CiAJc3RydWN0IG5vdXZlYXVfZHJtICpkcm0gPSBjbGktPmRybTsK IAlzdHJ1Y3Qgbm91dmVhdV9ibyAqbnZibzsKQEAgLTE5NSw4ICsxOTUsOCBAQCBub3V2ZWF1X2Jv X2FsbG9jKHN0cnVjdCBub3V2ZWF1X2NsaSAqY2xpLCB1NjQgc2l6ZSwgdTMyIGZsYWdzLCB1MzIg dGlsZV9tb2RlLAogCXN0cnVjdCBudmlmX3ZtbSAqdm1tID0gY2xpLT5zdm0uY2xpID8gJmNsaS0+ c3ZtLnZtbSA6ICZjbGktPnZtbS52bW07CiAJaW50IGksIHBpID0gLTE7CiAKLQlpZiAoIXNpemUp IHsKLQkJTlZfV0FSTihkcm0sICJza2lwcGVkIHNpemUgJTAxNmxseFxuIiwgc2l6ZSk7CisJaWYg KCEqc2l6ZSkgeworCQlOVl9XQVJOKGRybSwgInNraXBwZWQgc2l6ZSAlMDE2bGx4XG4iLCAqc2l6 ZSk7CiAJCXJldHVybiBFUlJfUFRSKC1FSU5WQUwpOwogCX0KIApAQCAtMjY2LDcgKzI2Niw3IEBA IG5vdXZlYXVfYm9fYWxsb2Moc3RydWN0IG5vdXZlYXVfY2xpICpjbGksIHU2NCBzaXplLCB1MzIg ZmxhZ3MsIHUzMiB0aWxlX21vZGUsCiAJCQlwaSA9IGk7CiAKIAkJLyogU3RvcCBvbmNlIHRoZSBi dWZmZXIgaXMgbGFyZ2VyIHRoYW4gdGhlIGN1cnJlbnQgcGFnZSBzaXplLiAqLwotCQlpZiAoc2l6 ZSA+PSAxVUxMIDw8IHZtbS0+cGFnZVtpXS5zaGlmdCkKKwkJaWYgKCpzaXplID49IDFVTEwgPDwg dm1tLT5wYWdlW2ldLnNoaWZ0KQogCQkJYnJlYWs7CiAJfQogCkBAIC0yODEsNiArMjgxLDggQEAg bm91dmVhdV9ib19hbGxvYyhzdHJ1Y3Qgbm91dmVhdV9jbGkgKmNsaSwgdTY0IHNpemUsIHUzMiBm bGFncywgdTMyIHRpbGVfbW9kZSwKIAl9CiAJbnZiby0+cGFnZSA9IHZtbS0+cGFnZVtwaV0uc2hp ZnQ7CiAKKwlub3V2ZWF1X2JvX2ZpeHVwX2FsaWduKG52Ym8sIGZsYWdzLCBhbGlnbiwgc2l6ZSk7 CisKIAlyZXR1cm4gbnZibzsKIH0KIApAQCAtMjk0LDcgKzI5Niw2IEBAIG5vdXZlYXVfYm9faW5p dChzdHJ1Y3Qgbm91dmVhdV9ibyAqbnZibywgdTY0IHNpemUsIGludCBhbGlnbiwgdTMyIGZsYWdz LAogCiAJYWNjX3NpemUgPSB0dG1fYm9fZG1hX2FjY19zaXplKG52Ym8tPmJvLmJkZXYsIHNpemUs IHNpemVvZigqbnZibykpOwogCi0Jbm91dmVhdV9ib19maXh1cF9hbGlnbihudmJvLCBmbGFncywg JmFsaWduLCAmc2l6ZSk7CiAJbnZiby0+Ym8ubWVtLm51bV9wYWdlcyA9IHNpemUgPj4gUEFHRV9T SElGVDsKIAlub3V2ZWF1X2JvX3BsYWNlbWVudF9zZXQobnZibywgZmxhZ3MsIDApOwogCkBAIC0z MTgsNyArMzE5LDggQEAgbm91dmVhdV9ib19uZXcoc3RydWN0IG5vdXZlYXVfY2xpICpjbGksIHU2 NCBzaXplLCBpbnQgYWxpZ24sCiAJc3RydWN0IG5vdXZlYXVfYm8gKm52Ym87CiAJaW50IHJldDsK IAotCW52Ym8gPSBub3V2ZWF1X2JvX2FsbG9jKGNsaSwgc2l6ZSwgZmxhZ3MsIHRpbGVfbW9kZSwg dGlsZV9mbGFncyk7CisJbnZibyA9IG5vdXZlYXVfYm9fYWxsb2MoY2xpLCAmc2l6ZSwgJmFsaWdu LCBmbGFncywgdGlsZV9tb2RlLAorCQkJCXRpbGVfZmxhZ3MpOwogCWlmIChJU19FUlIobnZibykp CiAJCXJldHVybiBQVFJfRVJSKG52Ym8pOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v bm91dmVhdS9ub3V2ZWF1X2JvLmggYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2Jv LmgKaW5kZXggNjI5MzBkODM0ZmJhLi4zOGY5ZDgzNTA5NjMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfYm8uaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVh dS9ub3V2ZWF1X2JvLmgKQEAgLTcxLDggKzcxLDggQEAgbm91dmVhdV9ib19yZWYoc3RydWN0IG5v dXZlYXVfYm8gKnJlZiwgc3RydWN0IG5vdXZlYXVfYm8gKipwbnZibykKIGV4dGVybiBzdHJ1Y3Qg dHRtX2JvX2RyaXZlciBub3V2ZWF1X2JvX2RyaXZlcjsKIAogdm9pZCBub3V2ZWF1X2JvX21vdmVf aW5pdChzdHJ1Y3Qgbm91dmVhdV9kcm0gKik7Ci1zdHJ1Y3Qgbm91dmVhdV9ibyAqbm91dmVhdV9i b19hbGxvYyhzdHJ1Y3Qgbm91dmVhdV9jbGkgKiwgdTY0IHNpemUsIHUzMiBmbGFncywKLQkJCQkg ICAgdTMyIHRpbGVfbW9kZSwgdTMyIHRpbGVfZmxhZ3MpOworc3RydWN0IG5vdXZlYXVfYm8gKm5v dXZlYXVfYm9fYWxsb2Moc3RydWN0IG5vdXZlYXVfY2xpICosIHU2NCAqc2l6ZSwgaW50ICphbGln biwKKwkJCQkgICAgdTMyIGZsYWdzLCB1MzIgdGlsZV9tb2RlLCB1MzIgdGlsZV9mbGFncyk7CiBp bnQgIG5vdXZlYXVfYm9faW5pdChzdHJ1Y3Qgbm91dmVhdV9ibyAqLCB1NjQgc2l6ZSwgaW50IGFs aWduLCB1MzIgZmxhZ3MsCiAJCSAgICAgc3RydWN0IHNnX3RhYmxlICpzZywgc3RydWN0IGRtYV9y ZXN2ICpyb2JqKTsKIGludCAgbm91dmVhdV9ib19uZXcoc3RydWN0IG5vdXZlYXVfY2xpICosIHU2 NCBzaXplLCBpbnQgYWxpZ24sIHUzMiBmbGFncywKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9ub3V2ZWF1L25vdXZlYXVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1 X2dlbS5jCmluZGV4IGMyYmZjMDU5MTkwOS4uMWJkZmZkNzE0NDU2IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9u b3V2ZWF1L25vdXZlYXVfZ2VtLmMKQEAgLTE4OCw3ICsxODgsOCBAQCBub3V2ZWF1X2dlbV9uZXco c3RydWN0IG5vdXZlYXVfY2xpICpjbGksIHU2NCBzaXplLCBpbnQgYWxpZ24sIHVpbnQzMl90IGRv bWFpbiwKIAlpZiAoZG9tYWluICYgTk9VVkVBVV9HRU1fRE9NQUlOX0NPSEVSRU5UKQogCQlmbGFn cyB8PSBUVE1fUExfRkxBR19VTkNBQ0hFRDsKIAotCW52Ym8gPSBub3V2ZWF1X2JvX2FsbG9jKGNs aSwgc2l6ZSwgZmxhZ3MsIHRpbGVfbW9kZSwgdGlsZV9mbGFncyk7CisJbnZibyA9IG5vdXZlYXVf Ym9fYWxsb2MoY2xpLCAmc2l6ZSwgJmFsaWduLCBmbGFncywgdGlsZV9tb2RlLAorCQkJCXRpbGVf ZmxhZ3MpOwogCWlmIChJU19FUlIobnZibykpCiAJCXJldHVybiBQVFJfRVJSKG52Ym8pOwogCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X3ByaW1lLmMgYi9kcml2 ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X3ByaW1lLmMKaW5kZXggODQ2NThkNDM0MjI1Li42 NTZjMzM0ZWU3ZDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVf cHJpbWUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X3ByaW1lLmMKQEAg LTYyLDE0ICs2MiwxNSBAQCBzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm5vdXZlYXVfZ2VtX3ByaW1l X2ltcG9ydF9zZ190YWJsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCXN0cnVjdCBub3V2ZWF1 X2RybSAqZHJtID0gbm91dmVhdV9kcm0oZGV2KTsKIAlzdHJ1Y3Qgbm91dmVhdV9ibyAqbnZibzsK IAlzdHJ1Y3QgZG1hX3Jlc3YgKnJvYmogPSBhdHRhY2gtPmRtYWJ1Zi0+cmVzdjsKLQlzaXplX3Qg c2l6ZSA9IGF0dGFjaC0+ZG1hYnVmLT5zaXplOworCXU2NCBzaXplID0gYXR0YWNoLT5kbWFidWYt PnNpemU7CiAJdTMyIGZsYWdzID0gMDsKKwlpbnQgYWxpZ24gPSAwOwogCWludCByZXQ7CiAKIAlm bGFncyA9IFRUTV9QTF9GTEFHX1RUOwogCiAJZG1hX3Jlc3ZfbG9jayhyb2JqLCBOVUxMKTsKLQlu dmJvID0gbm91dmVhdV9ib19hbGxvYygmZHJtLT5jbGllbnQsIHNpemUsIGZsYWdzLCAwLCAwKTsK KwludmJvID0gbm91dmVhdV9ib19hbGxvYygmZHJtLT5jbGllbnQsICZzaXplLCAmYWxpZ24sIGZs YWdzLCAwLCAwKTsKIAlkbWFfcmVzdl91bmxvY2socm9iaik7CiAJaWYgKElTX0VSUihudmJvKSkK IAkJcmV0dXJuIEVSUl9DQVNUKG52Ym8pOwpAQCAtODQsNyArODUsNyBAQCBzdHJ1Y3QgZHJtX2dl bV9vYmplY3QgKm5vdXZlYXVfZ2VtX3ByaW1lX2ltcG9ydF9zZ190YWJsZShzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAogCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKIAl9CiAKLQlyZXQgPSBub3V2 ZWF1X2JvX2luaXQobnZibywgc2l6ZSwgMCwgZmxhZ3MsIHNnLCByb2JqKTsKKwlyZXQgPSBub3V2 ZWF1X2JvX2luaXQobnZibywgc2l6ZSwgYWxpZ24sIGZsYWdzLCBzZywgcm9iaik7CiAJaWYgKHJl dCkgewogCQlub3V2ZWF1X2JvX3JlZihOVUxMLCAmbnZibyk7CiAJCXJldHVybiBFUlJfUFRSKHJl dCk7Ci0tIAoyLjIzLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCk5vdXZlYXUgbWFpbGluZyBsaXN0Ck5vdXZlYXVAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vbm91dmVhdQ==