From: Chunming Zhou Subject: [PATCH 2/3] drm/amdgpu: return -ENODEV to user space when vram is lost Date: Tue, 16 May 2017 14:44:28 +0800 Message-ID: <1494917069-29054-2-git-send-email-David1.Zhou@amd.com> References: <1494917069-29054-1-git-send-email-David1.Zhou@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1494917069-29054-1-git-send-email-David1.Zhou-5C7GfCeVMHo@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 Cc: Chunming Zhou YmVsb3cgaW9jdGwgd2lsbCByZXR1cm4gLUVOT0RFVjoKYW1kZ3B1X2NzX2lvY3RsCmFtZGdwdV9j c193YWl0X2lvY3RsCmFtZGdwdV9jc193YWl0X2ZlbmNlc19pb2N0bAphbWRncHVfZ2VtX3ZhX2lv Y3RsCmFtZGdwdV9pbmZvX2lvY3RsCgpDaGFuZ2UtSWQ6IEk4OTcwY2RlMzMwMWI3Y2ZlYjQyNjNj YzBmMGU1NGFlY2UyMTVjOThlClNpZ25lZC1vZmYtYnk6IENodW5taW5nIFpob3UgPERhdmlkMS5a aG91QGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmggICAg ICAgIHwgIDQgKysrKwogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2NzLmMgICAg IHwgIDkgKysrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNl LmMgfCAgNCArKystCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZ2VtLmMgICAg fCAgMiArKwogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ttcy5jICAgIHwgMTAg KysrKysrKysrKwogNSBmaWxlcyBjaGFuZ2VkLCAyOCBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9u KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmggYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaAppbmRleCBmOWRhMjE1Li5kY2Q2MjAz IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaAorKysgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaApAQCAtODU1LDYgKzg1NSw3IEBAIHN0 cnVjdCBhbWRncHVfZnByaXYgewogCXN0cnVjdCBhbWRncHVfY3R4X21ncgljdHhfbWdyOwogCXNw aW5sb2NrX3QJCXNlbV9oYW5kbGVzX2xvY2s7CiAJc3RydWN0IGlkcgkJc2VtX2hhbmRsZXM7CisJ dTMyCQkJdnJhbV9sb3N0X2NvdW50ZXI7CiB9OwogCiAvKgpAQCAtMTYwNyw2ICsxNjA4LDcgQEAg c3RydWN0IGFtZGdwdV9kZXZpY2UgewogCWF0b21pYzY0X3QJCQludW1fYnl0ZXNfbW92ZWQ7CiAJ YXRvbWljNjRfdAkJCW51bV9ldmljdGlvbnM7CiAJYXRvbWljX3QJCQlncHVfcmVzZXRfY291bnRl cjsKKwlhdG9taWNfdAkJCXZyYW1fbG9zdF9jb3VudGVyOwogCiAJLyogZGF0YSBmb3IgYnVmZmVy IG1pZ3JhdGlvbiB0aHJvdHRsaW5nICovCiAJc3RydWN0IHsKQEAgLTIwMDUsNiArMjAwNyw4IEBA IHN0YXRpYyBpbmxpbmUgdm9pZCBhbWRncHVfdW5yZWdpc3Rlcl9hdHB4X2hhbmRsZXIodm9pZCkg e30KIGV4dGVybiBjb25zdCBzdHJ1Y3QgZHJtX2lvY3RsX2Rlc2MgYW1kZ3B1X2lvY3Rsc19rbXNb XTsKIGV4dGVybiBjb25zdCBpbnQgYW1kZ3B1X21heF9rbXNfaW9jdGw7CiAKK2Jvb2wgYW1kZ3B1 X2ttc192cmFtX2xvc3Qoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCisJCQkgIHN0cnVjdCBh bWRncHVfZnByaXYgKmZwcml2KTsKIGludCBhbWRncHVfZHJpdmVyX2xvYWRfa21zKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGxvbmcgZmxhZ3MpOwogaW50IGFtZGdwdV9kcml2ZXJf dW5sb2FkX2ttcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KTsKIHZvaWQgYW1kZ3B1X2RyaXZlcl9s YXN0Y2xvc2Vfa21zKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2NzLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9hbWRncHVfY3MuYwppbmRleCBiODAzNDEyLi45MTFhYTAyIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfY3MuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfY3MuYwpAQCAtMTA5Nyw2ICsxMDk3LDcgQEAgc3RhdGljIGludCBh bWRncHVfY3Nfc3VibWl0KHN0cnVjdCBhbWRncHVfY3NfcGFyc2VyICpwLAogaW50IGFtZGdwdV9j c19pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLCBzdHJ1Y3QgZHJtX2Zp bGUgKmZpbHApCiB7CiAJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSBkZXYtPmRldl9wcml2 YXRlOworCXN0cnVjdCBhbWRncHVfZnByaXYgKmZwcml2ID0gZmlscC0+ZHJpdmVyX3ByaXY7CiAJ dW5pb24gZHJtX2FtZGdwdV9jcyAqY3MgPSBkYXRhOwogCXN0cnVjdCBhbWRncHVfY3NfcGFyc2Vy IHBhcnNlciA9IHt9OwogCWJvb2wgcmVzZXJ2ZWRfYnVmZmVycyA9IGZhbHNlOwpAQCAtMTEwNCw2 ICsxMTA1LDggQEAgaW50IGFtZGdwdV9jc19pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2 b2lkICpkYXRhLCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbHApCiAKIAlpZiAoIWFkZXYtPmFjY2VsX3dv cmtpbmcpCiAJCXJldHVybiAtRUJVU1k7CisJaWYgKGFtZGdwdV9rbXNfdnJhbV9sb3N0KGFkZXYs IGZwcml2KSkKKwkJcmV0dXJuIC1FTk9ERVY7CiAKIAlwYXJzZXIuYWRldiA9IGFkZXY7CiAJcGFy c2VyLmZpbHAgPSBmaWxwOwpAQCAtMTE2NSwxMiArMTE2OCwxNSBAQCBpbnQgYW1kZ3B1X2NzX3dh aXRfaW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKIHsKIAl1bmlvbiBk cm1fYW1kZ3B1X3dhaXRfY3MgKndhaXQgPSBkYXRhOwogCXN0cnVjdCBhbWRncHVfZGV2aWNlICph ZGV2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgYW1kZ3B1X2Zwcml2ICpmcHJpdiA9IGZp bHAtPmRyaXZlcl9wcml2OwogCXVuc2lnbmVkIGxvbmcgdGltZW91dCA9IGFtZGdwdV9nZW1fdGlt ZW91dCh3YWl0LT5pbi50aW1lb3V0KTsKIAlzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcgPSBOVUxM OwogCXN0cnVjdCBhbWRncHVfY3R4ICpjdHg7CiAJc3RydWN0IGZlbmNlICpmZW5jZTsKIAlsb25n IHI7CiAKKwlpZiAoYW1kZ3B1X2ttc192cmFtX2xvc3QoYWRldiwgZnByaXYpKQorCQlyZXR1cm4g LUVOT0RFVjsKIAlyID0gYW1kZ3B1X2NzX2dldF9yaW5nKGFkZXYsIHdhaXQtPmluLmlwX3R5cGUs IHdhaXQtPmluLmlwX2luc3RhbmNlLAogCQkJICAgICAgIHdhaXQtPmluLnJpbmcsICZyaW5nKTsK IAlpZiAocikKQEAgLTEzNDQsMTIgKzEzNTAsMTUgQEAgaW50IGFtZGdwdV9jc193YWl0X2ZlbmNl c19pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQkJCXN0cnVjdCBk cm1fZmlsZSAqZmlscCkKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IGRldi0+ZGV2 X3ByaXZhdGU7CisJc3RydWN0IGFtZGdwdV9mcHJpdiAqZnByaXYgPSBmaWxwLT5kcml2ZXJfcHJp djsKIAl1bmlvbiBkcm1fYW1kZ3B1X3dhaXRfZmVuY2VzICp3YWl0ID0gZGF0YTsKIAl1aW50MzJf dCBmZW5jZV9jb3VudCA9IHdhaXQtPmluLmZlbmNlX2NvdW50OwogCXN0cnVjdCBkcm1fYW1kZ3B1 X2ZlbmNlICpmZW5jZXNfdXNlcjsKIAlzdHJ1Y3QgZHJtX2FtZGdwdV9mZW5jZSAqZmVuY2VzOwog CWludCByOwogCisJaWYgKGFtZGdwdV9rbXNfdnJhbV9sb3N0KGFkZXYsIGZwcml2KSkKKwkJcmV0 dXJuIC1FTk9ERVY7CiAJLyogR2V0IHRoZSBmZW5jZXMgZnJvbSB1c2Vyc3BhY2UgKi8KIAlmZW5j ZXMgPSBrbWFsbG9jX2FycmF5KGZlbmNlX2NvdW50LCBzaXplb2Yoc3RydWN0IGRybV9hbWRncHVf ZmVuY2UpLAogCQkJR0ZQX0tFUk5FTCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHVfZGV2aWNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfZGV2aWNlLmMKaW5kZXggNThhZjllYS4uNDE3YjhmOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYwpAQCAtMjkxOSw4ICsyOTE5LDEwIEBAIGludCBhbWRn cHVfZ3B1X3Jlc2V0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCQkJaWYgKHIpCiAJCQkJ Z290byBvdXQ7CiAJCQl2cmFtX2xvc3QgPSBhbWRncHVfY2hlY2tfdnJhbV9sb3N0KGFkZXYpOwot CQkJaWYgKHZyYW1fbG9zdCkKKwkJCWlmICh2cmFtX2xvc3QpIHsKIAkJCQlEUk1fRVJST1IoIlZS QU0gaXMgbG9zdCFcbiIpOworCQkJCWF0b21pY19pbmMoJmFkZXYtPnZyYW1fbG9zdF9jb3VudGVy KTsKKwkJCX0KIAkJCXIgPSBhbWRncHVfdHRtX3JlY292ZXJfZ2FydChhZGV2KTsKIAkJCWlmIChy KQogCQkJCWdvdG8gb3V0OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2dlbS5jCmlu ZGV4IGQ4Mjc1ZWYuLjBmMGI3MzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2FtZGdwdV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVf Z2VtLmMKQEAgLTc3Niw2ICs3NzYsOCBAQCBpbnQgYW1kZ3B1X2dlbV92YV9pb2N0bChzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCiAJaWYgKCFhZGV2LT52bV9tYW5hZ2VyLmVu YWJsZWQpCiAJCXJldHVybiAtRU5PVFRZOworCWlmIChhbWRncHVfa21zX3ZyYW1fbG9zdChhZGV2 LCBmcHJpdikpCisJCXJldHVybiAtRU5PREVWOwogCiAJaWYgKGFyZ3MtPnZhX2FkZHJlc3MgPCBB TURHUFVfVkFfUkVTRVJWRURfU0laRSkgewogCQlkZXZfZXJyKCZkZXYtPnBkZXYtPmRldiwKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9rbXMuYyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9rbXMuYwppbmRleCAzNjg4MjlhLi5hMjMxYWEx IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfa21zLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ttcy5jCkBAIC0yMzUsNiArMjM1 LDcgQEAgc3RhdGljIGludCBhbWRncHVfZmlybXdhcmVfaW5mbyhzdHJ1Y3QgZHJtX2FtZGdwdV9p bmZvX2Zpcm13YXJlICpmd19pbmZvLAogc3RhdGljIGludCBhbWRncHVfaW5mb19pb2N0bChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbHApCiB7 CiAJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSBkZXYtPmRldl9wcml2YXRlOworCXN0cnVj dCBhbWRncHVfZnByaXYgKmZwcml2ID0gZmlscC0+ZHJpdmVyX3ByaXY7CiAJc3RydWN0IGRybV9h bWRncHVfaW5mbyAqaW5mbyA9IGRhdGE7CiAJc3RydWN0IGFtZGdwdV9tb2RlX2luZm8gKm1pbmZv ID0gJmFkZXYtPm1vZGVfaW5mbzsKIAl2b2lkIF9fdXNlciAqb3V0ID0gKHZvaWQgX191c2VyICop KHVpbnRwdHJfdClpbmZvLT5yZXR1cm5fcG9pbnRlcjsKQEAgLTI0Nyw2ICsyNDgsOCBAQCBzdGF0 aWMgaW50IGFtZGdwdV9pbmZvX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRh dGEsIHN0cnVjdCBkcm1fZmlsZQogCiAJaWYgKCFpbmZvLT5yZXR1cm5fc2l6ZSB8fCAhaW5mby0+ cmV0dXJuX3BvaW50ZXIpCiAJCXJldHVybiAtRUlOVkFMOworCWlmIChhbWRncHVfa21zX3ZyYW1f bG9zdChhZGV2LCBmcHJpdikpCisJCXJldHVybiAtRU5PREVWOwogCiAJc3dpdGNoIChpbmZvLT5x dWVyeSkgewogCWNhc2UgQU1ER1BVX0lORk9fVklSVFVBTF9SQU5HRTogewpAQCAtNzc5LDYgKzc4 MiwxMiBAQCB2b2lkIGFtZGdwdV9kcml2ZXJfbGFzdGNsb3NlX2ttcyhzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCXZnYV9zd2l0Y2hlcm9vX3Byb2Nlc3NfZGVsYXllZF9zd2l0Y2goKTsKIH0KIAor Ym9vbCBhbWRncHVfa21zX3ZyYW1fbG9zdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKKwkJ CSAgc3RydWN0IGFtZGdwdV9mcHJpdiAqZnByaXYpCit7CisJcmV0dXJuIGZwcml2LT52cmFtX2xv c3RfY291bnRlciAhPSBhdG9taWNfcmVhZCgmYWRldi0+dnJhbV9sb3N0X2NvdW50ZXIpOworfQor CiAvKioKICAqIGFtZGdwdV9kcml2ZXJfb3Blbl9rbXMgLSBkcm0gY2FsbGJhY2sgZm9yIG9wZW4K ICAqCkBAIC04MzMsNiArODQyLDcgQEAgaW50IGFtZGdwdV9kcml2ZXJfb3Blbl9rbXMoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYpCiAKIAlhbWRncHVf Y3R4X21ncl9pbml0KCZmcHJpdi0+Y3R4X21ncik7CiAKKwlmcHJpdi0+dnJhbV9sb3N0X2NvdW50 ZXIgPSBhdG9taWNfcmVhZCgmYWRldi0+dnJhbV9sb3N0X2NvdW50ZXIpOwogCWZpbGVfcHJpdi0+ ZHJpdmVyX3ByaXYgPSBmcHJpdjsKIAogb3V0X3N1c3BlbmQ6Ci0tIAoxLjkuMQoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxp c3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==