From: Alex Deucher Subject: [PATCH 2/2] drm/amdgpu/atomfirmware: simplify the interface to get vram info Date: Mon, 23 Sep 2019 15:35:37 -0500 Message-ID: <20190923203537.3301-2-alexander.deucher@amd.com> References: <20190923203537.3301-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: <20190923203537.3301-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: Alex Deucher ZmV0Y2ggYm90aCB0aGUgdnJhbSB0eXBlIGFuZCB3aWR0aCBpbiBvbmUgZnVuY3Rpb24gY2FsbC4g IFRoaXMKYXZvaWRzIGhhdmluZyB0byBwYXJzZSB0aGUgc2FtZSBkYXRhIHRhYmxlIHR3aWNlIHRv IGdldCB0aGUgdHdvCnBpZWNlcyBvZiBkYXRhLgoKU2lnbmVkLW9mZi1ieTogQWxleCBEZXVjaGVy IDxhbGV4YW5kZXIuZGV1Y2hlckBhbWQuY29tPgotLS0KIC4uLi9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X2F0b21maXJtd2FyZS5jICB8IDM0ICstLS0tLS0tLS0tLS0KIC4uLi9ncHUvZHJtL2Ft ZC9hbWRncHUvYW1kZ3B1X2F0b21maXJtd2FyZS5oICB8ICA0ICstCiBkcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9nbWNfdjEwXzAuYyAgICAgICAgfCAyMSArKystLS0tLQogZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRncHUvZ21jX3Y5XzAuYyAgICAgICAgIHwgNDkgKysrKysrKysrKy0tLS0tLS0t LQogNCBmaWxlcyBjaGFuZ2VkLCAzNyBpbnNlcnRpb25zKCspLCA3MSBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfYXRvbWZpcm13YXJl LmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfYXRvbWZpcm13YXJlLmMKaW5k ZXggOWZlY2NlYzJlYTVkLi4xOTkxM2MzOTU4OGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1kZ3B1L2FtZGdwdV9hdG9tZmlybXdhcmUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfYXRvbWZpcm13YXJlLmMKQEAgLTE2OSw5ICsxNjksOCBAQCBzdGF0 aWMgaW50IGNvbnZlcnRfYXRvbV9tZW1fdHlwZV90b192cmFtX3R5cGUoc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYsCiAJcmV0dXJuIHZyYW1fdHlwZTsKIH0KIAotc3RhdGljIGludAotYW1kZ3B1 X2F0b21maXJtd2FyZV9nZXRfdnJhbV9pbmZvKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAot CQkJCSAgaW50ICp2cmFtX3dpZHRoLCBpbnQgKnZyYW1fdHlwZSkKK2ludCBhbWRncHVfYXRvbWZp cm13YXJlX2dldF92cmFtX2luZm8oc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCisJCQkJICAg ICAgaW50ICp2cmFtX3dpZHRoLCBpbnQgKnZyYW1fdHlwZSkKIHsKIAlzdHJ1Y3QgYW1kZ3B1X21v ZGVfaW5mbyAqbW9kZV9pbmZvID0gJmFkZXYtPm1vZGVfaW5mbzsKIAlpbnQgaW5kZXgsIGkgPSAw OwpAQCAtMTg1LDcgKzE4NCw2IEBAIGFtZGdwdV9hdG9tZmlybXdhcmVfZ2V0X3ZyYW1faW5mbyhz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAl1MzIgbWVtX2NoYW5uZWxfd2lkdGg7CiAJdTMy IG1vZHVsZV9pZDsKIAotCiAJaWYgKGFkZXYtPmZsYWdzICYgQU1EX0lTX0FQVSkKIAkJaW5kZXgg PSBnZXRfaW5kZXhfaW50b19tYXN0ZXJfdGFibGUoYXRvbV9tYXN0ZXJfbGlzdF9vZl9kYXRhX3Rh Ymxlc192Ml8xLAogCQkJCQkJICAgIGludGVncmF0ZWRzeXN0ZW1pbmZvKTsKQEAgLTI2MSwzNCAr MjU5LDYgQEAgYW1kZ3B1X2F0b21maXJtd2FyZV9nZXRfdnJhbV9pbmZvKHN0cnVjdCBhbWRncHVf ZGV2aWNlICphZGV2LAogCXJldHVybiAwOwogfQogCi0vKgotICogUmV0dXJuIHZyYW0gd2lkdGgg ZnJvbSBpbnRlZ3JhdGVkIHN5c3RlbSBpbmZvIHRhYmxlLCBpZiBhdmFpbGFibGUsCi0gKiBvciAw IGlmIG5vdC4KLSAqLwotaW50IGFtZGdwdV9hdG9tZmlybXdhcmVfZ2V0X3ZyYW1fd2lkdGgoc3Ry dWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCi17Ci0JaW50IHZyYW1fd2lkdGggPSAwLCB2cmFtX3R5 cGUgPSAwOwotCWludCByID0gYW1kZ3B1X2F0b21maXJtd2FyZV9nZXRfdnJhbV9pbmZvKGFkZXYs ICZ2cmFtX3dpZHRoLCAmdnJhbV90eXBlKTsKLQlpZiAocikKLQkJcmV0dXJuIDA7Ci0KLQlyZXR1 cm4gdnJhbV93aWR0aDsKLX0KLQotLyoKLSAqIFJldHVybiB2cmFtIHR5cGUgZnJvbSBlaXRoZXIg aW50ZWdyYXRlZCBzeXN0ZW0gaW5mbyB0YWJsZQotICogb3IgdW1jIGluZm8gdGFibGUsIGlmIGF2 YWlsYWJsZSwgb3IgMCAoVFlQRV9VTktOT1dOKSBpZiBub3QKLSAqLwotaW50IGFtZGdwdV9hdG9t ZmlybXdhcmVfZ2V0X3ZyYW1fdHlwZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikKLXsKLQlp bnQgdnJhbV93aWR0aCA9IDAsIHZyYW1fdHlwZSA9IDA7Ci0JaW50IHIgPSBhbWRncHVfYXRvbWZp cm13YXJlX2dldF92cmFtX2luZm8oYWRldiwgJnZyYW1fd2lkdGgsICZ2cmFtX3R5cGUpOwotCWlm IChyKQotCQlyZXR1cm4gMDsKLQotCXJldHVybiB2cmFtX3R5cGU7Ci19Ci0KIC8qCiAgKiBSZXR1 cm4gdHJ1ZSBpZiB2YmlvcyBlbmFibGVkIGVjYyBieSBkZWZhdWx0LCBpZiB1bWMgaW5mbyB0YWJs ZSBpcyBhdmFpbGFibGUKICAqIG9yIGZhbHNlIGlmIGVjYyBpcyBub3QgZW5hYmxlZCBvciB1bWMg aW5mbyB0YWJsZSBpcyBub3QgYXZhaWxhYmxlCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9hbWRncHVfYXRvbWZpcm13YXJlLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS9hbWRncHVfYXRvbWZpcm13YXJlLmgKaW5kZXggNWVjNmY5MmYzNTNjLi44MjgxOWYwM2U0 NDQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9hdG9tZmly bXdhcmUuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfYXRvbWZpcm13 YXJlLmgKQEAgLTI5LDggKzI5LDggQEAKIGJvb2wgYW1kZ3B1X2F0b21maXJtd2FyZV9ncHVfc3Vw cG9ydHNfdmlydHVhbGl6YXRpb24oc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpOwogdm9pZCBh bWRncHVfYXRvbWZpcm13YXJlX3NjcmF0Y2hfcmVnc19pbml0KHN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2KTsKIGludCBhbWRncHVfYXRvbWZpcm13YXJlX2FsbG9jYXRlX2ZiX3NjcmF0Y2goc3Ry dWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpOwotaW50IGFtZGdwdV9hdG9tZmlybXdhcmVfZ2V0X3Zy YW1fd2lkdGgoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpOwotaW50IGFtZGdwdV9hdG9tZmly bXdhcmVfZ2V0X3ZyYW1fdHlwZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldik7CitpbnQgYW1k Z3B1X2F0b21maXJtd2FyZV9nZXRfdnJhbV9pbmZvKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2 LAorCQkJCSAgICAgIGludCAqdnJhbV93aWR0aCwgaW50ICp2cmFtX3R5cGUpOwogaW50IGFtZGdw dV9hdG9tZmlybXdhcmVfZ2V0X2Nsb2NrX2luZm8oc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYp OwogaW50IGFtZGdwdV9hdG9tZmlybXdhcmVfZ2V0X2dmeF9pbmZvKHN0cnVjdCBhbWRncHVfZGV2 aWNlICphZGV2KTsKIGJvb2wgYW1kZ3B1X2F0b21maXJtd2FyZV9tZW1fZWNjX3N1cHBvcnRlZChz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9nbWNfdjEwXzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192 MTBfMC5jCmluZGV4IDBhMTFkNzhkMWZiMi4uY2IzZjYxODczYmFhIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9nbWNfdjEwXzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2FtZGdwdS9nbWNfdjEwXzAuYwpAQCAtNTM5LDE3ICs1MzksNiBAQCBzdGF0aWMgdm9pZCBn bWNfdjEwXzBfdnJhbV9ndHRfbG9jYXRpb24oc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAg Ki8KIHN0YXRpYyBpbnQgZ21jX3YxMF8wX21jX2luaXQoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFk ZXYpCiB7Ci0JaW50IGNoYW5zaXplLCBudW1jaGFuOwotCi0JaWYgKCFhbWRncHVfZW11X21vZGUp Ci0JCWFkZXYtPmdtYy52cmFtX3dpZHRoID0gYW1kZ3B1X2F0b21maXJtd2FyZV9nZXRfdnJhbV93 aWR0aChhZGV2KTsKLQllbHNlIHsKLQkJLyogaGFyZCBjb2RlIHZyYW1fd2lkdGggZm9yIGVtdWxh dGlvbiAqLwotCQljaGFuc2l6ZSA9IDEyODsKLQkJbnVtY2hhbiA9IDE7Ci0JCWFkZXYtPmdtYy52 cmFtX3dpZHRoID0gbnVtY2hhbiAqIGNoYW5zaXplOwotCX0KLQogCS8qIENvdWxkIGFwZXIgc2l6 ZSByZXBvcnQgMCA/ICovCiAJYWRldi0+Z21jLmFwZXJfYmFzZSA9IHBjaV9yZXNvdXJjZV9zdGFy dChhZGV2LT5wZGV2LCAwKTsKIAlhZGV2LT5nbWMuYXBlcl9zaXplID0gcGNpX3Jlc291cmNlX2xl bihhZGV2LT5wZGV2LCAwKTsKQEAgLTYzNSw3ICs2MjQsNyBAQCBzdGF0aWMgdW5zaWduZWQgZ21j X3YxMF8wX2dldF92Ymlvc19mYl9zaXplKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCiBz dGF0aWMgaW50IGdtY192MTBfMF9zd19pbml0KHZvaWQgKmhhbmRsZSkKIHsKLQlpbnQgcjsKKwlp bnQgciwgdnJhbV93aWR0aCA9IDAsIHZyYW1fdHlwZSA9IDA7CiAJc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYgPSAoc3RydWN0IGFtZGdwdV9kZXZpY2UgKiloYW5kbGU7CiAKIAlnZnhodWJfdjJf MF9pbml0KGFkZXYpOwpAQCAtNjQzLDcgKzYzMiwxMyBAQCBzdGF0aWMgaW50IGdtY192MTBfMF9z d19pbml0KHZvaWQgKmhhbmRsZSkKIAogCXNwaW5fbG9ja19pbml0KCZhZGV2LT5nbWMuaW52YWxp ZGF0ZV9sb2NrKTsKIAotCWFkZXYtPmdtYy52cmFtX3R5cGUgPSBhbWRncHVfYXRvbWZpcm13YXJl X2dldF92cmFtX3R5cGUoYWRldik7CisJciA9IGFtZGdwdV9hdG9tZmlybXdhcmVfZ2V0X3ZyYW1f aW5mbyhhZGV2LCAmdnJhbV93aWR0aCwgJnZyYW1fdHlwZSk7CisJaWYgKCFhbWRncHVfZW11X21v ZGUpCisJCWFkZXYtPmdtYy52cmFtX3dpZHRoID0gdnJhbV93aWR0aDsKKwllbHNlCisJCWFkZXYt PmdtYy52cmFtX3dpZHRoID0gMSAqIDEyODsgLyogbnVtY2hhbiAqIGNoYW5zaXplICovCisKKwlh ZGV2LT5nbWMudnJhbV90eXBlID0gdnJhbV90eXBlOwogCXN3aXRjaCAoYWRldi0+YXNpY190eXBl KSB7CiAJY2FzZSBDSElQX05BVkkxMDoKIAljYXNlIENISVBfTkFWSTE0OgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y5XzAuYyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2dtY192OV8wLmMKaW5kZXggNjEwMmRlYWEwM2NhLi5iNDQ1MWE1ODc0M2MgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2dtY192OV8wLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvZ21jX3Y5XzAuYwpAQCAtODk1LDMwICs4OTUsOCBAQCBz dGF0aWMgdm9pZCBnbWNfdjlfMF92cmFtX2d0dF9sb2NhdGlvbihzdHJ1Y3QgYW1kZ3B1X2Rldmlj ZSAqYWRldiwKICAqLwogc3RhdGljIGludCBnbWNfdjlfMF9tY19pbml0KHN0cnVjdCBhbWRncHVf ZGV2aWNlICphZGV2KQogewotCWludCBjaGFuc2l6ZSwgbnVtY2hhbjsKIAlpbnQgcjsKIAotCWlm IChhbWRncHVfc3Jpb3ZfdmYoYWRldikpIHsKLQkJLyogRm9yIFZlZ2ExMCBTUi1JT1YsIHZyYW1f d2lkdGggY2FuJ3QgYmUgcmVhZCBmcm9tIEFUT00gYXMgUkFWRU4sCi0JCSAqIGFuZCBERiByZWxh dGVkIHJlZ2lzdGVycyBpcyBub3QgcmVhZGFibGUsIHNlZW1zIGhhcmRjb3JkIGlzIHRoZQotCQkg KiBvbmx5IHdheSB0byBzZXQgdGhlIGNvcnJlY3QgdnJhbV93aWR0aAotCQkgKi8KLQkJYWRldi0+ Z21jLnZyYW1fd2lkdGggPSAyMDQ4OwotCX0gZWxzZSBpZiAoYW1kZ3B1X2VtdV9tb2RlICE9IDEp IHsKLQkJYWRldi0+Z21jLnZyYW1fd2lkdGggPSBhbWRncHVfYXRvbWZpcm13YXJlX2dldF92cmFt X3dpZHRoKGFkZXYpOwotCX0KLQotCWlmICghYWRldi0+Z21jLnZyYW1fd2lkdGgpIHsKLQkJLyog aGJtIG1lbW9yeSBjaGFubmVsIHNpemUgKi8KLQkJaWYgKGFkZXYtPmZsYWdzICYgQU1EX0lTX0FQ VSkKLQkJCWNoYW5zaXplID0gNjQ7Ci0JCWVsc2UKLQkJCWNoYW5zaXplID0gMTI4OwotCi0JCW51 bWNoYW4gPSBhZGV2LT5kZl9mdW5jcy0+Z2V0X2hibV9jaGFubmVsX251bWJlcihhZGV2KTsKLQkJ YWRldi0+Z21jLnZyYW1fd2lkdGggPSBudW1jaGFuICogY2hhbnNpemU7Ci0JfQotCiAJLyogc2l6 ZSBpbiBNQiBvbiBzaSAqLwogCWFkZXYtPmdtYy5tY192cmFtX3NpemUgPQogCQlhZGV2LT5uYmlv LmZ1bmNzLT5nZXRfbWVtc2l6ZShhZGV2KSAqIDEwMjRVTEwgKiAxMDI0VUxMOwpAQCAtMTAzMyw3 ICsxMDExLDcgQEAgc3RhdGljIHVuc2lnbmVkIGdtY192OV8wX2dldF92Ymlvc19mYl9zaXplKHN0 cnVjdCBhbWRncHVfZGV2aWNlICphZGV2KQogCiBzdGF0aWMgaW50IGdtY192OV8wX3N3X2luaXQo dm9pZCAqaGFuZGxlKQogewotCWludCByOworCWludCByLCB2cmFtX3dpZHRoID0gMCwgdnJhbV90 eXBlID0gMDsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IChzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqKWhhbmRsZTsKIAogCWdmeGh1Yl92MV8wX2luaXQoYWRldik7CkBAIC0xMDQ0LDcgKzEw MjIsMzAgQEAgc3RhdGljIGludCBnbWNfdjlfMF9zd19pbml0KHZvaWQgKmhhbmRsZSkKIAogCXNw aW5fbG9ja19pbml0KCZhZGV2LT5nbWMuaW52YWxpZGF0ZV9sb2NrKTsKIAotCWFkZXYtPmdtYy52 cmFtX3R5cGUgPSBhbWRncHVfYXRvbWZpcm13YXJlX2dldF92cmFtX3R5cGUoYWRldik7CisJciA9 IGFtZGdwdV9hdG9tZmlybXdhcmVfZ2V0X3ZyYW1faW5mbyhhZGV2LCAmdnJhbV93aWR0aCwgJnZy YW1fdHlwZSk7CisJaWYgKGFtZGdwdV9zcmlvdl92ZihhZGV2KSkKKwkJLyogRm9yIFZlZ2ExMCBT Ui1JT1YsIHZyYW1fd2lkdGggY2FuJ3QgYmUgcmVhZCBmcm9tIEFUT00gYXMgUkFWRU4sCisJCSAq IGFuZCBERiByZWxhdGVkIHJlZ2lzdGVycyBpcyBub3QgcmVhZGFibGUsIHNlZW1zIGhhcmRjb3Jk IGlzIHRoZQorCQkgKiBvbmx5IHdheSB0byBzZXQgdGhlIGNvcnJlY3QgdnJhbV93aWR0aAorCQkg Ki8KKwkJYWRldi0+Z21jLnZyYW1fd2lkdGggPSAyMDQ4OworCWVsc2UgaWYgKGFtZGdwdV9lbXVf bW9kZSAhPSAxKQorCQlhZGV2LT5nbWMudnJhbV93aWR0aCA9IHZyYW1fd2lkdGg7CisKKwlpZiAo IWFkZXYtPmdtYy52cmFtX3dpZHRoKSB7CisJCWludCBjaGFuc2l6ZSwgbnVtY2hhbjsKKworCQkv KiBoYm0gbWVtb3J5IGNoYW5uZWwgc2l6ZSAqLworCQlpZiAoYWRldi0+ZmxhZ3MgJiBBTURfSVNf QVBVKQorCQkJY2hhbnNpemUgPSA2NDsKKwkJZWxzZQorCQkJY2hhbnNpemUgPSAxMjg7CisKKwkJ bnVtY2hhbiA9IGFkZXYtPmRmX2Z1bmNzLT5nZXRfaGJtX2NoYW5uZWxfbnVtYmVyKGFkZXYpOwor CQlhZGV2LT5nbWMudnJhbV93aWR0aCA9IG51bWNoYW4gKiBjaGFuc2l6ZTsKKwl9CisKKwlhZGV2 LT5nbWMudnJhbV90eXBlID0gdnJhbV90eXBlOwogCXN3aXRjaCAoYWRldi0+YXNpY190eXBlKSB7 CiAJY2FzZSBDSElQX1JBVkVOOgogCQlhZGV2LT5udW1fdm1odWJzID0gMjsKLS0gCjIuMjAuMQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBt YWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4