From: "Kim, Jonathan" Subject: [PATCH] drm/amdgpu: revert calling smu msg in df callbacks Date: Fri, 18 Oct 2019 20:29:07 +0000 Message-ID: <20191018202856.27133-1-jonathan.kim@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: "Kuehling, Felix" , "Kim, Jonathan" cmV2ZXJ0aW5nIHRoZSBmb2xsb3dpbmcgY2hhbmdlczoKY29tbWl0IDdkZDJlYjMxZmNkNSAoImRy bS9hbWRncHU6IGZpeCBjb21waWxlciB3YXJuaW5ncyBmb3IgZGYgcGVyZm1vbnMiKQpjb21taXQg NTQyNzVjZDE2NDlmICgiZHJtL2FtZGdwdTogZGlzYWJsZSBjLXN0YXRlcyBvbiB4Z21pIHBlcmZt b25zIikKCnBlcmYgZXZlbnRzIHVzZSBzcGluLWxvY2tzLiAgZW1iZWRkZWQgc211IG1lc3NhZ2Vz IGhhdmUgcG90ZW50aWFsIGxvbmcKcmVzcG9uc2UgdGltZXMgYW5kIHBvdGVudGlhbGx5IGRlYWRs b2NrcyB0aGUgc3lzdGVtLgoKQ2hhbmdlLUlkOiBJYzM2YzM1YTYyZGVjMTE2ZDBhMmY1YjY5YzIy YWY0ZDQxNDQ1ODY3OQpTaWduZWQtb2ZmLWJ5OiBKb25hdGhhbiBLaW0gPEpvbmF0aGFuLktpbUBh bWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2RmX3YzXzYuYyB8IDM4ICsr LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyIGluc2VydGlvbnMo KyksIDM2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1k Z3B1L2RmX3YzXzYuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2RmX3YzXzYuYwppbmRl eCBlMWNmN2U5YzYxNmEuLjE2ZmJkMmJjOGFkMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvZGZfdjNfNi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2Rm X3YzXzYuYwpAQCAtOTMsMjEgKzkzLDYgQEAgY29uc3Qgc3RydWN0IGF0dHJpYnV0ZV9ncm91cCAq ZGZfdjNfNl9hdHRyX2dyb3Vwc1tdID0gewogCQlOVUxMCiB9OwogCi1zdGF0aWMgaW50IGRmX3Yz XzZfc2V0X2RmX2NzdGF0ZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwgaW50IGFsbG93KQot ewotCWludCByID0gMDsKLQotCWlmIChpc19zdXBwb3J0X3N3X3NtdShhZGV2KSkgewotCQlyID0g c211X3NldF9kZl9jc3RhdGUoJmFkZXYtPnNtdSwgYWxsb3cpOwotCX0gZWxzZSBpZiAoYWRldi0+ cG93ZXJwbGF5LnBwX2Z1bmNzCi0JCQkmJiBhZGV2LT5wb3dlcnBsYXkucHBfZnVuY3MtPnNldF9k Zl9jc3RhdGUpIHsKLQkJciA9IGFkZXYtPnBvd2VycGxheS5wcF9mdW5jcy0+c2V0X2RmX2NzdGF0 ZSgKLQkJCWFkZXYtPnBvd2VycGxheS5wcF9oYW5kbGUsIGFsbG93KTsKLQl9Ci0KLQlyZXR1cm4g cjsKLX0KLQogc3RhdGljIHVpbnQ2NF90IGRmX3YzXzZfZ2V0X2ZpY2Eoc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYsCiAJCQkJIHVpbnQzMl90IGZpY2FhX3ZhbCkKIHsKQEAgLTExNyw5ICsxMDIs NiBAQCBzdGF0aWMgdWludDY0X3QgZGZfdjNfNl9nZXRfZmljYShzdHJ1Y3QgYW1kZ3B1X2Rldmlj ZSAqYWRldiwKIAlhZGRyZXNzID0gYWRldi0+bmJpby5mdW5jcy0+Z2V0X3BjaWVfaW5kZXhfb2Zm c2V0KGFkZXYpOwogCWRhdGEgPSBhZGV2LT5uYmlvLmZ1bmNzLT5nZXRfcGNpZV9kYXRhX29mZnNl dChhZGV2KTsKIAotCWlmIChkZl92M182X3NldF9kZl9jc3RhdGUoYWRldiwgREZfQ1NUQVRFX0RJ U0FMTE9XKSkKLQkJcmV0dXJuIDB4RkZGRkZGRkZGRkZGRkZGRjsKLQogCXNwaW5fbG9ja19pcnFz YXZlKCZhZGV2LT5wY2llX2lkeF9sb2NrLCBmbGFncyk7CiAJV1JFRzMyKGFkZHJlc3MsIHNtbkRG X1BJRV9BT05fRmFicmljSW5kaXJlY3RDb25maWdBY2Nlc3NBZGRyZXNzMyk7CiAJV1JFRzMyKGRh dGEsIGZpY2FhX3ZhbCk7CkBAIC0xMzIsOCArMTE0LDYgQEAgc3RhdGljIHVpbnQ2NF90IGRmX3Yz XzZfZ2V0X2ZpY2Eoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAKIAlzcGluX3VubG9ja19p cnFyZXN0b3JlKCZhZGV2LT5wY2llX2lkeF9sb2NrLCBmbGFncyk7CiAKLQlkZl92M182X3NldF9k Zl9jc3RhdGUoYWRldiwgREZfQ1NUQVRFX0FMTE9XKTsKLQogCXJldHVybiAoKChmaWNhZGhfdmFs ICYgMHhGRkZGRkZGRkZGRkZGRkZGKSA8PCAzMikgfCBmaWNhZGxfdmFsKTsKIH0KIApAQCAtMTQ1 LDkgKzEyNSw2IEBAIHN0YXRpYyB2b2lkIGRmX3YzXzZfc2V0X2ZpY2Eoc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYsIHVpbnQzMl90IGZpY2FhX3ZhbCwKIAlhZGRyZXNzID0gYWRldi0+bmJpby5m dW5jcy0+Z2V0X3BjaWVfaW5kZXhfb2Zmc2V0KGFkZXYpOwogCWRhdGEgPSBhZGV2LT5uYmlvLmZ1 bmNzLT5nZXRfcGNpZV9kYXRhX29mZnNldChhZGV2KTsKIAotCWlmIChkZl92M182X3NldF9kZl9j c3RhdGUoYWRldiwgREZfQ1NUQVRFX0RJU0FMTE9XKSkKLQkJcmV0dXJuOwotCiAJc3Bpbl9sb2Nr X2lycXNhdmUoJmFkZXYtPnBjaWVfaWR4X2xvY2ssIGZsYWdzKTsKIAlXUkVHMzIoYWRkcmVzcywg c21uREZfUElFX0FPTl9GYWJyaWNJbmRpcmVjdENvbmZpZ0FjY2Vzc0FkZHJlc3MzKTsKIAlXUkVH MzIoZGF0YSwgZmljYWFfdmFsKTsKQEAgLTE1Nyw5ICsxMzQsOCBAQCBzdGF0aWMgdm9pZCBkZl92 M182X3NldF9maWNhKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1aW50MzJfdCBmaWNhYV92 YWwsCiAKIAlXUkVHMzIoYWRkcmVzcywgc21uREZfUElFX0FPTl9GYWJyaWNJbmRpcmVjdENvbmZp Z0FjY2Vzc0RhdGFIaTMpOwogCVdSRUczMihkYXRhLCBmaWNhZGhfdmFsKTsKLQlzcGluX3VubG9j a19pcnFyZXN0b3JlKCZhZGV2LT5wY2llX2lkeF9sb2NrLCBmbGFncyk7CiAKLQlkZl92M182X3Nl dF9kZl9jc3RhdGUoYWRldiwgREZfQ1NUQVRFX0FMTE9XKTsKKwlzcGluX3VubG9ja19pcnFyZXN0 b3JlKCZhZGV2LT5wY2llX2lkeF9sb2NrLCBmbGFncyk7CiB9CiAKIC8qCkBAIC0xNzcsMTcgKzE1 MywxMiBAQCBzdGF0aWMgdm9pZCBkZl92M182X3BlcmZtb25fcnJlZyhzdHJ1Y3QgYW1kZ3B1X2Rl dmljZSAqYWRldiwKIAlhZGRyZXNzID0gYWRldi0+bmJpby5mdW5jcy0+Z2V0X3BjaWVfaW5kZXhf b2Zmc2V0KGFkZXYpOwogCWRhdGEgPSBhZGV2LT5uYmlvLmZ1bmNzLT5nZXRfcGNpZV9kYXRhX29m ZnNldChhZGV2KTsKIAotCWlmIChkZl92M182X3NldF9kZl9jc3RhdGUoYWRldiwgREZfQ1NUQVRF X0RJU0FMTE9XKSkKLQkJcmV0dXJuOwotCiAJc3Bpbl9sb2NrX2lycXNhdmUoJmFkZXYtPnBjaWVf aWR4X2xvY2ssIGZsYWdzKTsKIAlXUkVHMzIoYWRkcmVzcywgbG9fYWRkcik7CiAJKmxvX3ZhbCA9 IFJSRUczMihkYXRhKTsKIAlXUkVHMzIoYWRkcmVzcywgaGlfYWRkcik7CiAJKmhpX3ZhbCA9IFJS RUczMihkYXRhKTsKIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZhZGV2LT5wY2llX2lkeF9sb2Nr LCBmbGFncyk7Ci0KLQlkZl92M182X3NldF9kZl9jc3RhdGUoYWRldiwgREZfQ1NUQVRFX0FMTE9X KTsKIH0KIAogLyoKQEAgLTIwNCwxNyArMTc1LDEyIEBAIHN0YXRpYyB2b2lkIGRmX3YzXzZfcGVy Zm1vbl93cmVnKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1aW50MzJfdCBsb19hZGRyLAog CWFkZHJlc3MgPSBhZGV2LT5uYmlvLmZ1bmNzLT5nZXRfcGNpZV9pbmRleF9vZmZzZXQoYWRldik7 CiAJZGF0YSA9IGFkZXYtPm5iaW8uZnVuY3MtPmdldF9wY2llX2RhdGFfb2Zmc2V0KGFkZXYpOwog Ci0JaWYgKGRmX3YzXzZfc2V0X2RmX2NzdGF0ZShhZGV2LCBERl9DU1RBVEVfRElTQUxMT1cpKQot CQlyZXR1cm47Ci0KIAlzcGluX2xvY2tfaXJxc2F2ZSgmYWRldi0+cGNpZV9pZHhfbG9jaywgZmxh Z3MpOwogCVdSRUczMihhZGRyZXNzLCBsb19hZGRyKTsKIAlXUkVHMzIoZGF0YSwgbG9fdmFsKTsK IAlXUkVHMzIoYWRkcmVzcywgaGlfYWRkcik7CiAJV1JFRzMyKGRhdGEsIGhpX3ZhbCk7CiAJc3Bp bl91bmxvY2tfaXJxcmVzdG9yZSgmYWRldi0+cGNpZV9pZHhfbG9jaywgZmxhZ3MpOwotCi0JZGZf djNfNl9zZXRfZGZfY3N0YXRlKGFkZXYsIERGX0NTVEFURV9BTExPVyk7CiB9CiAKIC8qIGdldCB0 aGUgbnVtYmVyIG9mIGRmIGNvdW50ZXJzIGF2YWlsYWJsZSAqLwpAQCAtNTQ2LDcgKzUxMiw3IEBA IHN0YXRpYyB2b2lkIGRmX3YzXzZfcG1jX2dldF9jb3VudChzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldiwKIAkJCQkgIHVpbnQ2NF90IGNvbmZpZywKIAkJCQkgIHVpbnQ2NF90ICpjb3VudCkKIHsK LQl1aW50MzJfdCBsb19iYXNlX2FkZHIsIGhpX2Jhc2VfYWRkciwgbG9fdmFsID0gMCwgaGlfdmFs ID0gMDsKKwl1aW50MzJfdCBsb19iYXNlX2FkZHIsIGhpX2Jhc2VfYWRkciwgbG9fdmFsLCBoaV92 YWw7CiAJKmNvdW50ID0gMDsKIAogCXN3aXRjaCAoYWRldi0+YXNpY190eXBlKSB7Ci0tIAoyLjE3 LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1n ZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeA==