From: =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [PATCH 2/7] drm/amdgpu: fix amdgpu_vm_bo_wait Date: Wed, 12 Jul 2017 10:31:43 +0200 Message-ID: <1499848308-1441-2-git-send-email-deathsimple@vodafone.de> References: <1499848308-1441-1-git-send-email-deathsimple@vodafone.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1499848308-1441-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKV2UgbmVl ZCB0byB3YWl0IHdpdGggdGhlIGNvcnJlY3Qgb3duZXIgb24gdW5tYXAgb3BlcmF0aW9ucyBvciBv dGhlcndpc2UgY2FuIHJ1bgppbnRvIFZNIGZhdWx0cy4KCkFsc28gYWx3YXlzIHdhaXQgZm9yIHRo ZSBwYWdlIGRpcmVjdG9yeSBzaW5jZSB0aGlzIGlzIHdoZXJlIHRoZSByZXNlcnZhdGlvbgpvYmpl Y3QgY29tZXMgZnJvbS4gU28gcmVuYW1lIHRoZSBmdW5jdGlvbiB0byBhbWRncHVfdm1fd2FpdF9w ZCBpbnN0ZWFkIGFzIHdlbGwuCgpTaWduZWQtb2ZmLWJ5OiBDaHJpc3RpYW4gS8O2bmlnIDxjaHJp c3RpYW4ua29lbmlnQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1k Z3B1X3ZtLmMgfCAxNyArKysrKysrKystLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDkgaW5zZXJ0 aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHVfdm0uYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92 bS5jCmluZGV4IGJmNzY5NmE3Li5iYTNiZmMzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfdm0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfdm0uYwpAQCAtOTk1LDEzICs5OTUsMTQgQEAgc3RhdGljIHZvaWQgYW1kZ3B1X3ZtX2Nw dV9zZXRfcHRlcyhzdHJ1Y3QgYW1kZ3B1X3B0ZV91cGRhdGVfcGFyYW1zICpwYXJhbXMsCiAJYW1k Z3B1X2dhcnRfZmx1c2hfZ3B1X3RsYihwYXJhbXMtPmFkZXYsIDApOwogfQogCi1zdGF0aWMgaW50 IGFtZGdwdV92bV9ib193YWl0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBzdHJ1Y3QgYW1k Z3B1X2JvICpibykKK3N0YXRpYyBpbnQgYW1kZ3B1X3ZtX3dhaXRfcGQoc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYsIHN0cnVjdCBhbWRncHVfdm0gKnZtLAorCQkJICAgICB2b2lkICpvd25lcikK IHsKIAlzdHJ1Y3QgYW1kZ3B1X3N5bmMgc3luYzsKIAlpbnQgcjsKIAogCWFtZGdwdV9zeW5jX2Ny ZWF0ZSgmc3luYyk7Ci0JYW1kZ3B1X3N5bmNfcmVzdihhZGV2LCAmc3luYywgYm8tPnRiby5yZXN2 LCBBTURHUFVfRkVOQ0VfT1dORVJfVk0pOworCWFtZGdwdV9zeW5jX3Jlc3YoYWRldiwgJnN5bmMs IHZtLT5yb290LmJvLT50Ym8ucmVzdiwgb3duZXIpOwogCXIgPSBhbWRncHVfc3luY193YWl0KCZz eW5jLCB0cnVlKTsKIAlhbWRncHVfc3luY19mcmVlKCZzeW5jKTsKIApAQCAtMTA0Nyw3ICsxMDQ4 LDcgQEAgc3RhdGljIGludCBhbWRncHVfdm1fdXBkYXRlX2xldmVsKHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2LAogCQlyID0gYW1kZ3B1X2JvX2ttYXAocGFyZW50LT5ibywgKHZvaWQgKiopJnBk X2FkZHIpOwogCQlpZiAocikKIAkJCXJldHVybiByOwotCQlyID0gYW1kZ3B1X3ZtX2JvX3dhaXQo YWRldiwgcGFyZW50LT5ibyk7CisJCXIgPSBhbWRncHVfdm1fd2FpdF9wZChhZGV2LCB2bSwgQU1E R1BVX0ZFTkNFX09XTkVSX1ZNKTsKIAkJaWYgKHVubGlrZWx5KHIpKSB7CiAJCQlhbWRncHVfYm9f a3VubWFwKHBhcmVudC0+Ym8pOwogCQkJcmV0dXJuIHI7CkBAIC0xNDQ1LDYgKzE0NDYsMTAgQEAg c3RhdGljIGludCBhbWRncHVfdm1fYm9fdXBkYXRlX21hcHBpbmcoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYsCiAJcGFyYW1zLnZtID0gdm07CiAJcGFyYW1zLnNyYyA9IHNyYzsKIAorCS8qIHN5 bmMgdG8gZXZlcnl0aGluZyBvbiB1bm1hcHBpbmcgKi8KKwlpZiAoIShmbGFncyAmIEFNREdQVV9Q VEVfVkFMSUQpKQorCQlvd25lciA9IEFNREdQVV9GRU5DRV9PV05FUl9VTkRFRklORUQ7CisKIAlp ZiAodm0tPnVzZV9jcHVfZm9yX3VwZGF0ZSkgewogCQkvKiBwYXJhbXMuc3JjIGlzIHVzZWQgYXMg ZmxhZyB0byBpbmRpY2F0ZSBzeXN0ZW0gTWVtb3J5ICovCiAJCWlmIChwYWdlc19hZGRyKQpAQCAt MTQ1Myw3ICsxNDU4LDcgQEAgc3RhdGljIGludCBhbWRncHVfdm1fYm9fdXBkYXRlX21hcHBpbmco c3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJCS8qIFdhaXQgZm9yIFBUIEJPcyB0byBiZSBm cmVlLiBQVHMgc2hhcmUgdGhlIHNhbWUgcmVzdi4gb2JqZWN0CiAJCSAqIGFzIHRoZSByb290IFBE IEJPCiAJCSAqLwotCQlyID0gYW1kZ3B1X3ZtX2JvX3dhaXQoYWRldiwgdm0tPnJvb3QuYm8pOwor CQlyID0gYW1kZ3B1X3ZtX3dhaXRfcGQoYWRldiwgdm0sIG93bmVyKTsKIAkJaWYgKHVubGlrZWx5 KHIpKQogCQkJcmV0dXJuIHI7CiAKQEAgLTE0NjUsMTAgKzE0NzAsNiBAQCBzdGF0aWMgaW50IGFt ZGdwdV92bV9ib191cGRhdGVfbWFwcGluZyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAog CXJpbmcgPSBjb250YWluZXJfb2Yodm0tPmVudGl0eS5zY2hlZCwgc3RydWN0IGFtZGdwdV9yaW5n LCBzY2hlZCk7CiAKLQkvKiBzeW5jIHRvIGV2ZXJ5dGhpbmcgb24gdW5tYXBwaW5nICovCi0JaWYg KCEoZmxhZ3MgJiBBTURHUFVfUFRFX1ZBTElEKSkKLQkJb3duZXIgPSBBTURHUFVfRkVOQ0VfT1dO RVJfVU5ERUZJTkVEOwotCiAJbnB0ZXMgPSBsYXN0IC0gc3RhcnQgKyAxOwogCiAJLyoKLS0gCjIu Ny40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQt Z2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK