From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Deucher Subject: [PATCH 20/26] drm/amdgpu: remove ras_reserve_vram in ras injection Date: Wed, 31 Jul 2019 12:58:12 -0500 Message-ID: <20190731175818.20159-21-alexander.deucher@amd.com> References: <20190731175818.20159-1-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190731175818.20159-1-alexander.deucher-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: Tao Zhou , Dennis Li , Hawking Zhang RnJvbTogVGFvIFpob3UgPHRhby56aG91MUBhbWQuY29tPgoKZXJyb3IgaW5qZWN0aW9uIGFkZHJl c3MgaXMgbm90IGluIGdwdSBhZGRyZXNzIHNwYWNlCgpTaWduZWQtb2ZmLWJ5OiBUYW8gWmhvdSA8 dGFvLnpob3UxQGFtZC5jb20+ClJldmlld2VkLWJ5OiBEZW5uaXMgTGkgPGRlbm5pcy5saUBhbWQu Y29tPgpSZXZpZXdlZC1ieTogSGF3a2luZyBaaGFuZyA8SGF3a2luZy5aaGFuZ0BhbWQuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9yYXMuYyB8IDIxICsrKysrKysr KystLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEwIGluc2VydGlvbnMoKyksIDExIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9y YXMuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9yYXMuYwppbmRleCBhODdk ZWI3YmU0MTQuLmNjZDU4NjNiY2E4OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvYW1kZ3B1X3Jhcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw dV9yYXMuYwpAQCAtNjAsNiArNjAsOSBAQCBjb25zdCBjaGFyICpyYXNfYmxvY2tfc3RyaW5nW10g PSB7CiAjZGVmaW5lIEFNREdQVV9SQVNfRkxBR19JTklUX05FRURfUkVTRVQJCTIKICNkZWZpbmUg UkFTX0RFRkFVTFRfRkxBR1MgKEFNREdQVV9SQVNfRkxBR19JTklUX0JZX1ZCSU9TKQogCisvKiBp bmplY3QgYWRkcmVzcyBpcyA1MiBiaXRzICovCisjZGVmaW5lCVJBU19VTUNfSU5KRUNUX0FERFJf TElNSVQJKDB4MVVMTCA8PCA1MikKKwogc3RhdGljIGludCBhbWRncHVfcmFzX3Jlc2VydmVfdnJh bShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAkJdWludDY0X3Qgb2Zmc2V0LCB1aW50NjRf dCBzaXplLAogCQlzdHJ1Y3QgYW1kZ3B1X2JvICoqYm9fcHRyKTsKQEAgLTI0NSw3ICsyNDgsNiBA QCBzdGF0aWMgc3NpemVfdCBhbWRncHVfcmFzX2RlYnVnZnNfY3RybF93cml0ZShzdHJ1Y3QgZmls ZSAqZiwgY29uc3QgY2hhciBfX3VzZXIgKgogewogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2 ID0gKHN0cnVjdCBhbWRncHVfZGV2aWNlICopZmlsZV9pbm9kZShmKS0+aV9wcml2YXRlOwogCXN0 cnVjdCByYXNfZGVidWdfaWYgZGF0YTsKLQlzdHJ1Y3QgYW1kZ3B1X2JvICpibzsKIAlpbnQgcmV0 ID0gMDsKIAogCXJldCA9IGFtZGdwdV9yYXNfZGVidWdmc19jdHJsX3BhcnNlX2RhdGEoZiwgYnVm LCBzaXplLCBwb3MsICZkYXRhKTsKQEAgLTI2MywxNyArMjY1LDE0IEBAIHN0YXRpYyBzc2l6ZV90 IGFtZGdwdV9yYXNfZGVidWdmc19jdHJsX3dyaXRlKHN0cnVjdCBmaWxlICpmLCBjb25zdCBjaGFy IF9fdXNlciAqCiAJCXJldCA9IGFtZGdwdV9yYXNfZmVhdHVyZV9lbmFibGUoYWRldiwgJmRhdGEu aGVhZCwgMSk7CiAJCWJyZWFrOwogCWNhc2UgMjoKLQkJcmV0ID0gYW1kZ3B1X3Jhc19yZXNlcnZl X3ZyYW0oYWRldiwKLQkJCQlkYXRhLmluamVjdC5hZGRyZXNzLCBQQUdFX1NJWkUsICZibyk7Ci0J CWlmIChyZXQpIHsKLQkJCS8qIGFkZHJlc3Mgd2FzIG9mZnNldCwgbm93IGl0IGlzIGFic29sdXRl LiovCi0JCQlkYXRhLmluamVjdC5hZGRyZXNzICs9IGFkZXYtPmdtYy52cmFtX3N0YXJ0OwotCQkJ aWYgKGRhdGEuaW5qZWN0LmFkZHJlc3MgPiBhZGV2LT5nbWMudnJhbV9lbmQpCi0JCQkJYnJlYWs7 Ci0JCX0gZWxzZQotCQkJZGF0YS5pbmplY3QuYWRkcmVzcyA9IGFtZGdwdV9ib19ncHVfb2Zmc2V0 KGJvKTsKKwkJaWYgKChkYXRhLmluamVjdC5hZGRyZXNzID49IGFkZXYtPmdtYy5tY192cmFtX3Np emUpIHx8CisJCSAgICAoZGF0YS5pbmplY3QuYWRkcmVzcyA+PSBSQVNfVU1DX0lOSkVDVF9BRERS X0xJTUlUKSkgeworCQkJcmV0ID0gLUVJTlZBTDsKKwkJCWJyZWFrOworCQl9CisKKwkJLyogZGF0 YS5pbmplY3QuYWRkcmVzcyBpcyBvZmZzZXQgaW5zdGVhZCBvZiBhYnNvbHV0ZSBncHUgYWRkcmVz cyAqLwogCQlyZXQgPSBhbWRncHVfcmFzX2Vycm9yX2luamVjdChhZGV2LCAmZGF0YS5pbmplY3Qp OwotCQlhbWRncHVfcmFzX3JlbGVhc2VfdnJhbShhZGV2LCAmYm8pOwogCQlicmVhazsKIAlkZWZh dWx0OgogCQlyZXQgPSAtRUlOVkFMOwotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2FtZC1nZng=