From: Alex Deucher Subject: [PATCH 3/4] drm/amd/powerplay/smu7: fix checks in smu7_get_evv_voltages (v2) Date: Thu, 10 Nov 2016 11:25:34 -0500 Message-ID: <1478795135-11758-3-git-send-email-alexander.deucher@amd.com> References: <1478795135-11758-1-git-send-email-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1478795135-11758-1-git-send-email-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 T25seSBjaGVjayBpZiB0aGUgdGFibGVzIGV4aXN0IGluIHJlbGV2YW50IGNvbmZpZ3MuICBUaGlz CmZpeGVzIGEgZmFpbHVyZSBvbiBWMCB0YWJsZXMuCgp2MjogZml4IHZlcnNpb24gY2hlY2sgYXMg c3VnZ2VzdGVkIGJ5IFJleAoKYnVnczoKaHR0cHM6Ly9idWd6aWxsYS5rZXJuZWwub3JnL3Nob3df YnVnLmNnaT9pZD0xODU2ODEKaHR0cHM6Ly9idWdzLmZyZWVkZXNrdG9wLm9yZy9zaG93X2J1Zy5j Z2k/aWQ9OTgzNTcKClJldmlld2VkLWJ5OiBSZXggWmh1IDxSZXguWmh1QGFtZC5jb20+ClJldmll d2VkLWJ5OiBIdWFuZyBSdWkgPHJheS5odWFuZ0BhbWQuY29tPgpTaWduZWQtb2ZmLWJ5OiBBbGV4 IERldWNoZXIgPGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJt L2FtZC9wb3dlcnBsYXkvaHdtZ3Ivc211N19od21nci5jIHwgMTcgKysrKysrKysrKy0tLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L2h3bWdyL3NtdTdfaHdtZ3IuYyBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L2h3bWdyL3NtdTdfaHdtZ3IuYwppbmRleCA1 MWZiODZmLi5mNDFjZGRmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxh eS9od21nci9zbXU3X2h3bWdyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkv aHdtZ3Ivc211N19od21nci5jCkBAIC0xNDYwLDE5ICsxNDYwLDE5IEBAIHN0YXRpYyBpbnQgc211 N19nZXRfZXZ2X3ZvbHRhZ2VzKHN0cnVjdCBwcF9od21nciAqaHdtZ3IpCiAJc3RydWN0IHBobV9w cHRfdjFfY2xvY2tfdm9sdGFnZV9kZXBlbmRlbmN5X3RhYmxlICpzY2xrX3RhYmxlID0gTlVMTDsK IAogCi0JaWYgKHRhYmxlX2luZm8gPT0gTlVMTCkKLQkJcmV0dXJuIC1FSU5WQUw7Ci0KLQlzY2xr X3RhYmxlID0gdGFibGVfaW5mby0+dmRkX2RlcF9vbl9zY2xrOwotCiAJZm9yIChpID0gMDsgaSA8 IFNNVTdfTUFYX0xFQUtBR0VfQ09VTlQ7IGkrKykgewogCQl2dl9pZCA9IEFUT01fVklSVFVBTF9W T0xUQUdFX0lEMCArIGk7CiAKIAkJaWYgKGRhdGEtPnZkZF9nZnhfY29udHJvbCA9PSBTTVU3X1ZP TFRBR0VfQ09OVFJPTF9CWV9TVklEMikgewotCQkJaWYgKDAgPT0gcGhtX2dldF9zY2xrX2Zvcl92 b2x0YWdlX2V2dihod21nciwKKwkJCWlmICgoaHdtZ3ItPnBwX3RhYmxlX3ZlcnNpb24gPT0gUFBf VEFCTEVfVjEpCisJCQkgICAgJiYgIXBobV9nZXRfc2Nsa19mb3Jfdm9sdGFnZV9ldnYoaHdtZ3Is CiAJCQkJCQl0YWJsZV9pbmZvLT52ZGRnZnhfbG9va3VwX3RhYmxlLCB2dl9pZCwgJnNjbGspKSB7 CiAJCQkJaWYgKHBobV9jYXBfZW5hYmxlZChod21nci0+cGxhdGZvcm1fZGVzY3JpcHRvci5wbGF0 Zm9ybUNhcHMsCiAJCQkJCQkJUEhNX1BsYXRmb3JtQ2Fwc19DbG9ja1N0cmV0Y2hlcikpIHsKKwkJ CQkJaWYgKHRhYmxlX2luZm8gPT0gTlVMTCkKKwkJCQkJCXJldHVybiAtRUlOVkFMOworCQkJCQlz Y2xrX3RhYmxlID0gdGFibGVfaW5mby0+dmRkX2RlcF9vbl9zY2xrOworCiAJCQkJCWZvciAoaiA9 IDE7IGogPCBzY2xrX3RhYmxlLT5jb3VudDsgaisrKSB7CiAJCQkJCQlpZiAoc2Nsa190YWJsZS0+ ZW50cmllc1tqXS5jbGsgPT0gc2NsayAmJgogCQkJCQkJCQlzY2xrX3RhYmxlLT5lbnRyaWVzW2pd LmNrc19lbmFibGUgPT0gMCkgewpAQCAtMTQ5OCwxMiArMTQ5OCwxNSBAQCBzdGF0aWMgaW50IHNt dTdfZ2V0X2V2dl92b2x0YWdlcyhzdHJ1Y3QgcHBfaHdtZ3IgKmh3bWdyKQogCQkJCX0KIAkJCX0K IAkJfSBlbHNlIHsKLQogCQkJaWYgKChod21nci0+cHBfdGFibGVfdmVyc2lvbiA9PSBQUF9UQUJM RV9WMCkKIAkJCQl8fCAhcGhtX2dldF9zY2xrX2Zvcl92b2x0YWdlX2V2dihod21nciwKIAkJCQkJ dGFibGVfaW5mby0+dmRkY19sb29rdXBfdGFibGUsIHZ2X2lkLCAmc2NsaykpIHsKIAkJCQlpZiAo cGhtX2NhcF9lbmFibGVkKGh3bWdyLT5wbGF0Zm9ybV9kZXNjcmlwdG9yLnBsYXRmb3JtQ2FwcywK IAkJCQkJCVBITV9QbGF0Zm9ybUNhcHNfQ2xvY2tTdHJldGNoZXIpKSB7CisJCQkJCWlmICh0YWJs ZV9pbmZvID09IE5VTEwpCisJCQkJCQlyZXR1cm4gLUVJTlZBTDsKKwkJCQkJc2Nsa190YWJsZSA9 IHRhYmxlX2luZm8tPnZkZF9kZXBfb25fc2NsazsKKwogCQkJCQlmb3IgKGogPSAxOyBqIDwgc2Ns a190YWJsZS0+Y291bnQ7IGorKykgewogCQkJCQkJaWYgKHNjbGtfdGFibGUtPmVudHJpZXNbal0u Y2xrID09IHNjbGsgJiYKIAkJCQkJCQkJc2Nsa190YWJsZS0+ZW50cmllc1tqXS5ja3NfZW5hYmxl ID09IDApIHsKLS0gCjIuNS41CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1n ZngK