From: Felix Kuehling Subject: [PATCH 1/6] drm/amdkfd: Consolidate duplicate memory banks info in topology Date: Thu, 12 Jul 2018 17:24:49 -0400 Message-ID: <1531430694-23966-2-git-send-email-Felix.Kuehling@amd.com> References: <1531430694-23966-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: <1531430694-23966-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 ZyA8RmVsaXguS3VlaGxpbmdAYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtm ZC9rZmRfY3JhdC5jIHwgNTcgKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCA0NiBpbnNlcnRpb25zKCspLCAxMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfY3JhdC5jIGIvZHJpdmVycy9ncHUv ZHJtL2FtZC9hbWRrZmQva2ZkX2NyYXQuYwppbmRleCAyOTZiM2YyLi5lZTQ5OTYwIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfY3JhdC5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1ka2ZkL2tmZF9jcmF0LmMKQEAgLTE4OSw2ICsxODksMjEgQEAgc3RhdGlj IGludCBrZmRfcGFyc2Vfc3VidHlwZV9jdShzdHJ1Y3QgY3JhdF9zdWJ0eXBlX2NvbXB1dGV1bml0 ICpjdSwKIAlyZXR1cm4gMDsKIH0KIAorc3RhdGljIHN0cnVjdCBrZmRfbWVtX3Byb3BlcnRpZXMg KgorZmluZF9zdWJ0eXBlX21lbSh1aW50MzJfdCBoZWFwX3R5cGUsIHVpbnQzMl90IGZsYWdzLCB1 aW50MzJfdCB3aWR0aCwKKwkJc3RydWN0IGtmZF90b3BvbG9neV9kZXZpY2UgKmRldikKK3sKKwlz dHJ1Y3Qga2ZkX21lbV9wcm9wZXJ0aWVzICpwcm9wczsKKworCWxpc3RfZm9yX2VhY2hfZW50cnko cHJvcHMsICZkZXYtPm1lbV9wcm9wcywgbGlzdCkgeworCQlpZiAocHJvcHMtPmhlYXBfdHlwZSA9 PSBoZWFwX3R5cGUKKwkJCQkmJiBwcm9wcy0+ZmxhZ3MgPT0gZmxhZ3MKKwkJCQkmJiBwcm9wcy0+ d2lkdGggPT0gd2lkdGgpCisJCQlyZXR1cm4gcHJvcHM7CisJfQorCisJcmV0dXJuIE5VTEw7Cit9 CiAvKiBrZmRfcGFyc2Vfc3VidHlwZV9tZW0gLSBwYXJzZSBtZW1vcnkgc3VidHlwZXMgYW5kIGF0 dGFjaCBpdCB0byBjb3JyZWN0CiAgKiB0b3BvbG9neSBkZXZpY2UgcHJlc2VudCBpbiB0aGUgZGV2 aWNlX2xpc3QKICAqLwpAQCAtMTk3LDM2ICsyMTIsNTYgQEAgc3RhdGljIGludCBrZmRfcGFyc2Vf c3VidHlwZV9tZW0oc3RydWN0IGNyYXRfc3VidHlwZV9tZW1vcnkgKm1lbSwKIHsKIAlzdHJ1Y3Qg a2ZkX21lbV9wcm9wZXJ0aWVzICpwcm9wczsKIAlzdHJ1Y3Qga2ZkX3RvcG9sb2d5X2RldmljZSAq ZGV2OworCXVpbnQzMl90IGhlYXBfdHlwZTsKKwl1aW50NjRfdCBzaXplX2luX2J5dGVzOworCXVp bnQzMl90IGZsYWdzID0gMDsKKwl1aW50MzJfdCB3aWR0aDsKIAogCXByX2RlYnVnKCJGb3VuZCBt ZW1vcnkgZW50cnkgaW4gQ1JBVCB0YWJsZSB3aXRoIHByb3hpbWl0eV9kb21haW49JWRcbiIsCiAJ CQltZW0tPnByb3hpbWl0eV9kb21haW4pOwogCWxpc3RfZm9yX2VhY2hfZW50cnkoZGV2LCBkZXZp Y2VfbGlzdCwgbGlzdCkgewogCQlpZiAobWVtLT5wcm94aW1pdHlfZG9tYWluID09IGRldi0+cHJv eGltaXR5X2RvbWFpbikgewotCQkJcHJvcHMgPSBrZmRfYWxsb2Nfc3RydWN0KHByb3BzKTsKLQkJ CWlmICghcHJvcHMpCi0JCQkJcmV0dXJuIC1FTk9NRU07Ci0KIAkJCS8qIFdlJ3JlIG9uIEdQVSBu b2RlICovCiAJCQlpZiAoZGV2LT5ub2RlX3Byb3BzLmNwdV9jb3Jlc19jb3VudCA9PSAwKSB7CiAJ CQkJLyogQVBVICovCiAJCQkJaWYgKG1lbS0+dmlzaWJpbGl0eV90eXBlID09IDApCi0JCQkJCXBy b3BzLT5oZWFwX3R5cGUgPQorCQkJCQloZWFwX3R5cGUgPQogCQkJCQkJSFNBX01FTV9IRUFQX1RZ UEVfRkJfUFJJVkFURTsKIAkJCQkvKiBkR1BVICovCiAJCQkJZWxzZQotCQkJCQlwcm9wcy0+aGVh cF90eXBlID0gbWVtLT52aXNpYmlsaXR5X3R5cGU7CisJCQkJCWhlYXBfdHlwZSA9IG1lbS0+dmlz aWJpbGl0eV90eXBlOwogCQkJfSBlbHNlCi0JCQkJcHJvcHMtPmhlYXBfdHlwZSA9IEhTQV9NRU1f SEVBUF9UWVBFX1NZU1RFTTsKKwkJCQloZWFwX3R5cGUgPSBIU0FfTUVNX0hFQVBfVFlQRV9TWVNU RU07CiAKIAkJCWlmIChtZW0tPmZsYWdzICYgQ1JBVF9NRU1fRkxBR1NfSE9UX1BMVUdHQUJMRSkK LQkJCQlwcm9wcy0+ZmxhZ3MgfD0gSFNBX01FTV9GTEFHU19IT1RfUExVR0dBQkxFOworCQkJCWZs YWdzIHw9IEhTQV9NRU1fRkxBR1NfSE9UX1BMVUdHQUJMRTsKIAkJCWlmIChtZW0tPmZsYWdzICYg Q1JBVF9NRU1fRkxBR1NfTk9OX1ZPTEFUSUxFKQotCQkJCXByb3BzLT5mbGFncyB8PSBIU0FfTUVN X0ZMQUdTX05PTl9WT0xBVElMRTsKKwkJCQlmbGFncyB8PSBIU0FfTUVNX0ZMQUdTX05PTl9WT0xB VElMRTsKIAotCQkJcHJvcHMtPnNpemVfaW5fYnl0ZXMgPQorCQkJc2l6ZV9pbl9ieXRlcyA9CiAJ CQkJKCh1aW50NjRfdCltZW0tPmxlbmd0aF9oaWdoIDw8IDMyKSArCiAJCQkJCQkJbWVtLT5sZW5n dGhfbG93OwotCQkJcHJvcHMtPndpZHRoID0gbWVtLT53aWR0aDsKKwkJCXdpZHRoID0gbWVtLT53 aWR0aDsKKworCQkJLyogTXVsdGlwbGUgYmFua3Mgb2YgdGhlIHNhbWUgdHlwZSBhcmUgYWdncmVn YXRlZCBpbnRvCisJCQkgKiBvbmUuIFVzZXIgbW9kZSBkb2Vzbid0IGNhcmUgYWJvdXQgbXVsdGlw bGUgcGh5c2ljYWwKKwkJCSAqIG1lbW9yeSBzZWdtZW50cy4gSXQncyBtYW5hZ2VkIGFzIGEgc2lu Z2xlIHZpcnR1YWwKKwkJCSAqIGhlYXAgZm9yIHVzZXIgbW9kZS4KKwkJCSAqLworCQkJcHJvcHMg PSBmaW5kX3N1YnR5cGVfbWVtKGhlYXBfdHlwZSwgZmxhZ3MsIHdpZHRoLCBkZXYpOworCQkJaWYg KHByb3BzKSB7CisJCQkJcHJvcHMtPnNpemVfaW5fYnl0ZXMgKz0gc2l6ZV9pbl9ieXRlczsKKwkJ CQlicmVhazsKKwkJCX0KKworCQkJcHJvcHMgPSBrZmRfYWxsb2Nfc3RydWN0KHByb3BzKTsKKwkJ CWlmICghcHJvcHMpCisJCQkJcmV0dXJuIC1FTk9NRU07CisKKwkJCXByb3BzLT5oZWFwX3R5cGUg PSBoZWFwX3R5cGU7CisJCQlwcm9wcy0+ZmxhZ3MgPSBmbGFnczsKKwkJCXByb3BzLT5zaXplX2lu X2J5dGVzID0gc2l6ZV9pbl9ieXRlczsKKwkJCXByb3BzLT53aWR0aCA9IHdpZHRoOwogCiAJCQlk ZXYtPm5vZGVfcHJvcHMubWVtX2JhbmtzX2NvdW50Kys7CiAJCQlsaXN0X2FkZF90YWlsKCZwcm9w cy0+bGlzdCwgJmRldi0+bWVtX3Byb3BzKTsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2FtZC1nZngK