From: "Russell, Kent" Subject: [PATCH] drm/amdgpu: Add sysfs files for returning VRAM/GTT info Date: Thu, 28 Feb 2019 15:32:55 +0000 Message-ID: <20190228153244.32641-1-kent.russell@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Language: en-US 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: "Russell, Kent" QWRkIDMgZmlsZXMgdGhhdCByZXR1cm46ClRoZSB0b3RhbCBhbW91bnQgb2YgVlJBTSBhbmQgdGhl IGN1cnJlbnQgdG90YWwgdXNlZCBWUkFNClRoZSB0b3RhbCBhbW91bnQgb2YgVlJBTSBhbmQgdGhl IGN1cnJlbnQgdG90YWwgdXNlZCB2aXNpYmxlIFZSQU0KVGhlIHRvdGFsIEdUVCBzaXplIGFuZCB0 aGUgY3VycmVudCB0b3RhbCBvZiB1c2VkIEdUVAoKRWFjaCByZXR1cm5zIDIgaW50ZWdlcnMsIHRv dGFsIGFuZCB1c2VkLCBpbiBieXRlcwoKQ2hhbmdlLUlkOiBJMGJkNzAyYjE2NmI0MjUzODg3ZWY3 NmZiMWJiYThiOWFhZGM3ZTJjNQpTaWduZWQtb2ZmLWJ5OiBLZW50IFJ1c3NlbGwgPGtlbnQucnVz c2VsbEBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9ndHRf bWdyLmMgIHwgMzYgKysrKysrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw dV92cmFtX21nci5jIHwgNjcgKysrKysrKysrKysrKysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwg MTAzIGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfZ3R0X21nci5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2d0 dF9tZ3IuYwppbmRleCBkYTdiMWI5MmQ5Y2YuLmFkZmEyMTFjNTE1MiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2d0dF9tZ3IuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZ3R0X21nci5jCkBAIC0zNiw2ICszNiwzMCBAQCBzdHJ1 Y3QgYW1kZ3B1X2d0dF9ub2RlIHsKIAlzdHJ1Y3QgdHRtX2J1ZmZlcl9vYmplY3QgKnRibzsKIH07 CiAKKy8qKgorICogRE9DOiBtZW1faW5mb19ndHQKKyAqCisgKiBUaGUgYW1kZ3B1IGRyaXZlciBw cm92aWRlcyBhIHN5c2ZzIEFQSSBmb3IgcmVwb3J0aW5nIGN1cnJlbnQgR1RUIGluZm9ybWF0aW9u CisgKiBUaGUgZmlsZSBtZW1faW5mb19ndHQgaXMgdXNlZCBmb3IgdGhpcy4KKyAqIFRoZSBmaWxl IHJldHVybnMgdGhlIHRvdGFsIHNpemUgb2YgdGhlIEdUVCBibG9jayBhbmQgdGhlIGN1cnJlbnQg YW1vdW50IG9mCisgKiB1c2VkIEdUVCBhcyAyIHNlcGFyYXRlIGludGVnZXJzLCBpbiBieXRlcwor ICovCitzdGF0aWMgc3NpemVfdCBhbWRncHVfbWVtX2luZm9fZ3R0X3Nob3coc3RydWN0IGRldmlj ZSAqZGV2LAorCQlzdHJ1Y3QgZGV2aWNlX2F0dHJpYnV0ZSAqYXR0ciwgY2hhciAqYnVmKQorewor CXN0cnVjdCBkcm1fZGV2aWNlICpkZGV2ID0gZGV2X2dldF9kcnZkYXRhKGRldik7CisJc3RydWN0 IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSBkZGV2LT5kZXZfcHJpdmF0ZTsKKwl1aW50NjRfdCB1c2Vk X2d0dCwgdG90YWxfZ3R0OworCisJdXNlZF9ndHQgPSBhbWRncHVfZ3R0X21ncl91c2FnZSgmYWRl di0+bW1hbi5iZGV2Lm1hbltUVE1fUExfVFRdKTsKKwl0b3RhbF9ndHQgPSAoYWRldi0+bW1hbi5i ZGV2Lm1hbltUVE1fUExfVFRdLnNpemUpICogUEFHRV9TSVpFOworCisJcmV0dXJuIHNucHJpbnRm KGJ1ZiwgUEFHRV9TSVpFLCAiJWxsdSAlbGx1XG4iLAorCQkJICAgICAgdG90YWxfZ3R0LCB1c2Vk X2d0dCk7Cit9CisKK3N0YXRpYyBERVZJQ0VfQVRUUihtZW1faW5mb19ndHQsIFNfSVJVR08sIGFt ZGdwdV9tZW1faW5mb19ndHRfc2hvdywgTlVMTCk7CisKIC8qKgogICogYW1kZ3B1X2d0dF9tZ3Jf aW5pdCAtIGluaXQgR1RUIG1hbmFnZXIgYW5kIERSTSBNTQogICoKQEAgLTUwLDYgKzc0LDcgQEAg c3RhdGljIGludCBhbWRncHVfZ3R0X21ncl9pbml0KHN0cnVjdCB0dG1fbWVtX3R5cGVfbWFuYWdl ciAqbWFuLAogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gYW1kZ3B1X3R0bV9hZGV2KG1h bi0+YmRldik7CiAJc3RydWN0IGFtZGdwdV9ndHRfbWdyICptZ3I7CiAJdWludDY0X3Qgc3RhcnQs IHNpemU7CisJaW50IHJldDsKIAogCW1nciA9IGt6YWxsb2Moc2l6ZW9mKCptZ3IpLCBHRlBfS0VS TkVMKTsKIAlpZiAoIW1ncikKQEAgLTYxLDYgKzg2LDEzIEBAIHN0YXRpYyBpbnQgYW1kZ3B1X2d0 dF9tZ3JfaW5pdChzdHJ1Y3QgdHRtX21lbV90eXBlX21hbmFnZXIgKm1hbiwKIAlzcGluX2xvY2tf aW5pdCgmbWdyLT5sb2NrKTsKIAlhdG9taWM2NF9zZXQoJm1nci0+YXZhaWxhYmxlLCBwX3NpemUp OwogCW1hbi0+cHJpdiA9IG1ncjsKKworCXJldCA9IGRldmljZV9jcmVhdGVfZmlsZShhZGV2LT5k ZXYsICZkZXZfYXR0cl9tZW1faW5mb19ndHQpOworCWlmIChyZXQpIHsKKwkJRFJNX0VSUk9SKCJG YWlsZWQgdG8gY3JlYXRlIGRldmljZSBmaWxlIG1lbV9pbmZvX2d0dFxuIik7CisJCXJldHVybiBy ZXQ7CisJfQorCiAJcmV0dXJuIDA7CiB9CiAKQEAgLTc0LDEyICsxMDYsMTYgQEAgc3RhdGljIGlu dCBhbWRncHVfZ3R0X21ncl9pbml0KHN0cnVjdCB0dG1fbWVtX3R5cGVfbWFuYWdlciAqbWFuLAog ICovCiBzdGF0aWMgaW50IGFtZGdwdV9ndHRfbWdyX2Zpbmkoc3RydWN0IHR0bV9tZW1fdHlwZV9t YW5hZ2VyICptYW4pCiB7CisJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSBhbWRncHVfdHRt X2FkZXYobWFuLT5iZGV2KTsKIAlzdHJ1Y3QgYW1kZ3B1X2d0dF9tZ3IgKm1nciA9IG1hbi0+cHJp djsKIAlzcGluX2xvY2soJm1nci0+bG9jayk7CiAJZHJtX21tX3Rha2Vkb3duKCZtZ3ItPm1tKTsK IAlzcGluX3VubG9jaygmbWdyLT5sb2NrKTsKIAlrZnJlZShtZ3IpOwogCW1hbi0+cHJpdiA9IE5V TEw7CisKKwlkZXZpY2VfcmVtb3ZlX2ZpbGUoYWRldi0+ZGV2LCAmZGV2X2F0dHJfbWVtX2luZm9f Z3R0KTsKKwogCXJldHVybiAwOwogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9hbWRncHVfdnJhbV9tZ3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Ft ZGdwdV92cmFtX21nci5jCmluZGV4IDNmOWQ1ZDAwYzliMy4uZDBiYWRhOTk3Y2JhIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdnJhbV9tZ3IuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfdnJhbV9tZ3IuYwpAQCAtMzIsNiArMzIs NTUgQEAgc3RydWN0IGFtZGdwdV92cmFtX21nciB7CiAJYXRvbWljNjRfdCB2aXNfdXNhZ2U7CiB9 OwogCisvKioKKyAqIERPQzogbWVtX2luZm9fdnJhbQorICoKKyAqIFRoZSBhbWRncHUgZHJpdmVy IHByb3ZpZGVzIGEgc3lzZnMgQVBJIGZvciByZXBvcnRpbmcgY3VycmVudCBWUkFNIGluZm9ybWF0 aW9uCisgKiBUaGUgZmlsZSBtZW1faW5mb192cmFtIGlzIHVzZWQgZm9yIHRoaXMuCisgKiBUaGUg ZmlsZSByZXR1cm5zIHRoZSB0b3RhbCBhbW91bnQgb2YgVlJBTSBhbmQgdGhlIGN1cnJlbnQgdG90 YWwgYW1vdW50IG9mCisgKiB1c2VkIFZSQU0gYXMgMiBzZXBhcmF0ZSBpbnRlZ2VycywgaW4gYnl0 ZXMKKyAqLworc3RhdGljIHNzaXplX3QgYW1kZ3B1X21lbV9pbmZvX3ZyYW1fc2hvdyhzdHJ1Y3Qg ZGV2aWNlICpkZXYsCisJCXN0cnVjdCBkZXZpY2VfYXR0cmlidXRlICphdHRyLCBjaGFyICpidWYp Cit7CisJc3RydWN0IGRybV9kZXZpY2UgKmRkZXYgPSBkZXZfZ2V0X2RydmRhdGEoZGV2KTsKKwlz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IGRkZXYtPmRldl9wcml2YXRlOworCXVpbnQ2NF90 IHVzZWRfdnJhbSwgdG90YWxfdnJhbTsKKworCXVzZWRfdnJhbSA9IGFtZGdwdV92cmFtX21ncl91 c2FnZSgmYWRldi0+bW1hbi5iZGV2Lm1hbltUVE1fUExfVlJBTV0pOworCXRvdGFsX3ZyYW0gPSBh ZGV2LT5nbWMucmVhbF92cmFtX3NpemU7CisKKwlyZXR1cm4gc25wcmludGYoYnVmLCBQQUdFX1NJ WkUsICIlbGx1ICVsbHVcbiIsIHRvdGFsX3ZyYW0sIHVzZWRfdnJhbSk7Cit9CisKKy8qKgorICog RE9DOiBtZW1faW5mb192aXNfdnJhbQorICoKKyAqIFRoZSBhbWRncHUgZHJpdmVyIHByb3ZpZGVz IGEgc3lzZnMgQVBJIGZvciByZXBvcnRpbmcgY3VycmVudCB2aXNpYmxlIFZSQU0KKyAqIGluZm9y bWF0aW9uCisgKiBUaGUgZmlsZSBtZW1faW5mb192aXNfdnJhbSBpcyB1c2VkIGZvciB0aGlzLgor ICogVGhlIGZpbGUgcmV0dXJucyB0aGUgdG90YWwgYW1vdW50IG9mIFZSQU0gYW5kIHRoZSBjdXJy ZW50IHRvdGFsIGFtb3VudCBvZgorICogdXNlZCB2aXNpYmxlIFZSQU0gYXMgMiBzZXBhcmF0ZSBp bnRlZ2VycywgaW4gYnl0ZXMKKyAqLworc3RhdGljIHNzaXplX3QgYW1kZ3B1X21lbV9pbmZvX3Zp c192cmFtX3Nob3coc3RydWN0IGRldmljZSAqZGV2LAorCQlzdHJ1Y3QgZGV2aWNlX2F0dHJpYnV0 ZSAqYXR0ciwgY2hhciAqYnVmKQoreworCXN0cnVjdCBkcm1fZGV2aWNlICpkZGV2ID0gZGV2X2dl dF9kcnZkYXRhKGRldik7CisJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSBkZGV2LT5kZXZf cHJpdmF0ZTsKKwl1aW50NjRfdCB1c2VkX3Zpc192cmFtLCB0b3RhbF92cmFtOworCisJdXNlZF92 aXNfdnJhbSA9CisJCWFtZGdwdV92cmFtX21ncl92aXNfdXNhZ2UoJmFkZXYtPm1tYW4uYmRldi5t YW5bVFRNX1BMX1ZSQU1dKTsKKwl0b3RhbF92cmFtID0gYWRldi0+Z21jLnJlYWxfdnJhbV9zaXpl OworCisJcmV0dXJuIHNucHJpbnRmKGJ1ZiwgUEFHRV9TSVpFLCAiJWxsdSAlbGx1XG4iLAorCQkJ dG90YWxfdnJhbSwgdXNlZF92aXNfdnJhbSk7Cit9CisKK3N0YXRpYyBERVZJQ0VfQVRUUihtZW1f aW5mb192cmFtLCBTX0lSVUdPLCBhbWRncHVfbWVtX2luZm9fdnJhbV9zaG93LCBOVUxMKTsKK3N0 YXRpYyBERVZJQ0VfQVRUUihtZW1faW5mb192aXNfdnJhbSwgU19JUlVHTywgYW1kZ3B1X21lbV9p bmZvX3Zpc192cmFtX3Nob3csCisJCSAgIE5VTEwpOworCiAvKioKICAqIGFtZGdwdV92cmFtX21n cl9pbml0IC0gaW5pdCBWUkFNIG1hbmFnZXIgYW5kIERSTSBNTQogICoKQEAgLTQzLDcgKzkyLDkg QEAgc3RydWN0IGFtZGdwdV92cmFtX21nciB7CiBzdGF0aWMgaW50IGFtZGdwdV92cmFtX21ncl9p bml0KHN0cnVjdCB0dG1fbWVtX3R5cGVfbWFuYWdlciAqbWFuLAogCQkJCXVuc2lnbmVkIGxvbmcg cF9zaXplKQogeworCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gYW1kZ3B1X3R0bV9hZGV2 KG1hbi0+YmRldik7CiAJc3RydWN0IGFtZGdwdV92cmFtX21nciAqbWdyOworCWludCByZXQ7CiAK IAltZ3IgPSBremFsbG9jKHNpemVvZigqbWdyKSwgR0ZQX0tFUk5FTCk7CiAJaWYgKCFtZ3IpCkBA IC01Miw2ICsxMDMsMTkgQEAgc3RhdGljIGludCBhbWRncHVfdnJhbV9tZ3JfaW5pdChzdHJ1Y3Qg dHRtX21lbV90eXBlX21hbmFnZXIgKm1hbiwKIAlkcm1fbW1faW5pdCgmbWdyLT5tbSwgMCwgcF9z aXplKTsKIAlzcGluX2xvY2tfaW5pdCgmbWdyLT5sb2NrKTsKIAltYW4tPnByaXYgPSBtZ3I7CisK KwkvKiBBZGQgdGhlIHR3byBWUkFNLXJlbGF0ZWQgc3lzZnMgZmlsZXMgKi8KKwlyZXQgPSBkZXZp Y2VfY3JlYXRlX2ZpbGUoYWRldi0+ZGV2LCAmZGV2X2F0dHJfbWVtX2luZm9fdnJhbSk7CisJaWYg KHJldCkgeworCQlEUk1fRVJST1IoIkZhaWxlZCB0byBjcmVhdGUgZGV2aWNlIGZpbGUgbWVtX2lu Zm9fdnJhbVxuIik7CisJCXJldHVybiByZXQ7CisJfQorCXJldCA9IGRldmljZV9jcmVhdGVfZmls ZShhZGV2LT5kZXYsICZkZXZfYXR0cl9tZW1faW5mb192aXNfdnJhbSk7CisJaWYgKHJldCkgewor CQlEUk1fRVJST1IoIkZhaWxlZCB0byBjcmVhdGUgZGV2aWNlIGZpbGUgbWVtX2luZm9fdmlzX3Zy YW1cbiIpOworCQlyZXR1cm4gcmV0OworCX0KKwogCXJldHVybiAwOwogfQogCkBAIC02NSw2ICsx MjksNyBAQCBzdGF0aWMgaW50IGFtZGdwdV92cmFtX21ncl9pbml0KHN0cnVjdCB0dG1fbWVtX3R5 cGVfbWFuYWdlciAqbWFuLAogICovCiBzdGF0aWMgaW50IGFtZGdwdV92cmFtX21ncl9maW5pKHN0 cnVjdCB0dG1fbWVtX3R5cGVfbWFuYWdlciAqbWFuKQogeworCXN0cnVjdCBhbWRncHVfZGV2aWNl ICphZGV2ID0gYW1kZ3B1X3R0bV9hZGV2KG1hbi0+YmRldik7CiAJc3RydWN0IGFtZGdwdV92cmFt X21nciAqbWdyID0gbWFuLT5wcml2OwogCiAJc3Bpbl9sb2NrKCZtZ3ItPmxvY2spOwpAQCAtNzIs NiArMTM3LDggQEAgc3RhdGljIGludCBhbWRncHVfdnJhbV9tZ3JfZmluaShzdHJ1Y3QgdHRtX21l bV90eXBlX21hbmFnZXIgKm1hbikKIAlzcGluX3VubG9jaygmbWdyLT5sb2NrKTsKIAlrZnJlZSht Z3IpOwogCW1hbi0+cHJpdiA9IE5VTEw7CisJZGV2aWNlX3JlbW92ZV9maWxlKGFkZXYtPmRldiwg JmRldl9hdHRyX21lbV9pbmZvX3ZyYW0pOworCWRldmljZV9yZW1vdmVfZmlsZShhZGV2LT5kZXYs ICZkZXZfYXR0cl9tZW1faW5mb192aXNfdnJhbSk7CiAJcmV0dXJuIDA7CiB9CiAKLS0gCjIuMTcu MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdm eCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4