From: Felix Kuehling Subject: [PATCH 1/6] drm/amdkfd: Consolidate duplicate memory banks info in topology Date: Fri, 13 Jul 2018 16:17:43 -0400 Message-ID: <1531513068-3805-2-git-send-email-Felix.Kuehling@amd.com> References: <1531513068-3805-1-git-send-email-Felix.Kuehling@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1531513068-3805-1-git-send-email-Felix.Kuehling-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, oded.gabbay-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org Cc: Yong Zhao , Felix Kuehling RnJvbTogWW9uZyBaaGFvIDx5b25nLnpoYW9AYW1kLmNvbT4KCklmIHRoZXJlIGFyZSBzZXZlcmFs IG1lbW9yeSBiYW5rcyB0aGF0IGhhcyB0aGUgc2FtZSBwcm9wZXJ0aWVzIGluIENSQVQsCndlIGFn Z3JlZ2F0ZSB0aGVtIGludG8gb25lIG1lbW9yeSBiYW5rLiBUaGlzIGNsZWFucyB1cCBtZW1vcnkg YmFua3Mgb24KQVBVcyAoZS5nLiBSYXZlbikgd2hlcmUgdGhlIENSQVQgcmVwb3J0cyBlYWNoIG1l bW9yeSBjaGFubmVsIGFzIGEKc2VwYXJhdGUgYmFuay4gVGhpcyBvbmx5IGNvbmZ1c2VzIHVzZXIg bW9kZSwgd2hpY2ggb25seSBkZWFscyB3aXRoCnZpcnR1YWwgbWVtb3J5LgoKU2lnbmVkLW9mZi1i eTogWW9uZyBaaGFvIDx5b25nLnpoYW9AYW1kLmNvbT4KUmV2aWV3ZWQtYnk6IEZlbGl4IEt1ZWhs aW5nIDxGZWxpeC5LdWVobGluZ0BhbWQuY29tPgpTaWduZWQtb2ZmLWJ5OiBGZWxpeCBLdWVobGlu ZyA8RmVsaXguS3VlaGxpbmdAYW1kLmNvbT4KQWNrZWQtYnk6IEFsZXggRGV1Y2hlciA8YWxleGFu ZGVyLmRldWNoZXJAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRf Y3JhdC5jIHwgNTcgKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0KIDEgZmlsZSBj aGFuZ2VkLCA0NiBpbnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfY3JhdC5jIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRrZmQva2ZkX2NyYXQuYwppbmRleCAyOTZiM2YyLi5lZTQ5OTYwIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfY3JhdC5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvYW1ka2ZkL2tmZF9jcmF0LmMKQEAgLTE4OSw2ICsxODksMjEgQEAgc3RhdGljIGludCBr ZmRfcGFyc2Vfc3VidHlwZV9jdShzdHJ1Y3QgY3JhdF9zdWJ0eXBlX2NvbXB1dGV1bml0ICpjdSwK IAlyZXR1cm4gMDsKIH0KIAorc3RhdGljIHN0cnVjdCBrZmRfbWVtX3Byb3BlcnRpZXMgKgorZmlu ZF9zdWJ0eXBlX21lbSh1aW50MzJfdCBoZWFwX3R5cGUsIHVpbnQzMl90IGZsYWdzLCB1aW50MzJf dCB3aWR0aCwKKwkJc3RydWN0IGtmZF90b3BvbG9neV9kZXZpY2UgKmRldikKK3sKKwlzdHJ1Y3Qg a2ZkX21lbV9wcm9wZXJ0aWVzICpwcm9wczsKKworCWxpc3RfZm9yX2VhY2hfZW50cnkocHJvcHMs ICZkZXYtPm1lbV9wcm9wcywgbGlzdCkgeworCQlpZiAocHJvcHMtPmhlYXBfdHlwZSA9PSBoZWFw X3R5cGUKKwkJCQkmJiBwcm9wcy0+ZmxhZ3MgPT0gZmxhZ3MKKwkJCQkmJiBwcm9wcy0+d2lkdGgg PT0gd2lkdGgpCisJCQlyZXR1cm4gcHJvcHM7CisJfQorCisJcmV0dXJuIE5VTEw7Cit9CiAvKiBr ZmRfcGFyc2Vfc3VidHlwZV9tZW0gLSBwYXJzZSBtZW1vcnkgc3VidHlwZXMgYW5kIGF0dGFjaCBp dCB0byBjb3JyZWN0CiAgKiB0b3BvbG9neSBkZXZpY2UgcHJlc2VudCBpbiB0aGUgZGV2aWNlX2xp c3QKICAqLwpAQCAtMTk3LDM2ICsyMTIsNTYgQEAgc3RhdGljIGludCBrZmRfcGFyc2Vfc3VidHlw ZV9tZW0oc3RydWN0IGNyYXRfc3VidHlwZV9tZW1vcnkgKm1lbSwKIHsKIAlzdHJ1Y3Qga2ZkX21l bV9wcm9wZXJ0aWVzICpwcm9wczsKIAlzdHJ1Y3Qga2ZkX3RvcG9sb2d5X2RldmljZSAqZGV2Owor CXVpbnQzMl90IGhlYXBfdHlwZTsKKwl1aW50NjRfdCBzaXplX2luX2J5dGVzOworCXVpbnQzMl90 IGZsYWdzID0gMDsKKwl1aW50MzJfdCB3aWR0aDsKIAogCXByX2RlYnVnKCJGb3VuZCBtZW1vcnkg ZW50cnkgaW4gQ1JBVCB0YWJsZSB3aXRoIHByb3hpbWl0eV9kb21haW49JWRcbiIsCiAJCQltZW0t PnByb3hpbWl0eV9kb21haW4pOwogCWxpc3RfZm9yX2VhY2hfZW50cnkoZGV2LCBkZXZpY2VfbGlz dCwgbGlzdCkgewogCQlpZiAobWVtLT5wcm94aW1pdHlfZG9tYWluID09IGRldi0+cHJveGltaXR5 X2RvbWFpbikgewotCQkJcHJvcHMgPSBrZmRfYWxsb2Nfc3RydWN0KHByb3BzKTsKLQkJCWlmICgh cHJvcHMpCi0JCQkJcmV0dXJuIC1FTk9NRU07Ci0KIAkJCS8qIFdlJ3JlIG9uIEdQVSBub2RlICov CiAJCQlpZiAoZGV2LT5ub2RlX3Byb3BzLmNwdV9jb3Jlc19jb3VudCA9PSAwKSB7CiAJCQkJLyog QVBVICovCiAJCQkJaWYgKG1lbS0+dmlzaWJpbGl0eV90eXBlID09IDApCi0JCQkJCXByb3BzLT5o ZWFwX3R5cGUgPQorCQkJCQloZWFwX3R5cGUgPQogCQkJCQkJSFNBX01FTV9IRUFQX1RZUEVfRkJf UFJJVkFURTsKIAkJCQkvKiBkR1BVICovCiAJCQkJZWxzZQotCQkJCQlwcm9wcy0+aGVhcF90eXBl ID0gbWVtLT52aXNpYmlsaXR5X3R5cGU7CisJCQkJCWhlYXBfdHlwZSA9IG1lbS0+dmlzaWJpbGl0 eV90eXBlOwogCQkJfSBlbHNlCi0JCQkJcHJvcHMtPmhlYXBfdHlwZSA9IEhTQV9NRU1fSEVBUF9U WVBFX1NZU1RFTTsKKwkJCQloZWFwX3R5cGUgPSBIU0FfTUVNX0hFQVBfVFlQRV9TWVNURU07CiAK IAkJCWlmIChtZW0tPmZsYWdzICYgQ1JBVF9NRU1fRkxBR1NfSE9UX1BMVUdHQUJMRSkKLQkJCQlw cm9wcy0+ZmxhZ3MgfD0gSFNBX01FTV9GTEFHU19IT1RfUExVR0dBQkxFOworCQkJCWZsYWdzIHw9 IEhTQV9NRU1fRkxBR1NfSE9UX1BMVUdHQUJMRTsKIAkJCWlmIChtZW0tPmZsYWdzICYgQ1JBVF9N RU1fRkxBR1NfTk9OX1ZPTEFUSUxFKQotCQkJCXByb3BzLT5mbGFncyB8PSBIU0FfTUVNX0ZMQUdT X05PTl9WT0xBVElMRTsKKwkJCQlmbGFncyB8PSBIU0FfTUVNX0ZMQUdTX05PTl9WT0xBVElMRTsK IAotCQkJcHJvcHMtPnNpemVfaW5fYnl0ZXMgPQorCQkJc2l6ZV9pbl9ieXRlcyA9CiAJCQkJKCh1 aW50NjRfdCltZW0tPmxlbmd0aF9oaWdoIDw8IDMyKSArCiAJCQkJCQkJbWVtLT5sZW5ndGhfbG93 OwotCQkJcHJvcHMtPndpZHRoID0gbWVtLT53aWR0aDsKKwkJCXdpZHRoID0gbWVtLT53aWR0aDsK KworCQkJLyogTXVsdGlwbGUgYmFua3Mgb2YgdGhlIHNhbWUgdHlwZSBhcmUgYWdncmVnYXRlZCBp bnRvCisJCQkgKiBvbmUuIFVzZXIgbW9kZSBkb2Vzbid0IGNhcmUgYWJvdXQgbXVsdGlwbGUgcGh5 c2ljYWwKKwkJCSAqIG1lbW9yeSBzZWdtZW50cy4gSXQncyBtYW5hZ2VkIGFzIGEgc2luZ2xlIHZp cnR1YWwKKwkJCSAqIGhlYXAgZm9yIHVzZXIgbW9kZS4KKwkJCSAqLworCQkJcHJvcHMgPSBmaW5k X3N1YnR5cGVfbWVtKGhlYXBfdHlwZSwgZmxhZ3MsIHdpZHRoLCBkZXYpOworCQkJaWYgKHByb3Bz KSB7CisJCQkJcHJvcHMtPnNpemVfaW5fYnl0ZXMgKz0gc2l6ZV9pbl9ieXRlczsKKwkJCQlicmVh azsKKwkJCX0KKworCQkJcHJvcHMgPSBrZmRfYWxsb2Nfc3RydWN0KHByb3BzKTsKKwkJCWlmICgh cHJvcHMpCisJCQkJcmV0dXJuIC1FTk9NRU07CisKKwkJCXByb3BzLT5oZWFwX3R5cGUgPSBoZWFw X3R5cGU7CisJCQlwcm9wcy0+ZmxhZ3MgPSBmbGFnczsKKwkJCXByb3BzLT5zaXplX2luX2J5dGVz ID0gc2l6ZV9pbl9ieXRlczsKKwkJCXByb3BzLT53aWR0aCA9IHdpZHRoOwogCiAJCQlkZXYtPm5v ZGVfcHJvcHMubWVtX2JhbmtzX2NvdW50Kys7CiAJCQlsaXN0X2FkZF90YWlsKCZwcm9wcy0+bGlz dCwgJmRldi0+bWVtX3Byb3BzKTsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2FtZC1nZngK