From: Chunming Zhou Subject: [PATCH 2/4] drm/amdgpu: return -ENODEV to user space when vram is lost v2 Date: Tue, 16 May 2017 17:25:48 +0800 Message-ID: <1494926750-1081-2-git-send-email-David1.Zhou@amd.com> References: <1494926750-1081-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: <1494926750-1081-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 Y3RsCmFtZGdwdV9pbmZvX2lvY3RsCgp2Mjogb25seSBmb3IgbWFwIGFuZCByZXBsYWNlIGNhc2Vz IGluIGFtZGdwdV9nZW1fdmFfaW9jdGwKCkNoYW5nZS1JZDogSTg5NzBjZGUzMzAxYjdjZmViNDI2 M2NjMGYwZTU0YWVjZTIxNWM5OGUKU2lnbmVkLW9mZi1ieTogQ2h1bm1pbmcgWmhvdSA8RGF2aWQx Llpob3VAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaCAg ICAgICAgfCAgNCArKysrCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfY3MuYyAg ICAgfCAgOSArKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZp Y2UuYyB8ICA0ICsrKy0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9nZW0uYyAg ICB8ICA1ICsrKysrCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfa21zLmMgICAg fCAxMCArKysrKysrKysrCiA1IGZpbGVzIGNoYW5nZWQsIDMxIGluc2VydGlvbnMoKyksIDEgZGVs ZXRpb24oLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUu aCBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oCmluZGV4IGY5ZGEyMTUuLmRj ZDYyMDMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oCkBAIC04NTUsNiArODU1LDcg QEAgc3RydWN0IGFtZGdwdV9mcHJpdiB7CiAJc3RydWN0IGFtZGdwdV9jdHhfbWdyCWN0eF9tZ3I7 CiAJc3BpbmxvY2tfdAkJc2VtX2hhbmRsZXNfbG9jazsKIAlzdHJ1Y3QgaWRyCQlzZW1faGFuZGxl czsKKwl1MzIJCQl2cmFtX2xvc3RfY291bnRlcjsKIH07CiAKIC8qCkBAIC0xNjA3LDYgKzE2MDgs NyBAQCBzdHJ1Y3QgYW1kZ3B1X2RldmljZSB7CiAJYXRvbWljNjRfdAkJCW51bV9ieXRlc19tb3Zl ZDsKIAlhdG9taWM2NF90CQkJbnVtX2V2aWN0aW9uczsKIAlhdG9taWNfdAkJCWdwdV9yZXNldF9j b3VudGVyOworCWF0b21pY190CQkJdnJhbV9sb3N0X2NvdW50ZXI7CiAKIAkvKiBkYXRhIGZvciBi dWZmZXIgbWlncmF0aW9uIHRocm90dGxpbmcgKi8KIAlzdHJ1Y3QgewpAQCAtMjAwNSw2ICsyMDA3 LDggQEAgc3RhdGljIGlubGluZSB2b2lkIGFtZGdwdV91bnJlZ2lzdGVyX2F0cHhfaGFuZGxlcih2 b2lkKSB7fQogZXh0ZXJuIGNvbnN0IHN0cnVjdCBkcm1faW9jdGxfZGVzYyBhbWRncHVfaW9jdGxz X2ttc1tdOwogZXh0ZXJuIGNvbnN0IGludCBhbWRncHVfbWF4X2ttc19pb2N0bDsKIAorYm9vbCBh bWRncHVfa21zX3ZyYW1fbG9zdChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKKwkJCSAgc3Ry dWN0IGFtZGdwdV9mcHJpdiAqZnByaXYpOwogaW50IGFtZGdwdV9kcml2ZXJfbG9hZF9rbXMoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwgdW5zaWduZWQgbG9uZyBmbGFncyk7CiBpbnQgYW1kZ3B1X2Ry aXZlcl91bmxvYWRfa21zKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogdm9pZCBhbWRncHVfZHJp dmVyX2xhc3RjbG9zZV9rbXMoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfY3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV9jcy5jCmluZGV4IGI4MDM0MTIuLjkxMWFhMDIgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jCkBAIC0xMDk3LDYgKzEwOTcsNyBAQCBzdGF0aWMg aW50IGFtZGdwdV9jc19zdWJtaXQoc3RydWN0IGFtZGdwdV9jc19wYXJzZXIgKnAsCiBpbnQgYW1k Z3B1X2NzX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsIHN0cnVjdCBk cm1fZmlsZSAqZmlscCkKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IGRldi0+ZGV2 X3ByaXZhdGU7CisJc3RydWN0IGFtZGdwdV9mcHJpdiAqZnByaXYgPSBmaWxwLT5kcml2ZXJfcHJp djsKIAl1bmlvbiBkcm1fYW1kZ3B1X2NzICpjcyA9IGRhdGE7CiAJc3RydWN0IGFtZGdwdV9jc19w YXJzZXIgcGFyc2VyID0ge307CiAJYm9vbCByZXNlcnZlZF9idWZmZXJzID0gZmFsc2U7CkBAIC0x MTA0LDYgKzExMDUsOCBAQCBpbnQgYW1kZ3B1X2NzX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsIHZvaWQgKmRhdGEsIHN0cnVjdCBkcm1fZmlsZSAqZmlscCkKIAogCWlmICghYWRldi0+YWNj ZWxfd29ya2luZykKIAkJcmV0dXJuIC1FQlVTWTsKKwlpZiAoYW1kZ3B1X2ttc192cmFtX2xvc3Qo YWRldiwgZnByaXYpKQorCQlyZXR1cm4gLUVOT0RFVjsKIAogCXBhcnNlci5hZGV2ID0gYWRldjsK IAlwYXJzZXIuZmlscCA9IGZpbHA7CkBAIC0xMTY1LDEyICsxMTY4LDE1IEBAIGludCBhbWRncHVf Y3Nfd2FpdF9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogewogCXVu aW9uIGRybV9hbWRncHVfd2FpdF9jcyAqd2FpdCA9IGRhdGE7CiAJc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYgPSBkZXYtPmRldl9wcml2YXRlOworCXN0cnVjdCBhbWRncHVfZnByaXYgKmZwcml2 ID0gZmlscC0+ZHJpdmVyX3ByaXY7CiAJdW5zaWduZWQgbG9uZyB0aW1lb3V0ID0gYW1kZ3B1X2dl bV90aW1lb3V0KHdhaXQtPmluLnRpbWVvdXQpOwogCXN0cnVjdCBhbWRncHVfcmluZyAqcmluZyA9 IE5VTEw7CiAJc3RydWN0IGFtZGdwdV9jdHggKmN0eDsKIAlzdHJ1Y3QgZmVuY2UgKmZlbmNlOwog CWxvbmcgcjsKIAorCWlmIChhbWRncHVfa21zX3ZyYW1fbG9zdChhZGV2LCBmcHJpdikpCisJCXJl dHVybiAtRU5PREVWOwogCXIgPSBhbWRncHVfY3NfZ2V0X3JpbmcoYWRldiwgd2FpdC0+aW4uaXBf dHlwZSwgd2FpdC0+aW4uaXBfaW5zdGFuY2UsCiAJCQkgICAgICAgd2FpdC0+aW4ucmluZywgJnJp bmcpOwogCWlmIChyKQpAQCAtMTM0NCwxMiArMTM1MCwxNSBAQCBpbnQgYW1kZ3B1X2NzX3dhaXRf ZmVuY2VzX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJCQkJc3Ry dWN0IGRybV9maWxlICpmaWxwKQogewogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gZGV2 LT5kZXZfcHJpdmF0ZTsKKwlzdHJ1Y3QgYW1kZ3B1X2Zwcml2ICpmcHJpdiA9IGZpbHAtPmRyaXZl cl9wcml2OwogCXVuaW9uIGRybV9hbWRncHVfd2FpdF9mZW5jZXMgKndhaXQgPSBkYXRhOwogCXVp bnQzMl90IGZlbmNlX2NvdW50ID0gd2FpdC0+aW4uZmVuY2VfY291bnQ7CiAJc3RydWN0IGRybV9h bWRncHVfZmVuY2UgKmZlbmNlc191c2VyOwogCXN0cnVjdCBkcm1fYW1kZ3B1X2ZlbmNlICpmZW5j ZXM7CiAJaW50IHI7CiAKKwlpZiAoYW1kZ3B1X2ttc192cmFtX2xvc3QoYWRldiwgZnByaXYpKQor CQlyZXR1cm4gLUVOT0RFVjsKIAkvKiBHZXQgdGhlIGZlbmNlcyBmcm9tIHVzZXJzcGFjZSAqLwog CWZlbmNlcyA9IGttYWxsb2NfYXJyYXkoZmVuY2VfY291bnQsIHNpemVvZihzdHJ1Y3QgZHJtX2Ft ZGdwdV9mZW5jZSksCiAJCQlHRlBfS0VSTkVMKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L2FtZGdwdV9kZXZpY2UuYwppbmRleCBjNTZhZTRhLi4yZjBmY2Y4IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2RldmljZS5jCkBAIC0yOTEzLDggKzI5MTMsMTAgQEAgaW50 IGFtZGdwdV9ncHVfcmVzZXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJCQlpZiAocikK IAkJCQlnb3RvIG91dDsKIAkJCXZyYW1fbG9zdCA9IGFtZGdwdV9jaGVja192cmFtX2xvc3QoYWRl dik7Ci0JCQlpZiAodnJhbV9sb3N0KQorCQkJaWYgKHZyYW1fbG9zdCkgewogCQkJCURSTV9FUlJP UigiVlJBTSBpcyBsb3N0IVxuIik7CisJCQkJYXRvbWljX2luYygmYWRldi0+dnJhbV9sb3N0X2Nv dW50ZXIpOworCQkJfQogCQkJciA9IGFtZGdwdV90dG1fcmVjb3Zlcl9nYXJ0KGFkZXYpOwogCQkJ aWYgKHIpCiAJCQkJZ290byBvdXQ7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9hbWRncHVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZ2Vt LmMKaW5kZXggZDgyNzVlZi4uODNiYzk0YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvYW1kZ3B1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Ft ZGdwdV9nZW0uYwpAQCAtODAyLDYgKzgwMiwxMSBAQCBpbnQgYW1kZ3B1X2dlbV92YV9pb2N0bChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAogCQkJYXJncy0+b3BlcmF0aW9uKTsK IAkJcmV0dXJuIC1FSU5WQUw7CiAJfQorCWlmICgoYXJncy0+b3BlcmF0aW9uID09IEFNREdQVV9W QV9PUF9NQVApIHx8CisJICAgIChhcmdzLT5vcGVyYXRpb24gPT0gQU1ER1BVX1ZBX09QX1JFUExB Q0UpKSB7CisJCWlmIChhbWRncHVfa21zX3ZyYW1fbG9zdChhZGV2LCBmcHJpdikpCisJCQlyZXR1 cm4gLUVOT0RFVjsKKwl9CiAKIAlJTklUX0xJU1RfSEVBRCgmbGlzdCk7CiAJaWYgKChhcmdzLT5v cGVyYXRpb24gIT0gQU1ER1BVX1ZBX09QX0NMRUFSKSAmJgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ttcy5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvYW1kZ3B1X2ttcy5jCmluZGV4IDM2ODgyOWEuLmEyMzFhYTEgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9rbXMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfa21zLmMKQEAgLTIzNSw2ICsyMzUsNyBAQCBzdGF0aWMgaW50IGFt ZGdwdV9maXJtd2FyZV9pbmZvKHN0cnVjdCBkcm1fYW1kZ3B1X2luZm9fZmlybXdhcmUgKmZ3X2lu Zm8sCiBzdGF0aWMgaW50IGFtZGdwdV9pbmZvX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs IHZvaWQgKmRhdGEsIHN0cnVjdCBkcm1fZmlsZSAqZmlscCkKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqYWRldiA9IGRldi0+ZGV2X3ByaXZhdGU7CisJc3RydWN0IGFtZGdwdV9mcHJpdiAqZnBy aXYgPSBmaWxwLT5kcml2ZXJfcHJpdjsKIAlzdHJ1Y3QgZHJtX2FtZGdwdV9pbmZvICppbmZvID0g ZGF0YTsKIAlzdHJ1Y3QgYW1kZ3B1X21vZGVfaW5mbyAqbWluZm8gPSAmYWRldi0+bW9kZV9pbmZv OwogCXZvaWQgX191c2VyICpvdXQgPSAodm9pZCBfX3VzZXIgKikodWludHB0cl90KWluZm8tPnJl dHVybl9wb2ludGVyOwpAQCAtMjQ3LDYgKzI0OCw4IEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2luZm9f aW9jdGwoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwgc3RydWN0IGRybV9maWxl CiAKIAlpZiAoIWluZm8tPnJldHVybl9zaXplIHx8ICFpbmZvLT5yZXR1cm5fcG9pbnRlcikKIAkJ cmV0dXJuIC1FSU5WQUw7CisJaWYgKGFtZGdwdV9rbXNfdnJhbV9sb3N0KGFkZXYsIGZwcml2KSkK KwkJcmV0dXJuIC1FTk9ERVY7CiAKIAlzd2l0Y2ggKGluZm8tPnF1ZXJ5KSB7CiAJY2FzZSBBTURH UFVfSU5GT19WSVJUVUFMX1JBTkdFOiB7CkBAIC03NzksNiArNzgyLDEyIEBAIHZvaWQgYW1kZ3B1 X2RyaXZlcl9sYXN0Y2xvc2Vfa21zKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJdmdhX3N3aXRj aGVyb29fcHJvY2Vzc19kZWxheWVkX3N3aXRjaCgpOwogfQogCitib29sIGFtZGdwdV9rbXNfdnJh bV9sb3N0KHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAorCQkJICBzdHJ1Y3QgYW1kZ3B1X2Zw cml2ICpmcHJpdikKK3sKKwlyZXR1cm4gZnByaXYtPnZyYW1fbG9zdF9jb3VudGVyICE9IGF0b21p Y19yZWFkKCZhZGV2LT52cmFtX2xvc3RfY291bnRlcik7Cit9CisKIC8qKgogICogYW1kZ3B1X2Ry aXZlcl9vcGVuX2ttcyAtIGRybSBjYWxsYmFjayBmb3Igb3BlbgogICoKQEAgLTgzMyw2ICs4NDIs NyBAQCBpbnQgYW1kZ3B1X2RyaXZlcl9vcGVuX2ttcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBz dHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdikKIAogCWFtZGdwdV9jdHhfbWdyX2luaXQoJmZwcml2 LT5jdHhfbWdyKTsKIAorCWZwcml2LT52cmFtX2xvc3RfY291bnRlciA9IGF0b21pY19yZWFkKCZh ZGV2LT52cmFtX2xvc3RfY291bnRlcik7CiAJZmlsZV9wcml2LT5kcml2ZXJfcHJpdiA9IGZwcml2 OwogCiBvdXRfc3VzcGVuZDoKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2FtZC1nZngK