From: Evan Quan Subject: [PATCH] drm/amd/powerplay: minor fixes around SW SMU power and fan setting Date: Thu, 25 Jul 2019 10:39:28 +0800 Message-ID: <20190725023930.22521-1-evan.quan@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: Evan Quan QWRkIGNoZWNraW5nIGZvciBwb3NzaWJsZSBpbnZhbGlkIGlucHV0IGFuZCBudWxsIHBvaW50ZXIu IEFuZApkcm9wIHJlZHVuZGFudCBjb2RlLgoKQ2hhbmdlLUlkOiBJNmViZDZhY2Q5NDRlODIxZmIx OWFmNzdlZDFlYWE4YzRiMWQ0MDdjZQpTaWduZWQtb2ZmLWJ5OiBFdmFuIFF1YW4gPGV2YW4ucXVh bkBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9wbS5jICAg IHwgMjIgKysrKysrKysrKy0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxh eS9zbXVfdjExXzAuYyB8IDI0ICsrKysrKysrKysrLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5n ZWQsIDIxIGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9wbS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvYW1kZ3B1X3BtLmMKaW5kZXggYmRmNTM3ZDNmNDU5Li45YWEwMGQ2N2U2MWQgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9wbS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9wbS5jCkBAIC0xNjY3LDIwICsxNjY3LDE2IEBA IHN0YXRpYyBzc2l6ZV90IGFtZGdwdV9od21vbl9zZXRfcHdtMV9lbmFibGUoc3RydWN0IGRldmlj ZSAqZGV2LAogCSAgICAgKGFkZXYtPmRkZXYtPnN3aXRjaF9wb3dlcl9zdGF0ZSAhPSBEUk1fU1dJ VENIX1BPV0VSX09OKSkKIAkJcmV0dXJuIC1FSU5WQUw7CiAKLQlpZiAoaXNfc3VwcG9ydF9zd19z bXUoYWRldikpIHsKLQkJZXJyID0ga3N0cnRvaW50KGJ1ZiwgMTAsICZ2YWx1ZSk7Ci0JCWlmIChl cnIpCi0JCQlyZXR1cm4gZXJyOworCWVyciA9IGtzdHJ0b2ludChidWYsIDEwLCAmdmFsdWUpOwor CWlmIChlcnIpCisJCXJldHVybiBlcnI7CiAKKwlpZiAoaXNfc3VwcG9ydF9zd19zbXUoYWRldikp IHsKIAkJc211X3NldF9mYW5fY29udHJvbF9tb2RlKCZhZGV2LT5zbXUsIHZhbHVlKTsKIAl9IGVs c2UgewogCQlpZiAoIWFkZXYtPnBvd2VycGxheS5wcF9mdW5jcy0+c2V0X2Zhbl9jb250cm9sX21v ZGUpCiAJCQlyZXR1cm4gLUVJTlZBTDsKIAotCQllcnIgPSBrc3RydG9pbnQoYnVmLCAxMCwgJnZh bHVlKTsKLQkJaWYgKGVycikKLQkJCXJldHVybiBlcnI7Ci0KIAkJYW1kZ3B1X2RwbV9zZXRfZmFu X2NvbnRyb2xfbW9kZShhZGV2LCB2YWx1ZSk7CiAJfQogCkBAIC0yMTAwLDE2ICsyMDk2LDE4IEBA IHN0YXRpYyBzc2l6ZV90IGFtZGdwdV9od21vbl9zZXRfcG93ZXJfY2FwKHN0cnVjdCBkZXZpY2Ug KmRldiwKIAkJcmV0dXJuIGVycjsKIAogCXZhbHVlID0gdmFsdWUgLyAxMDAwMDAwOyAvKiBjb252 ZXJ0IHRvIFdhdHQgKi8KKwogCWlmIChpc19zdXBwb3J0X3N3X3NtdShhZGV2KSkgewotCQlhZGV2 LT5zbXUuZnVuY3MtPnNldF9wb3dlcl9saW1pdCgmYWRldi0+c211LCB2YWx1ZSk7CisJCWVyciA9 IHNtdV9zZXRfcG93ZXJfbGltaXQoJmFkZXYtPnNtdSwgdmFsdWUpOwogCX0gZWxzZSBpZiAoYWRl di0+cG93ZXJwbGF5LnBwX2Z1bmNzICYmIGFkZXYtPnBvd2VycGxheS5wcF9mdW5jcy0+c2V0X3Bv d2VyX2xpbWl0KSB7CiAJCWVyciA9IGFkZXYtPnBvd2VycGxheS5wcF9mdW5jcy0+c2V0X3Bvd2Vy X2xpbWl0KGFkZXYtPnBvd2VycGxheS5wcF9oYW5kbGUsIHZhbHVlKTsKLQkJaWYgKGVycikKLQkJ CXJldHVybiBlcnI7CiAJfSBlbHNlIHsKLQkJcmV0dXJuIC1FSU5WQUw7CisJCWVyciA9IC1FSU5W QUw7CiAJfQogCisJaWYgKGVycikKKwkJcmV0dXJuIGVycjsKKwogCXJldHVybiBjb3VudDsKIH0K IApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvc211X3YxMV8wLmMg Yi9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9zbXVfdjExXzAuYwppbmRleCBkMTQ4NmMz ZTEzNTcuLjhhYzlhY2FiZWJmOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dl cnBsYXkvc211X3YxMV8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvc211 X3YxMV8wLmMKQEAgLTEwOTIsNiArMTA5Miw4IEBAIHN0YXRpYyBpbnQgc211X3YxMV8wX3NldF9w b3dlcl9saW1pdChzdHJ1Y3Qgc211X2NvbnRleHQgKnNtdSwgdWludDMyX3QgbikKIAkJbWF4X3Bv d2VyX2xpbWl0ICo9ICgxMDAgKyBzbXUtPnNtdV90YWJsZS5URFBPRExpbWl0KTsKIAkJbWF4X3Bv d2VyX2xpbWl0IC89IDEwMDsKIAl9CisJaWYgKG4gPiBtYXhfcG93ZXJfbGltaXQpCisJCXJldHVy biAtRUlOVkFMOwogCiAJaWYgKHNtdV9mZWF0dXJlX2lzX2VuYWJsZWQoc211LCBTTVVfRkVBVFVS RV9QUFRfQklUKSkKIAkJcmV0ID0gc211X3NlbmRfc21jX21zZ193aXRoX3BhcmFtKHNtdSwgU01V X01TR19TZXRQcHRMaW1pdCwgbik7CkBAIC0xNDA3LDE3ICsxNDA5LDE3IEBAIHNtdV92MTFfMF9n ZXRfZmFuX2NvbnRyb2xfbW9kZShzdHJ1Y3Qgc211X2NvbnRleHQgKnNtdSkKIH0KIAogc3RhdGlj IGludAotc211X3YxMV8wX3NtY19mYW5fY29udHJvbChzdHJ1Y3Qgc211X2NvbnRleHQgKnNtdSwg Ym9vbCBzdGFydCkKK3NtdV92MTFfMF9hdXRvX2Zhbl9jb250cm9sKHN0cnVjdCBzbXVfY29udGV4 dCAqc211LCBib29sIGF1dG9fZmFuX2NvbnRyb2wpCiB7CiAJaW50IHJldCA9IDA7CiAKIAlpZiAo c211X2ZlYXR1cmVfaXNfc3VwcG9ydGVkKHNtdSwgU01VX0ZFQVRVUkVfRkFOX0NPTlRST0xfQklU KSkKIAkJcmV0dXJuIDA7CiAKLQlyZXQgPSBzbXVfZmVhdHVyZV9zZXRfZW5hYmxlZChzbXUsIFNN VV9GRUFUVVJFX0ZBTl9DT05UUk9MX0JJVCwgc3RhcnQpOworCXJldCA9IHNtdV9mZWF0dXJlX3Nl dF9lbmFibGVkKHNtdSwgU01VX0ZFQVRVUkVfRkFOX0NPTlRST0xfQklULCBhdXRvX2Zhbl9jb250 cm9sKTsKIAlpZiAocmV0KQogCQlwcl9lcnIoIlslc10lcyBzbWMgRkFOIENPTlRST0wgZmVhdHVy ZSBmYWlsZWQhIiwKLQkJICAgICAgIF9fZnVuY19fLCAoc3RhcnQgPyAiU3RhcnQiIDogIlN0b3Ai KSk7CisJCSAgICAgICBfX2Z1bmNfXywgKGF1dG9fZmFuX2NvbnRyb2wgPyAiU3RhcnQiIDogIlN0 b3AiKSk7CiAKIAlyZXR1cm4gcmV0OwogfQpAQCAtMTQ0MSwxNiArMTQ0MywxNSBAQCBzdGF0aWMg aW50CiBzbXVfdjExXzBfc2V0X2Zhbl9zcGVlZF9wZXJjZW50KHN0cnVjdCBzbXVfY29udGV4dCAq c211LCB1aW50MzJfdCBzcGVlZCkKIHsKIAlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiA9IHNt dS0+YWRldjsKLQl1aW50MzJfdCBkdXR5MTAwOwotCXVpbnQzMl90IGR1dHk7CisJdWludDMyX3Qg ZHV0eTEwMCwgZHV0eTsKIAl1aW50NjRfdCB0bXA2NDsKLQlib29sIHN0b3AgPSAwOwogCiAJaWYg KHNwZWVkID4gMTAwKQogCQlzcGVlZCA9IDEwMDsKIAotCWlmIChzbXVfdjExXzBfc21jX2Zhbl9j b250cm9sKHNtdSwgc3RvcCkpCisJaWYgKHNtdV92MTFfMF9hdXRvX2Zhbl9jb250cm9sKHNtdSwg MCkpCiAJCXJldHVybiAtRUlOVkFMOworCiAJZHV0eTEwMCA9IFJFR19HRVRfRklFTEQoUlJFRzMy X1NPQzE1KFRITSwgMCwgbW1DR19GRE9fQ1RSTDEpLAogCQkJCUNHX0ZET19DVFJMMSwgRk1BWF9E VVRZMTAwKTsKIAlpZiAoIWR1dHkxMDApCkBAIC0xNDcyLDE4ICsxNDczLDE2IEBAIHNtdV92MTFf MF9zZXRfZmFuX2NvbnRyb2xfbW9kZShzdHJ1Y3Qgc211X2NvbnRleHQgKnNtdSwKIAkJCSAgICAg ICB1aW50MzJfdCBtb2RlKQogewogCWludCByZXQgPSAwOwotCWJvb2wgc3RhcnQgPSAxOwotCWJv b2wgc3RvcCAgPSAwOwogCiAJc3dpdGNoIChtb2RlKSB7CiAJY2FzZSBBTURfRkFOX0NUUkxfTk9O RToKIAkJcmV0ID0gc211X3YxMV8wX3NldF9mYW5fc3BlZWRfcGVyY2VudChzbXUsIDEwMCk7CiAJ CWJyZWFrOwogCWNhc2UgQU1EX0ZBTl9DVFJMX01BTlVBTDoKLQkJcmV0ID0gc211X3YxMV8wX3Nt Y19mYW5fY29udHJvbChzbXUsIHN0b3ApOworCQlyZXQgPSBzbXVfdjExXzBfYXV0b19mYW5fY29u dHJvbChzbXUsIDApOwogCQlicmVhazsKIAljYXNlIEFNRF9GQU5fQ1RSTF9BVVRPOgotCQlyZXQg PSBzbXVfdjExXzBfc21jX2Zhbl9jb250cm9sKHNtdSwgc3RhcnQpOworCQlyZXQgPSBzbXVfdjEx XzBfYXV0b19mYW5fY29udHJvbChzbXUsIDEpOwogCQlicmVhazsKIAlkZWZhdWx0OgogCQlicmVh azsKQEAgLTE1MDMsMTMgKzE1MDIsMTIgQEAgc3RhdGljIGludCBzbXVfdjExXzBfc2V0X2Zhbl9z cGVlZF9ycG0oc3RydWN0IHNtdV9jb250ZXh0ICpzbXUsCiAJc3RydWN0IGFtZGdwdV9kZXZpY2Ug KmFkZXYgPSBzbXUtPmFkZXY7CiAJaW50IHJldDsKIAl1aW50MzJfdCB0YWNoX3BlcmlvZCwgY3J5 c3RhbF9jbG9ja19mcmVxOwotCWJvb2wgc3RvcCA9IDA7CiAKIAlpZiAoIXNwZWVkKQogCQlyZXR1 cm4gLUVJTlZBTDsKIAogCW11dGV4X2xvY2soJihzbXUtPm11dGV4KSk7Ci0JcmV0ID0gc211X3Yx MV8wX3NtY19mYW5fY29udHJvbChzbXUsIHN0b3ApOworCXJldCA9IHNtdV92MTFfMF9hdXRvX2Zh bl9jb250cm9sKHNtdSwgMCk7CiAJaWYgKHJldCkKIAkJZ290byBzZXRfZmFuX3NwZWVkX3JwbV9m YWlsZWQ7CiAKLS0gCjIuMjIuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQt Z2Z4