From: Tom St Denis Subject: [PATCH umr 1/2] Tidy up formatting in new discovery code. Date: Tue, 4 Jul 2017 12:28:38 -0400 Message-ID: <20170704162839.26528-1-tom.stdenis@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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: Tom St Denis U2lnbmVkLW9mZi1ieTogVG9tIFN0IERlbmlzIDx0b20uc3RkZW5pc0BhbWQuY29tPgotLS0KIHNy Yy9saWIvZGlzY292ZXIuYyB8IDM2ICsrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0t LQogMSBmaWxlIGNoYW5nZWQsIDIzIGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL3NyYy9saWIvZGlzY292ZXIuYyBiL3NyYy9saWIvZGlzY292ZXIuYwppbmRleCBh OTVmZTU3YzliNGQuLjJmYWVkNzkzMzRlZSAxMDA2NDQKLS0tIGEvc3JjL2xpYi9kaXNjb3Zlci5j CisrKyBiL3NyYy9saWIvZGlzY292ZXIuYwpAQCAtNDcsMzYgKzQ3LDQ0IEBAIHN0YXRpYyBpbnQg aXNfZGlkX21hdGNoKHN0cnVjdCB1bXJfYXNpYyAqYXNpYywgdW5zaWduZWQgZGlkKQogCXJldHVy biByOwogfQogCi1zdGF0aWMgaW50IGZpbmRfcGNpX2luc3RhbmNlKGNvbnN0IGNoYXIqIHBjaV9z dHJpbmcpIHsKLQlESVIqIGRpcjsKK3N0YXRpYyBpbnQgZmluZF9wY2lfaW5zdGFuY2UoY29uc3Qg Y2hhciogcGNpX3N0cmluZykKK3sKKwlESVIgKmRpcjsKKwlzdHJ1Y3QgZGlyZW50ICpkaXJfZW50 cnk7CisKIAlkaXIgPSBvcGVuZGlyKCIvc3lzL2tlcm5lbC9kZWJ1Zy9kcmkiKTsKIAlpZiAoZGly ID09IE5VTEwpIHsKIAkJcGVycm9yKCJDb3VsZG4ndCBvcGVuIERSSSB1bmRlciBkZWJ1Z2ZzIik7 CiAJCXJldHVybiAtMTsKIAl9Ci0Jc3RydWN0IGRpcmVudCAqZGlyX2VudHJ5OworCiAJd2hpbGUg KChkaXJfZW50cnkgPSByZWFkZGlyKGRpcikpICE9IE5VTEwpIHsKIAkJY2hhciBkZXZpY2VbMjU2 XSwgbmFtZVsyNTZdOwogCQlpbnQgcGFyc2VkX2RldmljZTsKKwkJRklMRSAqZjsKKwogCQkvLyBp Z25vcmUgLiBhbmQgLi4KLQkJaWYgKHN0cmNtcChkaXJfZW50cnktPmRfbmFtZSwgIi4iKSA9PSAw IHx8IHN0cmNtcChkaXJfZW50cnktPmRfbmFtZSwKLQkJCSIuLiIpID09IDApIHsKKwkJaWYgKHN0 cmNtcChkaXJfZW50cnktPmRfbmFtZSwgIi4iKSA9PSAwIHx8CisJCSAgICBzdHJjbXAoZGlyX2Vu dHJ5LT5kX25hbWUsICIuLiIpID09IDApCiAJCQljb250aW51ZTsKLQkJfQorCiAJCXNucHJpbnRm KG5hbWUsIHNpemVvZihuYW1lKSwgIi9zeXMva2VybmVsL2RlYnVnL2RyaS8lcy9uYW1lIiwKIAkJ CWRpcl9lbnRyeS0+ZF9uYW1lKTsKLQkJRklMRSAqZiA9IGZvcGVuKG5hbWUsICJyIik7Ci0JCWlm ICghZikgeworCisJCWYgPSBmb3BlbihuYW1lLCAiciIpOworCQlpZiAoIWYpCiAJCQljb250aW51 ZTsKLQkJfQorCiAJCWRldmljZVtzaXplb2YoZGV2aWNlKSAtIDFdID0gMDsKIAkJcGFyc2VkX2Rl dmljZSA9IGZzY2FuZihmLCAiJSpzICUyNTVzIiwgZGV2aWNlKTsKIAkJZmNsb3NlKGYpOworCiAJ CWlmIChwYXJzZWRfZGV2aWNlICE9IDEpCiAJCQljb250aW51ZTsKKwogCQkvLyBzdHJpcCBvZmYg ZGV2PSBmb3Iga2VybmVscyA+IDQuNwogCQlpZiAoc3Ryc3RyKGRldmljZSwgImRldj0iKSkKLQkJ CW1lbW1vdmUoZGV2aWNlLCBkZXZpY2UrNCwgc3RybGVuKGRldmljZSktMyk7CisJCQltZW1tb3Zl KGRldmljZSwgZGV2aWNlICsgNCwgc3RybGVuKGRldmljZSkgLSAzKTsKIAkJaWYgKHN0cmNtcChw Y2lfc3RyaW5nLCBkZXZpY2UpID09IDApIHsKIAkJCWNsb3NlZGlyKGRpcik7CiAJCQlyZXR1cm4g YXRvaShkaXJfZW50cnktPmRfbmFtZSk7CkBAIC05NiwxNSArMTA0LDE3IEBAIHN0cnVjdCB1bXJf YXNpYyAqdW1yX2Rpc2NvdmVyX2FzaWMoc3RydWN0IHVtcl9vcHRpb25zICpvcHRpb25zKQogCiAJ Ly8gVHJ5IHRvIG1hcCB0byBpbnN0YW5jZSBpZiB3ZSBoYXZlIGEgc3BlY2lmaWMgcGNpIGRldmlj ZQogCWlmIChvcHRpb25zLT5wY2kuZG9tYWluIHx8IG9wdGlvbnMtPnBjaS5idXMgfHwKLQkJb3B0 aW9ucy0+cGNpLnNsb3QgfHwgb3B0aW9ucy0+cGNpLmZ1bmMpIHsKKwkgICAgb3B0aW9ucy0+cGNp LnNsb3QgfHwgb3B0aW9ucy0+cGNpLmZ1bmMpIHsKIAkJY2hhciBwY2lfc3RyaW5nWzE2XTsKIAkJ aW50IHBhcnNlZF9kaWQ7CisKIAkJc25wcmludGYocGNpX3N0cmluZywgc2l6ZW9mKHBjaV9zdHJp bmcpLCAiJTA0eDolMDJ4OiUwMnguJXgiLAogCQkJb3B0aW9ucy0+cGNpLmRvbWFpbiwgb3B0aW9u cy0+cGNpLmJ1cywgb3B0aW9ucy0+cGNpLnNsb3QsCiAJCQlvcHRpb25zLT5wY2kuZnVuYyk7Ci0J CWlmICghb3B0aW9ucy0+bm9fa2VybmVsKSB7CisKKwkJaWYgKCFvcHRpb25zLT5ub19rZXJuZWwp CiAJCQlvcHRpb25zLT5pbnN0YW5jZSA9IGZpbmRfcGNpX2luc3RhbmNlKHBjaV9zdHJpbmcpOwot CQl9CisKIAkJc25wcmludGYoZHJpdmVyLCBzaXplb2YoZHJpdmVyKSwgIi9zeXMvYnVzL3BjaS9k ZXZpY2VzLyVzL2RldmljZSIsIHBjaV9zdHJpbmcpOwogCQlmID0gZm9wZW4oZHJpdmVyLCAiciIp OwogCQlpZiAoIWYpIHsKLS0gCjIuMTIuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9hbWQtZ2Z4Cg==