From: Chunming Zhou Subject: [PATCH 06/10] drm/amdgpu: make recover_bo_from_shadow be generic Date: Tue, 2 Aug 2016 16:00:36 +0800 Message-ID: <1470124840-26170-7-git-send-email-David1.Zhou@amd.com> References: <1470124840-26170-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: <1470124840-26170-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 Q2hhbmdlLUlkOiBJNzQ3NThiOWNhODQwNThmM2YyZGI1NTA5ODIyZDhhYWQ4NDBkMjgzZQpTaWdu ZWQtb2ZmLWJ5OiBDaHVubWluZyBaaG91IDxEYXZpZDEuWmhvdUBhbWQuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9vYmplY3QuYyB8IDQwICsrKysrKysrKysrKysr KysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9vYmplY3QuaCB8 ICA2ICsrKysKIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5jICAgICB8IDQ4 ICsrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCA1MSBpbnNl cnRpb25zKCspLCA0MyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfb2JqZWN0LmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfb2JqZWN0LmMKaW5kZXggYzExMTFjOS4uMWQwYmRmYiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X29iamVjdC5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L2FtZGdwdV9vYmplY3QuYwpAQCAtNDM5LDYgKzQzOSw0NiBAQCBpbnQgYW1k Z3B1X2JvX2NyZWF0ZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAlyZXR1cm4gcjsKIH0K IAoraW50IGFtZGdwdV9ib19yZWNvdmVyX2JvX2Zyb21fc2hhZG93KHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2LAorCQkJCSAgICAgc3RydWN0IGFtZGdwdV9yaW5nICpyaW5nLAorCQkJCSAgICAg c3RydWN0IGFtZF9zY2hlZF9lbnRpdHkgKmVudGl0eSwKKwkJCQkgICAgIHN0cnVjdCBhbWRncHVf Ym8gKmJvLAorCQkJCSAgICAgc3RydWN0IHJlc2VydmF0aW9uX29iamVjdCAqcmVzdiwKKwkJCQkg ICAgIHN0cnVjdCBmZW5jZSAqKmZlbmNlKQorCit7CisJaW50IHI7CisJdWludDY0X3QgdnJhbV9h ZGRyLCBndHRfYWRkcjsKKworCXIgPSBhbWRncHVfYm9fcGluKGJvLCBBTURHUFVfR0VNX0RPTUFJ Tl9WUkFNLCAmdnJhbV9hZGRyKTsKKwlpZiAocikgeworCQlEUk1fRVJST1IoIkZhaWxlZCB0byBw aW4gYm8gb2JqZWN0XG4iKTsKKwkJZ290byBlcnIxOworCX0KKwlyID0gYW1kZ3B1X2JvX3Bpbihi by0+c2hhZG93LCBBTURHUFVfR0VNX0RPTUFJTl9HVFQsICZndHRfYWRkcik7CisJaWYgKHIpIHsK KwkJRFJNX0VSUk9SKCJGYWlsZWQgdG8gcGluIGJvIHNoYWRvdyBvYmplY3RcbiIpOworCQlnb3Rv IGVycjI7CisJfQorCisJciA9IHJlc2VydmF0aW9uX29iamVjdF9yZXNlcnZlX3NoYXJlZChiby0+ dGJvLnJlc3YpOworCWlmIChyKQorCQlnb3RvIGVycjM7CisKKwlyID0gYW1kZ3B1X2NvcHlfYnVm ZmVyKHJpbmcsIGVudGl0eSwgZ3R0X2FkZHIsCisJCQkgICAgICAgdnJhbV9hZGRyLCBhbWRncHVf Ym9fc2l6ZShibyksIHJlc3YsIGZlbmNlKTsKKwlpZiAoIXIpCisJCWFtZGdwdV9ib19mZW5jZShi bywgKmZlbmNlLCB0cnVlKTsKKworZXJyMzoKKwlhbWRncHVfYm9fdW5waW4oYm8tPnNoYWRvdyk7 CitlcnIyOgorCWFtZGdwdV9ib191bnBpbihibyk7CitlcnIxOgorCisJcmV0dXJuIHI7Cit9CisK IGludCBhbWRncHVfYm9fa21hcChzdHJ1Y3QgYW1kZ3B1X2JvICpibywgdm9pZCAqKnB0cikKIHsK IAlib29sIGlzX2lvbWVtOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X29iamVjdC5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X29iamVj dC5oCmluZGV4IGI5OTRmZDQuLmYzNWZkNjggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV9vYmplY3QuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfb2JqZWN0LmgKQEAgLTE1OCw2ICsxNTgsMTIgQEAgaW50IGFtZGdwdV9ib19mYXVs dF9yZXNlcnZlX25vdGlmeShzdHJ1Y3QgdHRtX2J1ZmZlcl9vYmplY3QgKmJvKTsKIHZvaWQgYW1k Z3B1X2JvX2ZlbmNlKHN0cnVjdCBhbWRncHVfYm8gKmJvLCBzdHJ1Y3QgZmVuY2UgKmZlbmNlLAog CQkgICAgIGJvb2wgc2hhcmVkKTsKIHU2NCBhbWRncHVfYm9fZ3B1X29mZnNldChzdHJ1Y3QgYW1k Z3B1X2JvICpibyk7CitpbnQgYW1kZ3B1X2JvX3JlY292ZXJfYm9fZnJvbV9zaGFkb3coc3RydWN0 IGFtZGdwdV9kZXZpY2UgKmFkZXYsCisJCQkJICAgICBzdHJ1Y3QgYW1kZ3B1X3JpbmcgKnJpbmcs CisJCQkJICAgICBzdHJ1Y3QgYW1kX3NjaGVkX2VudGl0eSAqZW50aXR5LAorCQkJCSAgICAgc3Ry dWN0IGFtZGdwdV9ibyAqYm8sCisJCQkJICAgICBzdHJ1Y3QgcmVzZXJ2YXRpb25fb2JqZWN0ICpy ZXN2LAorCQkJCSAgICAgc3RydWN0IGZlbmNlICoqZmVuY2UpOwogCiAvKgogICogc3ViIGFsbG9j YXRpb24KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV92bS5j IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmMKaW5kZXggMDFkZDg4OC4u M2VlY2RkYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3Zt LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X3ZtLmMKQEAgLTcxMyw0 NiArNzEzLDYgQEAgZXJyb3JfZnJlZToKIAlyZXR1cm4gcjsKIH0KIAotc3RhdGljIGludCBhbWRn cHVfdm1fcmVjb3Zlcl9ib19mcm9tX3NoYWRvdyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwK LQkJCQkJICAgIHN0cnVjdCBhbWRncHVfdm0gKnZtLAotCQkJCQkgICAgc3RydWN0IGFtZGdwdV9i byAqYm8sCi0JCQkJCSAgICBzdHJ1Y3QgYW1kZ3B1X2JvICpib19zaGFkb3csCi0JCQkJCSAgICBz dHJ1Y3QgcmVzZXJ2YXRpb25fb2JqZWN0ICpyZXN2LAotCQkJCQkgICAgc3RydWN0IGZlbmNlICoq ZmVuY2UpCi0KLXsKLQlpbnQgcjsKLQl1aW50NjRfdCB2cmFtX2FkZHIsIGd0dF9hZGRyOwotCi0J ciA9IGFtZGdwdV9ib19waW4oYm8sIEFNREdQVV9HRU1fRE9NQUlOX1ZSQU0sICZ2cmFtX2FkZHIp OwotCWlmIChyKSB7Ci0JCURSTV9FUlJPUigiRmFpbGVkIHRvIHBpbiBibyBvYmplY3RcbiIpOwot CQlnb3RvIGVycjE7Ci0JfQotCXIgPSBhbWRncHVfYm9fcGluKGJvX3NoYWRvdywgQU1ER1BVX0dF TV9ET01BSU5fR1RULCAmZ3R0X2FkZHIpOwotCWlmIChyKSB7Ci0JCURSTV9FUlJPUigiRmFpbGVk IHRvIHBpbiBibyBzaGFkb3cgb2JqZWN0XG4iKTsKLQkJZ290byBlcnIyOwotCX0KLQotCXIgPSBy ZXNlcnZhdGlvbl9vYmplY3RfcmVzZXJ2ZV9zaGFyZWQoYm8tPnRiby5yZXN2KTsKLQlpZiAocikK LQkJZ290byBlcnIzOwotCi0JciA9IGFtZGdwdV9jb3B5X2J1ZmZlcih2bS0+cmluZywgJnZtLT5y ZWNvdmVyX2VudGl0eSwgZ3R0X2FkZHIsCi0JCQkgICAgICAgdnJhbV9hZGRyLCBhbWRncHVfYm9f c2l6ZShibyksIHJlc3YsIGZlbmNlKTsKLQlpZiAoIXIpCi0JCWFtZGdwdV9ib19mZW5jZShibywg KmZlbmNlLCB0cnVlKTsKLQotZXJyMzoKLQlhbWRncHVfYm9fdW5waW4oYm9fc2hhZG93KTsKLWVy cjI6Ci0JYW1kZ3B1X2JvX3VucGluKGJvKTsKLWVycjE6Ci0KLQlyZXR1cm4gcjsKLX0KLQogaW50 IGFtZGdwdV92bV9yZWNvdmVyX3BhZ2VfdGFibGVfZnJvbV9zaGFkb3coc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYsCiAJCQkJCSAgICAgc3RydWN0IGFtZGdwdV92bSAqdm0pCiB7CkBAIC03Njcs OCArNzI3LDkgQEAgaW50IGFtZGdwdV92bV9yZWNvdmVyX3BhZ2VfdGFibGVfZnJvbV9zaGFkb3co c3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJaWYgKHVubGlrZWx5KHIgIT0gMCkpCiAJCXJl dHVybiByOwogCi0JciA9IGFtZGdwdV92bV9yZWNvdmVyX2JvX2Zyb21fc2hhZG93KGFkZXYsIHZt LCB2bS0+cGFnZV9kaXJlY3RvcnksCi0JCQkJCSAgICAgdm0tPnBhZ2VfZGlyZWN0b3J5LT5zaGFk b3csCisJciA9IGFtZGdwdV9ib19yZWNvdmVyX2JvX2Zyb21fc2hhZG93KGFkZXYsIHZtLT5yaW5n LAorCQkJCQkgICAgICZ2bS0+cmVjb3Zlcl9lbnRpdHksCisJCQkJCSAgICAgdm0tPnBhZ2VfZGly ZWN0b3J5LAogCQkJCQkgICAgIE5VTEwsICZmZW5jZSk7CiAJaWYgKHIpIHsKIAkJRFJNX0VSUk9S KCJyZWNvdmVyIHBhZ2UgdGFibGUgZmFpbGVkIVxuIik7CkBAIC03ODQsNyArNzQ1LDggQEAgaW50 IGFtZGdwdV92bV9yZWNvdmVyX3BhZ2VfdGFibGVfZnJvbV9zaGFkb3coc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYsCiAKIAkJaWYgKCFibyB8fCAhYm9fc2hhZG93KQogCQkJY29udGludWU7Ci0J CXIgPSBhbWRncHVfdm1fcmVjb3Zlcl9ib19mcm9tX3NoYWRvdyhhZGV2LCB2bSwgYm8sIGJvX3No YWRvdywKKwkJciA9IGFtZGdwdV9ib19yZWNvdmVyX2JvX2Zyb21fc2hhZG93KGFkZXYsIHZtLT5y aW5nLAorCQkJCQkJICAgICAmdm0tPnJlY292ZXJfZW50aXR5LCBibywKIAkJCQkJCSAgICAgTlVM TCwgJmZlbmNlKTsKIAkJaWYgKHIpIHsKIAkJCURSTV9FUlJPUigicmVjb3ZlciBwYWdlIHRhYmxl IGZhaWxlZCFcbiIpOwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v YW1kLWdmeAo=