From: Thierry Reding Subject: [PATCH 2/4] drm/nouveau: prime: Extend DMA reservation object lock Date: Mon, 16 Sep 2019 16:19:24 +0200 Message-ID: <20190916141926.8594-3-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@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Ben Skeggs Cc: nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KClByaW9yIHRvIGNvbW1p dCAwMTljYmQ0YTRmZWIgKCJkcm0vbm91dmVhdTogSW5pdGlhbGl6ZSBHRU0gb2JqZWN0IGJlZm9y ZQpUVE0gb2JqZWN0IiksIHRoZSByZXNlcnZhdGlvbiBvYmplY3Qgd2FzIGxvY2tlZCBhY3Jvc3Mg YWxsIG9mIHRoZSBidWZmZXIKb2JqZWN0IGNyZWF0aW9uLgoKQWZ0ZXIgc3BsaXR0aW5nIG5vdXZl YXVfYm9fbmV3KCkgaW50byBzZXBhcmF0ZSBub3V2ZWF1X2JvX2FsbG9jKCkgYW5kCm5vdXZlYXVf Ym9faW5pdCgpIGZ1bmN0aW9ucywgdGhlIHJlc2VydmF0aW9uIG9iamVjdCBpcyBwYXNzZWQgdG8g dGhlCmxhdHRlciwgc28gdGhlIGxvY2sgbmVlZHMgdG8gYmUgaGVsZCBhY3Jvc3MgdGhhdCBmdW5j dGlvbiBhcyB3ZWxsLgoKRml4ZXM6IDAxOWNiZDRhNGZlYiAoImRybS9ub3V2ZWF1OiBJbml0aWFs aXplIEdFTSBvYmplY3QgYmVmb3JlIFRUTSBvYmplY3QiKQpTaWduZWQtb2ZmLWJ5OiBUaGllcnJ5 IFJlZGluZyA8dHJlZGluZ0BudmlkaWEuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1 L25vdXZlYXVfcHJpbWUuYyB8IDIwICsrKysrKysrKysrKysrLS0tLS0tCiAxIGZpbGUgY2hhbmdl ZCwgMTQgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X3ByaW1lLmMgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVh dS9ub3V2ZWF1X3ByaW1lLmMKaW5kZXggNjU2YzMzNGVlN2Q5Li5iYWU2YTNlY2NlZTAgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfcHJpbWUuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X3ByaW1lLmMKQEAgLTYwLDYgKzYwLDcgQEAgc3Ry dWN0IGRybV9nZW1fb2JqZWN0ICpub3V2ZWF1X2dlbV9wcmltZV9pbXBvcnRfc2dfdGFibGUoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQkJCQkgc3RydWN0IHNnX3RhYmxlICpzZykKIHsKIAlz dHJ1Y3Qgbm91dmVhdV9kcm0gKmRybSA9IG5vdXZlYXVfZHJtKGRldik7CisJc3RydWN0IGRybV9n ZW1fb2JqZWN0ICpvYmo7CiAJc3RydWN0IG5vdXZlYXVfYm8gKm52Ym87CiAJc3RydWN0IGRtYV9y ZXN2ICpyb2JqID0gYXR0YWNoLT5kbWFidWYtPnJlc3Y7CiAJdTY0IHNpemUgPSBhdHRhY2gtPmRt YWJ1Zi0+c2l6ZTsKQEAgLTcxLDkgKzcyLDEwIEBAIHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqbm91 dmVhdV9nZW1fcHJpbWVfaW1wb3J0X3NnX3RhYmxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAK IAlkbWFfcmVzdl9sb2NrKHJvYmosIE5VTEwpOwogCW52Ym8gPSBub3V2ZWF1X2JvX2FsbG9jKCZk cm0tPmNsaWVudCwgJnNpemUsICZhbGlnbiwgZmxhZ3MsIDAsIDApOwotCWRtYV9yZXN2X3VubG9j ayhyb2JqKTsKLQlpZiAoSVNfRVJSKG52Ym8pKQotCQlyZXR1cm4gRVJSX0NBU1QobnZibyk7CisJ aWYgKElTX0VSUihudmJvKSkgeworCQlvYmogPSBFUlJfQ0FTVChudmJvKTsKKwkJZ290byB1bmxv Y2s7CisJfQogCiAJbnZiby0+dmFsaWRfZG9tYWlucyA9IE5PVVZFQVVfR0VNX0RPTUFJTl9HQVJU OwogCkBAIC04MiwxNiArODQsMjIgQEAgc3RydWN0IGRybV9nZW1fb2JqZWN0ICpub3V2ZWF1X2dl bV9wcmltZV9pbXBvcnRfc2dfdGFibGUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlyZXQgPSBk cm1fZ2VtX29iamVjdF9pbml0KGRldiwgJm52Ym8tPmJvLmJhc2UsIHNpemUpOwogCWlmIChyZXQp IHsKIAkJbm91dmVhdV9ib19yZWYoTlVMTCwgJm52Ym8pOwotCQlyZXR1cm4gRVJSX1BUUigtRU5P TUVNKTsKKwkJb2JqID0gRVJSX1BUUigtRU5PTUVNKTsKKwkJZ290byB1bmxvY2s7CiAJfQogCiAJ cmV0ID0gbm91dmVhdV9ib19pbml0KG52Ym8sIHNpemUsIGFsaWduLCBmbGFncywgc2csIHJvYmop OwogCWlmIChyZXQpIHsKIAkJbm91dmVhdV9ib19yZWYoTlVMTCwgJm52Ym8pOwotCQlyZXR1cm4g RVJSX1BUUihyZXQpOworCQlvYmogPSBFUlJfUFRSKHJldCk7CisJCWdvdG8gdW5sb2NrOwogCX0K IAotCXJldHVybiAmbnZiby0+Ym8uYmFzZTsKKwlvYmogPSAmbnZiby0+Ym8uYmFzZTsKKwordW5s b2NrOgorCWRtYV9yZXN2X3VubG9jayhyb2JqKTsKKwlyZXR1cm4gb2JqOwogfQogCiBpbnQgbm91 dmVhdV9nZW1fcHJpbWVfcGluKHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqKQotLSAKMi4yMy4w CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2 ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=