From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Moritz=20K=C3=BChner?= Subject: [PATCH 2/2] drm/amd/powerplay/hwmgr: don't add invalid voltage Date: Thu, 14 Apr 2016 22:10:28 +0200 Message-ID: <1460664628-14623-3-git-send-email-kuehner.moritz@gmail.com> References: <1460664628-14623-1-git-send-email-kuehner.moritz@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 651CC6EB07 for ; Thu, 14 Apr 2016 20:11:08 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id l6so777775wml.3 for ; Thu, 14 Apr 2016 13:11:08 -0700 (PDT) In-Reply-To: <1460664628-14623-1-git-send-email-kuehner.moritz@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: alexander.deucher@amd.com, =?UTF-8?q?Moritz=20K=C3=BChner?= List-Id: dri-devel@lists.freedesktop.org aWYgYXRvbWN0cmxfZ2V0X3ZvbHRhZ2VfZXZ2X29uX3NjbGsgcmV0dXJucyBub24gemVybyAoZmFp bCkgaW4gdGhlIGV4cGFuc2lvbgpvZiB0aGUgUFBfQVNTRVJUX1dJVEhfQ09ERSBtYWNybyB0aGUg Y29udGludWUgd2lsbCBhY3R1YWxseSBkbyBub3RoaW5nCihUaGUgbWFjcm8gdXNlcyBhIGRvIC4u LiB3aGlsZSgwKSBhcyBzY29wZSwgd2hpY2ggZWF0cyB0aGUgY29udGludWUpLgpCYXNlZCBvbiB0 aGUgY29kZSBJIGRvbid0IHRoaW5rIHRoaXMgd2FzIHRoZSBpbnRlbnQuClVuZm9ydHVuYXRlbHkg Zml4aW5nIHRoaXMgcmVxdWlyZXMgcmV3cml0aW5nIHRoZSBjb250cm9sIGZsb3cgYW5kCnJlbW92 aW5nIHRoZSBtYWNyb3MuCi0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvaHdtZ3Iv dG9uZ2FfaHdtZ3IuYyB8IDU0ICsrKysrKysrKysrKystLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdl ZCwgMzAgaW5zZXJ0aW9ucygrKSwgMjQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvaHdtZ3IvdG9uZ2FfaHdtZ3IuYyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvcG93ZXJwbGF5L2h3bWdyL3RvbmdhX2h3bWdyLmMKaW5kZXggNTBhZmIwMi4uOWE1 ZDEwYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvaHdtZ3IvdG9u Z2FfaHdtZ3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9od21nci90b25n YV9od21nci5jCkBAIC00MjksMTkgKzQyOSwyMiBAQCBpbnQgdG9uZ2FfZ2V0X2V2dl92b2x0YWdl KHN0cnVjdCBwcF9od21nciAqaHdtZ3IpCiAJCQkJCQl9CiAJCQkJCX0KIAkJCQl9Ci0JCQkJUFBf QVNTRVJUX1dJVEhfQ09ERSgwID09IGF0b21jdHJsX2dldF92b2x0YWdlX2V2dl9vbl9zY2xrCisJ CQkJaWYgKDAgPT0gYXRvbWN0cmxfZ2V0X3ZvbHRhZ2VfZXZ2X29uX3NjbGsKIAkJCQkJCShod21n ciwgVk9MVEFHRV9UWVBFX1ZEREdGWCwgc2NsaywKLQkJCQkJCSB2aXJ0dWFsX3ZvbHRhZ2VfaWQs ICZ2ZGRnZngpLAotCQkJCQkJIkVycm9yIHJldHJpZXZpbmcgRVZWIHZvbHRhZ2UgdmFsdWUhIiwg Y29udGludWUpOwotCi0JCQkJLyogbmVlZCB0byBtYWtlIHN1cmUgdmRkZ2Z4IGlzIGxlc3MgdGhh biAydiBvciBlbHNlLCBpdCBjb3VsZCBidXJuIHRoZSBBU0lDLiAqLwotCQkJCVBQX0FTU0VSVF9X SVRIX0NPREUoKHZkZGdmeCA8IDIwMDAgJiYgdmRkZ2Z4ICE9IDApLCAiSW52YWxpZCBWRERHRlgg dmFsdWUhIiwgcmV0dXJuIC0xKTsKLQotCQkJCS8qIHRoZSB2b2x0YWdlIHNob3VsZCBub3QgYmUg emVybyBub3IgZXF1YWwgdG8gbGVha2FnZSBJRCAqLwotCQkJCWlmICh2ZGRnZnggIT0gMCAmJiB2 ZGRnZnggIT0gdmlydHVhbF92b2x0YWdlX2lkKSB7Ci0JCQkJCWRhdGEtPnZkZGNnZnhfbGVha2Fn ZS5hY3R1YWxfdm9sdGFnZVtkYXRhLT52ZGRjZ2Z4X2xlYWthZ2UuY291bnRdID0gdmRkZ2Z4Owot CQkJCQlkYXRhLT52ZGRjZ2Z4X2xlYWthZ2UubGVha2FnZV9pZFtkYXRhLT52ZGRjZ2Z4X2xlYWth Z2UuY291bnRdID0gdmlydHVhbF92b2x0YWdlX2lkOwotCQkJCQlkYXRhLT52ZGRjZ2Z4X2xlYWth Z2UuY291bnQrKzsKKwkJCQkJCSB2aXJ0dWFsX3ZvbHRhZ2VfaWQsICZ2ZGRnZngpKSB7CisJCQkJ CS8qIG5lZWQgdG8gbWFrZSBzdXJlIHZkZGdmeCBpcyBsZXNzIHRoYW4gMnYgb3IgZWxzZSwgaXQg Y291bGQgYnVybiB0aGUgQVNJQy4gKi8KKwkJCQkJUFBfQVNTRVJUX1dJVEhfQ09ERSgodmRkZ2Z4 IDwgMjAwMCAmJiB2ZGRnZnggIT0gMCksICJJbnZhbGlkIFZEREdGWCB2YWx1ZSEiLCByZXR1cm4g LTEpOworCisJCQkJCS8qIHRoZSB2b2x0YWdlIHNob3VsZCBub3QgYmUgemVybyBub3IgZXF1YWwg dG8gbGVha2FnZSBJRCAqLworCQkJCQlpZiAodmRkZ2Z4ICE9IDAgJiYgdmRkZ2Z4ICE9IHZpcnR1 YWxfdm9sdGFnZV9pZCkgeworCQkJCQkJZGF0YS0+dmRkY2dmeF9sZWFrYWdlLmFjdHVhbF92b2x0 YWdlW2RhdGEtPnZkZGNnZnhfbGVha2FnZS5jb3VudF0gPSB2ZGRnZng7CisJCQkJCQlkYXRhLT52 ZGRjZ2Z4X2xlYWthZ2UubGVha2FnZV9pZFtkYXRhLT52ZGRjZ2Z4X2xlYWthZ2UuY291bnRdID0g dmlydHVhbF92b2x0YWdlX2lkOworCQkJCQkJZGF0YS0+dmRkY2dmeF9sZWFrYWdlLmNvdW50Kys7 CisJCQkJCX0KKwkJCQl9CisJCQkJZWxzZQorCQkJCXsKKwkJCQkJcHJpbnRrKCIlc1xuIiwgIkVy cm9yIHJldHJpZXZpbmcgRVZWIHZvbHRhZ2UgdmFsdWUhIik7CiAJCQkJfQogCQkJfQogCQl9IGVs c2UgewpAQCAtNDQ5LDE5ICs0NTIsMjIgQEAgaW50IHRvbmdhX2dldF9ldnZfdm9sdGFnZShzdHJ1 Y3QgcHBfaHdtZ3IgKmh3bWdyKQogCQkJaWYgKDAgPT0gdG9uZ2FfZ2V0X3NjbGtfZm9yX3ZvbHRh Z2VfZXZ2KGh3bWdyLAogCQkJCQkJcHB0YWJsZV9pbmZvLT52ZGRjX2xvb2t1cF90YWJsZSwKIAkJ CQkJCXZpcnR1YWxfdm9sdGFnZV9pZCwgJnNjbGspKSB7Ci0JCQkJUFBfQVNTRVJUX1dJVEhfQ09E RSgwID09IGF0b21jdHJsX2dldF92b2x0YWdlX2V2dl9vbl9zY2xrCisJCQkJaWYgKDAgPT0gYXRv bWN0cmxfZ2V0X3ZvbHRhZ2VfZXZ2X29uX3NjbGsKIAkJCQkJCShod21nciwgVk9MVEFHRV9UWVBF X1ZEREMsIHNjbGssCi0JCQkJCQkgdmlydHVhbF92b2x0YWdlX2lkLCAmdmRkYyksCi0JCQkJCQki RXJyb3IgcmV0cmlldmluZyBFVlYgdm9sdGFnZSB2YWx1ZSEiLCBjb250aW51ZSk7Ci0KLQkJCQkv KiBuZWVkIHRvIG1ha2Ugc3VyZSB2ZGRjIGlzIGxlc3MgdGhhbiAydiBvciBlbHNlLCBpdCBjb3Vs ZCBidXJuIHRoZSBBU0lDLiAqLwotCQkJCVBQX0FTU0VSVF9XSVRIX0NPREUodmRkYyA8IDIwMDAs ICJJbnZhbGlkIFZEREMgdmFsdWUhIiwgcmV0dXJuIC0xKTsKLQotCQkJCS8qIHRoZSB2b2x0YWdl IHNob3VsZCBub3QgYmUgemVybyBub3IgZXF1YWwgdG8gbGVha2FnZSBJRCAqLwotCQkJCWlmICh2 ZGRjICE9IDAgJiYgdmRkYyAhPSB2aXJ0dWFsX3ZvbHRhZ2VfaWQpIHsKLQkJCQkJZGF0YS0+dmRk Y19sZWFrYWdlLmFjdHVhbF92b2x0YWdlW2RhdGEtPnZkZGNfbGVha2FnZS5jb3VudF0gPSB2ZGRj OwotCQkJCQlkYXRhLT52ZGRjX2xlYWthZ2UubGVha2FnZV9pZFtkYXRhLT52ZGRjX2xlYWthZ2Uu Y291bnRdID0gdmlydHVhbF92b2x0YWdlX2lkOwotCQkJCQlkYXRhLT52ZGRjX2xlYWthZ2UuY291 bnQrKzsKKwkJCQkJCSB2aXJ0dWFsX3ZvbHRhZ2VfaWQsICZ2ZGRjKSkgeworCQkJCQkvKiBuZWVk IHRvIG1ha2Ugc3VyZSB2ZGRjIGlzIGxlc3MgdGhhbiAydiBvciBlbHNlLCBpdCBjb3VsZCBidXJu IHRoZSBBU0lDLiAqLworCQkJCQlQUF9BU1NFUlRfV0lUSF9DT0RFKHZkZGMgPCAyMDAwLCAiSW52 YWxpZCBWRERDIHZhbHVlISIsIHJldHVybiAtMSk7CisKKwkJCQkJLyogdGhlIHZvbHRhZ2Ugc2hv dWxkIG5vdCBiZSB6ZXJvIG5vciBlcXVhbCB0byBsZWFrYWdlIElEICovCisJCQkJCWlmICh2ZGRj ICE9IDAgJiYgdmRkYyAhPSB2aXJ0dWFsX3ZvbHRhZ2VfaWQpIHsKKwkJCQkJCWRhdGEtPnZkZGNf bGVha2FnZS5hY3R1YWxfdm9sdGFnZVtkYXRhLT52ZGRjX2xlYWthZ2UuY291bnRdID0gdmRkYzsK KwkJCQkJCWRhdGEtPnZkZGNfbGVha2FnZS5sZWFrYWdlX2lkW2RhdGEtPnZkZGNfbGVha2FnZS5j b3VudF0gPSB2aXJ0dWFsX3ZvbHRhZ2VfaWQ7CisJCQkJCQlkYXRhLT52ZGRjX2xlYWthZ2UuY291 bnQrKzsKKwkJCQkJfQorCQkJCX0KKwkJCQllbHNlCisJCQkJeworCQkJCQlwcmludGsoIiVzXG4i LCAiRXJyb3IgcmV0cmlldmluZyBFVlYgdm9sdGFnZSB2YWx1ZSEiKTsKIAkJCQl9CiAJCQl9CiAJ CX0KLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2 ZWwK