From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" Subject: [PATCH 1/4] drm/amdgpu: partial revert VRAM lost handling v2 Date: Mon, 9 Oct 2017 17:34:29 +0200 Message-ID: <1507563272-7868-1-git-send-email-deathsimple@vodafone.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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 RnJvbTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgoKS2VlcCBi bG9ja2luZyB0aGUgQ1MsIGJ1dCByZXZlcnQgZXZlcnl0aGluZyBlbHNlLiBNYXBwaW5nIEJPcyBh bmQgaW5mbyBJT0NUTAphcmUgaGFybWxlc3MgYW5kIGNhbiBzdGlsbCBoYXBwZW4gZXZlbiB3aGVu IFZSQU0gY29udGVudCBpc3QgbG9zdC4KClNpZ25lZC1vZmYtYnk6IENocmlzdGlhbiBLw7ZuaWcg PGNocmlzdGlhbi5rb2VuaWdAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfY3MuYyAgfCAxMSAtLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvYW1kZ3B1X2dlbS5jIHwgIDUgLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Ft ZGdwdV9rbXMuYyB8IDE0ICsrKysrKysrKystLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDEwIGluc2Vy dGlvbnMoKyksIDIwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV9jcy5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 X2NzLmMKaW5kZXggYWI4M2RmYy4uYmEzZTY0NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1X2NzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X2NzLmMKQEAgLTEyNTcsMTYgKzEyNTcsMTIgQEAgaW50IGFtZGdwdV9jc193YWl0X2lv Y3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiB7CiAJdW5pb24gZHJtX2Ft ZGdwdV93YWl0X2NzICp3YWl0ID0gZGF0YTsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9 IGRldi0+ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IGFtZGdwdV9mcHJpdiAqZnByaXYgPSBmaWxwLT5k cml2ZXJfcHJpdjsKIAl1bnNpZ25lZCBsb25nIHRpbWVvdXQgPSBhbWRncHVfZ2VtX3RpbWVvdXQo d2FpdC0+aW4udGltZW91dCk7CiAJc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nID0gTlVMTDsKIAlz dHJ1Y3QgYW1kZ3B1X2N0eCAqY3R4OwogCXN0cnVjdCBkbWFfZmVuY2UgKmZlbmNlOwogCWxvbmcg cjsKIAotCWlmIChhbWRncHVfa21zX3ZyYW1fbG9zdChhZGV2LCBmcHJpdikpCi0JCXJldHVybiAt RU5PREVWOwotCiAJY3R4ID0gYW1kZ3B1X2N0eF9nZXQoZmlscC0+ZHJpdmVyX3ByaXYsIHdhaXQt PmluLmN0eF9pZCk7CiAJaWYgKGN0eCA9PSBOVUxMKQogCQlyZXR1cm4gLUVJTlZBTDsKQEAgLTEz MzUsMTYgKzEzMzEsMTIgQEAgaW50IGFtZGdwdV9jc19mZW5jZV90b19oYW5kbGVfaW9jdGwoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIAkJCQkgICAgc3RydWN0IGRybV9maWxl ICpmaWxwKQogewogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gZGV2LT5kZXZfcHJpdmF0 ZTsKLQlzdHJ1Y3QgYW1kZ3B1X2Zwcml2ICpmcHJpdiA9IGZpbHAtPmRyaXZlcl9wcml2OwogCXVu aW9uIGRybV9hbWRncHVfZmVuY2VfdG9faGFuZGxlICppbmZvID0gZGF0YTsKIAlzdHJ1Y3QgZG1h X2ZlbmNlICpmZW5jZTsKIAlzdHJ1Y3QgZHJtX3N5bmNvYmogKnN5bmNvYmo7CiAJc3RydWN0IHN5 bmNfZmlsZSAqc3luY19maWxlOwogCWludCBmZCwgcjsKIAotCWlmIChhbWRncHVfa21zX3ZyYW1f bG9zdChhZGV2LCBmcHJpdikpCi0JCXJldHVybiAtRU5PREVWOwotCiAJZmVuY2UgPSBhbWRncHVf Y3NfZ2V0X2ZlbmNlKGFkZXYsIGZpbHAsICZpbmZvLT5pbi5mZW5jZSk7CiAJaWYgKElTX0VSUihm ZW5jZSkpCiAJCXJldHVybiBQVFJfRVJSKGZlbmNlKTsKQEAgLTE1MDYsMTUgKzE0OTgsMTIgQEAg aW50IGFtZGdwdV9jc193YWl0X2ZlbmNlc19pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2 b2lkICpkYXRhLAogCQkJCXN0cnVjdCBkcm1fZmlsZSAqZmlscCkKIHsKIAlzdHJ1Y3QgYW1kZ3B1 X2RldmljZSAqYWRldiA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IGFtZGdwdV9mcHJpdiAq ZnByaXYgPSBmaWxwLT5kcml2ZXJfcHJpdjsKIAl1bmlvbiBkcm1fYW1kZ3B1X3dhaXRfZmVuY2Vz ICp3YWl0ID0gZGF0YTsKIAl1aW50MzJfdCBmZW5jZV9jb3VudCA9IHdhaXQtPmluLmZlbmNlX2Nv dW50OwogCXN0cnVjdCBkcm1fYW1kZ3B1X2ZlbmNlICpmZW5jZXNfdXNlcjsKIAlzdHJ1Y3QgZHJt X2FtZGdwdV9mZW5jZSAqZmVuY2VzOwogCWludCByOwogCi0JaWYgKGFtZGdwdV9rbXNfdnJhbV9s b3N0KGFkZXYsIGZwcml2KSkKLQkJcmV0dXJuIC1FTk9ERVY7CiAJLyogR2V0IHRoZSBmZW5jZXMg ZnJvbSB1c2Vyc3BhY2UgKi8KIAlmZW5jZXMgPSBrbWFsbG9jX2FycmF5KGZlbmNlX2NvdW50LCBz aXplb2Yoc3RydWN0IGRybV9hbWRncHVfZmVuY2UpLAogCQkJR0ZQX0tFUk5FTCk7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZ2VtLmMgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZ2VtLmMKaW5kZXggYjBkNDVjOC4uYzY5MDQ4YyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2dlbS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9nZW0uYwpAQCAtNTc3LDExICs1NzcsNiBA QCBpbnQgYW1kZ3B1X2dlbV92YV9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpk YXRhLAogCQkJYXJncy0+b3BlcmF0aW9uKTsKIAkJcmV0dXJuIC1FSU5WQUw7CiAJfQotCWlmICgo YXJncy0+b3BlcmF0aW9uID09IEFNREdQVV9WQV9PUF9NQVApIHx8Ci0JICAgIChhcmdzLT5vcGVy YXRpb24gPT0gQU1ER1BVX1ZBX09QX1JFUExBQ0UpKSB7Ci0JCWlmIChhbWRncHVfa21zX3ZyYW1f bG9zdChhZGV2LCBmcHJpdikpCi0JCQlyZXR1cm4gLUVOT0RFVjsKLQl9CiAKIAlJTklUX0xJU1Rf SEVBRCgmbGlzdCk7CiAJSU5JVF9MSVNUX0hFQUQoJmR1cGxpY2F0ZXMpOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ttcy5jIGIvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvYW1kZ3B1X2ttcy5jCmluZGV4IDhjNmZkNTYuLjlmYmE2ZjkgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9rbXMuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfa21zLmMKQEAgLTI2OSw3ICsyNjksNiBAQCBzdGF0 aWMgaW50IGFtZGdwdV9maXJtd2FyZV9pbmZvKHN0cnVjdCBkcm1fYW1kZ3B1X2luZm9fZmlybXdh cmUgKmZ3X2luZm8sCiBzdGF0aWMgaW50IGFtZGdwdV9pbmZvX2lvY3RsKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIHZvaWQgKmRhdGEsIHN0cnVjdCBkcm1fZmlsZSAqZmlscCkKIHsKIAlzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldiA9IGRldi0+ZGV2X3ByaXZhdGU7Ci0Jc3RydWN0IGFtZGdwdV9m cHJpdiAqZnByaXYgPSBmaWxwLT5kcml2ZXJfcHJpdjsKIAlzdHJ1Y3QgZHJtX2FtZGdwdV9pbmZv ICppbmZvID0gZGF0YTsKIAlzdHJ1Y3QgYW1kZ3B1X21vZGVfaW5mbyAqbWluZm8gPSAmYWRldi0+ bW9kZV9pbmZvOwogCXZvaWQgX191c2VyICpvdXQgPSAodm9pZCBfX3VzZXIgKikodWludHB0cl90 KWluZm8tPnJldHVybl9wb2ludGVyOwpAQCAtMjgyLDggKzI4MSw2IEBAIHN0YXRpYyBpbnQgYW1k Z3B1X2luZm9faW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwgc3RydWN0 IGRybV9maWxlCiAKIAlpZiAoIWluZm8tPnJldHVybl9zaXplIHx8ICFpbmZvLT5yZXR1cm5fcG9p bnRlcikKIAkJcmV0dXJuIC1FSU5WQUw7Ci0JaWYgKGFtZGdwdV9rbXNfdnJhbV9sb3N0KGFkZXYs IGZwcml2KSkKLQkJcmV0dXJuIC1FTk9ERVY7CiAKIAlzd2l0Y2ggKGluZm8tPnF1ZXJ5KSB7CiAJ Y2FzZSBBTURHUFVfSU5GT19BQ0NFTF9XT1JLSU5HOgpAQCAtNzkxLDEwICs3ODgsMTkgQEAgdm9p ZCBhbWRncHVfZHJpdmVyX2xhc3RjbG9zZV9rbXMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAl2 Z2Ffc3dpdGNoZXJvb19wcm9jZXNzX2RlbGF5ZWRfc3dpdGNoKCk7CiB9CiAKKy8qKgorICogYW1k Z3B1X2ttc192cmFtX2xvc3QgLSBjaGVjayBpZiBWUkFNIHdhcyBsb3N0IGZvciB0aGlzIGNsaWVu dAorICoKKyAqIEBhZGV2OiBhbWRncHUgZGV2aWNlCisgKiBAZnByaXY6IGNsaWVudCBwcml2YXRl CisgKgorICogQ2hlY2sgaWYgYWxsIENTIGlzIGJsb2NrZWQgZm9yIHRoZSBjbGllbnQgYmVjYXVz ZSBvZiBsb3N0IFZSQU0KKyAqLwogYm9vbCBhbWRncHVfa21zX3ZyYW1fbG9zdChzdHJ1Y3QgYW1k Z3B1X2RldmljZSAqYWRldiwKIAkJCSAgc3RydWN0IGFtZGdwdV9mcHJpdiAqZnByaXYpCiB7Ci0J cmV0dXJuIGZwcml2LT52cmFtX2xvc3RfY291bnRlciAhPSBhdG9taWNfcmVhZCgmYWRldi0+dnJh bV9sb3N0X2NvdW50ZXIpOworCXJldHVybiBmcHJpdi0+dnJhbV9sb3N0X2NvdW50ZXIgIT0KKwkJ YXRvbWljX3JlYWQoJmFkZXYtPnZyYW1fbG9zdF9jb3VudGVyKTsKIH0KIAogLyoqCi0tIAoyLjcu NAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdm eCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==