From: "Quan, Evan" Subject: [PATCH 1/2] drm/amd/powerplay: properly set mp1 state for SW SMU suspend/reset routine Date: Wed, 11 Sep 2019 11:50:24 +0000 Message-ID: <20190911115001.13864-1-evan.quan@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Language: en-US 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: "Deucher, Alexander" , "Ma, Le" , "Quan, Evan" , "Gui, Jack" U2V0IG1wMSBzdGF0ZSBwcm9wZXJseSBmb3IgU1cgU01VIHN1c3BlbmQvcmVzZXQgcm91dGluZS4K CkNoYW5nZS1JZDogSTQ1OGQwOWU3OWJiYTI2MTNiYjg1MDk5OTM4NjQ4NzgyZmY5MWI5N2EKU2ln bmVkLW9mZi1ieTogRXZhbiBRdWFuIDxldmFuLnF1YW5AYW1kLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfZGV2aWNlLmMgICAgfCAxMCArKy0tLQogZHJpdmVycy9n cHUvZHJtL2FtZC9wb3dlcnBsYXkvYW1kZ3B1X3NtdS5jICAgIHwgNDAgKysrKysrKysrKysrKysr KysrKwogLi4uL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9pbmMvYW1kZ3B1X3NtdS5oICAgIHwgIDIg KwogMyBmaWxlcyBjaGFuZ2VkLCA0NyBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9kZXZpY2UuYwppbmRleCBjODY5N2I1ZWYx ZDAuLjVmZTUzOWY4MDAwOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1X2RldmljZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9k ZXZpY2UuYwpAQCAtMjIxNywxNiArMjIxNywxNiBAQCBzdGF0aWMgaW50IGFtZGdwdV9kZXZpY2Vf aXBfc3VzcGVuZF9waGFzZTIoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpCiAJCS8qIGhhbmRs ZSBwdXR0aW5nIHRoZSBTTUMgaW4gdGhlIGFwcHJvcHJpYXRlIHN0YXRlICovCiAJCWlmIChhZGV2 LT5pcF9ibG9ja3NbaV0udmVyc2lvbi0+dHlwZSA9PSBBTURfSVBfQkxPQ0tfVFlQRV9TTUMpIHsK IAkJCWlmIChpc19zdXBwb3J0X3N3X3NtdShhZGV2KSkgewotCQkJCS8qIHRvZG8gKi8KKwkJCQly ID0gc211X3NldF9tcDFfc3RhdGUoJmFkZXYtPnNtdSwgYWRldi0+bXAxX3N0YXRlKTsKIAkJCX0g ZWxzZSBpZiAoYWRldi0+cG93ZXJwbGF5LnBwX2Z1bmNzICYmCiAJCQkJICAgYWRldi0+cG93ZXJw bGF5LnBwX2Z1bmNzLT5zZXRfbXAxX3N0YXRlKSB7CiAJCQkJciA9IGFkZXYtPnBvd2VycGxheS5w cF9mdW5jcy0+c2V0X21wMV9zdGF0ZSgKIAkJCQkJYWRldi0+cG93ZXJwbGF5LnBwX2hhbmRsZSwK IAkJCQkJYWRldi0+bXAxX3N0YXRlKTsKLQkJCQlpZiAocikgewotCQkJCQlEUk1fRVJST1IoIlNN QyBmYWlsZWQgdG8gc2V0IG1wMSBzdGF0ZSAlZCwgJWRcbiIsCi0JCQkJCQkgIGFkZXYtPm1wMV9z dGF0ZSwgcik7Ci0JCQkJfQorCQkJfQorCQkJaWYgKHIpIHsKKwkJCQlEUk1fRVJST1IoIlNNQyBm YWlsZWQgdG8gc2V0IG1wMSBzdGF0ZSAlZCwgJWRcbiIsCisJCQkJCSAgYWRldi0+bXAxX3N0YXRl LCByKTsKIAkJCX0KIAkJfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2Vy cGxheS9hbWRncHVfc211LmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9hbWRncHVf c211LmMKaW5kZXggZjEzZTEzNGJlNDJlLi4yNWYzYzllMWI0MDQgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L2FtZGdwdV9zbXUuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL3Bvd2VycGxheS9hbWRncHVfc211LmMKQEAgLTE3OTYsNiArMTc5Niw0NiBAQCBpbnQg c211X2ZvcmNlX2Nsa19sZXZlbHMoc3RydWN0IHNtdV9jb250ZXh0ICpzbXUsCiAJcmV0dXJuIHJl dDsKIH0KIAoraW50IHNtdV9zZXRfbXAxX3N0YXRlKHN0cnVjdCBzbXVfY29udGV4dCAqc211LAor CQkgICAgICBlbnVtIHBwX21wMV9zdGF0ZSBtcDFfc3RhdGUpCit7CisJdWludDE2X3QgbXNnOwor CWludCByZXQ7CisKKwkvKgorCSAqIFRoZSBTTUMgaXMgbm90IGZ1bGx5IHJlYWR5LiBUaGF0IG1h eSBiZQorCSAqIGV4cGVjdGVkIGFzIHRoZSBJUCBtYXkgYmUgbWFza2VkLgorCSAqIFNvLCBqdXN0 IHJldHVybiB3aXRob3V0IGVycm9yLgorCSAqLworCWlmICghc211LT5wbV9lbmFibGVkKQorCQly ZXR1cm4gMDsKKworCXN3aXRjaCAobXAxX3N0YXRlKSB7CisJY2FzZSBQUF9NUDFfU1RBVEVfU0hV VERPV046CisJCW1zZyA9IFNNVV9NU0dfUHJlcGFyZU1wMUZvclNodXRkb3duOworCQlicmVhazsK KwljYXNlIFBQX01QMV9TVEFURV9VTkxPQUQ6CisJCW1zZyA9IFNNVV9NU0dfUHJlcGFyZU1wMUZv clVubG9hZDsKKwkJYnJlYWs7CisJY2FzZSBQUF9NUDFfU1RBVEVfUkVTRVQ6CisJCW1zZyA9IFNN VV9NU0dfUHJlcGFyZU1wMUZvclJlc2V0OworCQlicmVhazsKKwljYXNlIFBQX01QMV9TVEFURV9O T05FOgorCWRlZmF1bHQ6CisJCXJldHVybiAwOworCX0KKworCS8qIHNvbWUgYXNpY3MgbWF5IG5v dCBzdXBwb3J0IHRob3NlIG1lc3NhZ2VzICovCisJaWYgKHNtdV9tc2dfZ2V0X2luZGV4KHNtdSwg bXNnKSA8IDApCisJCXJldHVybiAwOworCisJcmV0ID0gc211X3NlbmRfc21jX21zZyhzbXUsIG1z Zyk7CisJaWYgKHJldCkKKwkJcHJfZXJyKCJbUHJlcGFyZU1wMV0gRmFpbGVkIVxuIik7CisKKwly ZXR1cm4gcmV0OworfQorCiBjb25zdCBzdHJ1Y3QgYW1kX2lwX2Z1bmNzIHNtdV9pcF9mdW5jcyA9 IHsKIAkubmFtZSA9ICJzbXUiLAogCS5lYXJseV9pbml0ID0gc211X2Vhcmx5X2luaXQsCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9pbmMvYW1kZ3B1X3NtdS5oIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvaW5jL2FtZGdwdV9zbXUuaAppbmRleCAzZGU4 OGQwODQ2MTUuLjE2ZGYwOWJlNmE5ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9w b3dlcnBsYXkvaW5jL2FtZGdwdV9zbXUuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2Vy cGxheS9pbmMvYW1kZ3B1X3NtdS5oCkBAIC05MDMsNSArOTAzLDcgQEAgaW50IHNtdV9zeXNfc2V0 X3BwX2ZlYXR1cmVfbWFzayhzdHJ1Y3Qgc211X2NvbnRleHQgKnNtdSwgdWludDY0X3QgbmV3X21h c2spOwogaW50IHNtdV9mb3JjZV9jbGtfbGV2ZWxzKHN0cnVjdCBzbXVfY29udGV4dCAqc211LAog CQkJIGVudW0gc211X2Nsa190eXBlIGNsa190eXBlLAogCQkJIHVpbnQzMl90IG1hc2spOworaW50 IHNtdV9zZXRfbXAxX3N0YXRlKHN0cnVjdCBzbXVfY29udGV4dCAqc211LAorCQkgICAgICBlbnVt IHBwX21wMV9zdGF0ZSBtcDFfc3RhdGUpOwogCiAjZW5kaWYKLS0gCjIuMjMuMAoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxp c3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4