From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Kim, Jonathan" Subject: [PATCH 2/2] Revert "drm/amdgpu: disable c-states on xgmi perfmons" Date: Fri, 18 Oct 2019 17:59:44 +0000 Message-ID: <20191018175928.25307-2-jonathan.kim@amd.com> References: <20191018175928.25307-1-jonathan.kim@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20191018175928.25307-1-jonathan.kim-5C7GfCeVMHo@public.gmane.org> 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" , "Kuehling, Felix" , "Kim, Jonathan" VGhpcyByZXZlcnRzIGNvbW1pdCA1NDI3NWNkMTY0OWY0MDM0YzY0NTBiNmM1YTgzNThmY2Q0Zjdk ZGE2LgoKaW5jb21wbGV0ZSBzb2x1dGlvbiB0byBkZiBjLXN0YXRlIHJhY2UgY29uZGl0aW9uLiAg c211IG1zZyBpbiBwZXJmIGV2ZW50cwpjYXVzZXMgZGVhZGxvY2suCgpDaGFuZ2UtSWQ6IElhODUx NzlkZjJiZDE2NzY1N2U0MmEyZDgyOGM0YTdjNDc1YzM5MmZmClNpZ25lZC1vZmYtYnk6IEpvbmF0 aGFuIEtpbSA8Sm9uYXRoYW4uS2ltQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvZGZfdjNfNi5jIHwgMzYgKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAzNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9kZl92M182LmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1k L2FtZGdwdS9kZl92M182LmMKaW5kZXggZjQwM2M2MmM5NDRlLi4xNmZiZDJiYzhhZDEgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2RmX3YzXzYuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS9kZl92M182LmMKQEAgLTkzLDIxICs5Myw2IEBAIGNvbnN0IHN0 cnVjdCBhdHRyaWJ1dGVfZ3JvdXAgKmRmX3YzXzZfYXR0cl9ncm91cHNbXSA9IHsKIAkJTlVMTAog fTsKIAotc3RhdGljIGRmX3YzXzZfc2V0X2RmX2NzdGF0ZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAq YWRldiwgaW50IGFsbG93KQotewotCWludCByID0gMDsKLQotCWlmIChpc19zdXBwb3J0X3N3X3Nt dShhZGV2KSkgewotCQlyID0gc211X3NldF9kZl9jc3RhdGUoJmFkZXYtPnNtdSwgYWxsb3cpOwot CX0gZWxzZSBpZiAoYWRldi0+cG93ZXJwbGF5LnBwX2Z1bmNzCi0JCQkmJiBhZGV2LT5wb3dlcnBs YXkucHBfZnVuY3MtPnNldF9kZl9jc3RhdGUpIHsKLQkJciA9IGFkZXYtPnBvd2VycGxheS5wcF9m dW5jcy0+c2V0X2RmX2NzdGF0ZSgKLQkJCWFkZXYtPnBvd2VycGxheS5wcF9oYW5kbGUsIGFsbG93 KTsKLQl9Ci0KLQlyZXR1cm4gcjsKLX0KLQogc3RhdGljIHVpbnQ2NF90IGRmX3YzXzZfZ2V0X2Zp Y2Eoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsCiAJCQkJIHVpbnQzMl90IGZpY2FhX3ZhbCkK IHsKQEAgLTExNyw5ICsxMDIsNiBAQCBzdGF0aWMgdWludDY0X3QgZGZfdjNfNl9nZXRfZmljYShz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAlhZGRyZXNzID0gYWRldi0+bmJpby5mdW5jcy0+ Z2V0X3BjaWVfaW5kZXhfb2Zmc2V0KGFkZXYpOwogCWRhdGEgPSBhZGV2LT5uYmlvLmZ1bmNzLT5n ZXRfcGNpZV9kYXRhX29mZnNldChhZGV2KTsKIAotCWlmIChkZl92M182X3NldF9kZl9jc3RhdGUo YWRldiwgREZfQ1NUQVRFX0RJU0FMTE9XKSkKLQkJcmV0dXJuIDB4RkZGRkZGRkZGRkZGRkZGRjsK LQogCXNwaW5fbG9ja19pcnFzYXZlKCZhZGV2LT5wY2llX2lkeF9sb2NrLCBmbGFncyk7CiAJV1JF RzMyKGFkZHJlc3MsIHNtbkRGX1BJRV9BT05fRmFicmljSW5kaXJlY3RDb25maWdBY2Nlc3NBZGRy ZXNzMyk7CiAJV1JFRzMyKGRhdGEsIGZpY2FhX3ZhbCk7CkBAIC0xMzIsOCArMTE0LDYgQEAgc3Rh dGljIHVpbnQ2NF90IGRmX3YzXzZfZ2V0X2ZpY2Eoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYs CiAKIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZhZGV2LT5wY2llX2lkeF9sb2NrLCBmbGFncyk7 CiAKLQlkZl92M182X3NldF9kZl9jc3RhdGUoYWRldiwgREZfQ1NUQVRFX0FMTE9XKTsKLQogCXJl dHVybiAoKChmaWNhZGhfdmFsICYgMHhGRkZGRkZGRkZGRkZGRkZGKSA8PCAzMikgfCBmaWNhZGxf dmFsKTsKIH0KIApAQCAtMTQ1LDkgKzEyNSw2IEBAIHN0YXRpYyB2b2lkIGRmX3YzXzZfc2V0X2Zp Y2Eoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHVpbnQzMl90IGZpY2FhX3ZhbCwKIAlhZGRy ZXNzID0gYWRldi0+bmJpby5mdW5jcy0+Z2V0X3BjaWVfaW5kZXhfb2Zmc2V0KGFkZXYpOwogCWRh dGEgPSBhZGV2LT5uYmlvLmZ1bmNzLT5nZXRfcGNpZV9kYXRhX29mZnNldChhZGV2KTsKIAotCWlm IChkZl92M182X3NldF9kZl9jc3RhdGUoYWRldiwgREZfQ1NUQVRFX0RJU0FMTE9XKSkKLQkJcmV0 dXJuOwotCiAJc3Bpbl9sb2NrX2lycXNhdmUoJmFkZXYtPnBjaWVfaWR4X2xvY2ssIGZsYWdzKTsK IAlXUkVHMzIoYWRkcmVzcywgc21uREZfUElFX0FPTl9GYWJyaWNJbmRpcmVjdENvbmZpZ0FjY2Vz c0FkZHJlc3MzKTsKIAlXUkVHMzIoZGF0YSwgZmljYWFfdmFsKTsKQEAgLTE1Nyw5ICsxMzQsOCBA QCBzdGF0aWMgdm9pZCBkZl92M182X3NldF9maWNhKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2 LCB1aW50MzJfdCBmaWNhYV92YWwsCiAKIAlXUkVHMzIoYWRkcmVzcywgc21uREZfUElFX0FPTl9G YWJyaWNJbmRpcmVjdENvbmZpZ0FjY2Vzc0RhdGFIaTMpOwogCVdSRUczMihkYXRhLCBmaWNhZGhf dmFsKTsKLQlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZhZGV2LT5wY2llX2lkeF9sb2NrLCBmbGFn cyk7CiAKLQlkZl92M182X3NldF9kZl9jc3RhdGUoYWRldiwgREZfQ1NUQVRFX0FMTE9XKTsKKwlz cGluX3VubG9ja19pcnFyZXN0b3JlKCZhZGV2LT5wY2llX2lkeF9sb2NrLCBmbGFncyk7CiB9CiAK IC8qCkBAIC0xNzcsMTcgKzE1MywxMiBAQCBzdGF0aWMgdm9pZCBkZl92M182X3BlcmZtb25fcnJl ZyhzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAlhZGRyZXNzID0gYWRldi0+bmJpby5mdW5j cy0+Z2V0X3BjaWVfaW5kZXhfb2Zmc2V0KGFkZXYpOwogCWRhdGEgPSBhZGV2LT5uYmlvLmZ1bmNz LT5nZXRfcGNpZV9kYXRhX29mZnNldChhZGV2KTsKIAotCWlmIChkZl92M182X3NldF9kZl9jc3Rh dGUoYWRldiwgREZfQ1NUQVRFX0RJU0FMTE9XKSkKLQkJcmV0dXJuOwotCiAJc3Bpbl9sb2NrX2ly cXNhdmUoJmFkZXYtPnBjaWVfaWR4X2xvY2ssIGZsYWdzKTsKIAlXUkVHMzIoYWRkcmVzcywgbG9f YWRkcik7CiAJKmxvX3ZhbCA9IFJSRUczMihkYXRhKTsKIAlXUkVHMzIoYWRkcmVzcywgaGlfYWRk cik7CiAJKmhpX3ZhbCA9IFJSRUczMihkYXRhKTsKIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZh ZGV2LT5wY2llX2lkeF9sb2NrLCBmbGFncyk7Ci0KLQlkZl92M182X3NldF9kZl9jc3RhdGUoYWRl diwgREZfQ1NUQVRFX0FMTE9XKTsKIH0KIAogLyoKQEAgLTIwNCwxNyArMTc1LDEyIEBAIHN0YXRp YyB2b2lkIGRmX3YzXzZfcGVyZm1vbl93cmVnKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCB1 aW50MzJfdCBsb19hZGRyLAogCWFkZHJlc3MgPSBhZGV2LT5uYmlvLmZ1bmNzLT5nZXRfcGNpZV9p bmRleF9vZmZzZXQoYWRldik7CiAJZGF0YSA9IGFkZXYtPm5iaW8uZnVuY3MtPmdldF9wY2llX2Rh dGFfb2Zmc2V0KGFkZXYpOwogCi0JaWYgKGRmX3YzXzZfc2V0X2RmX2NzdGF0ZShhZGV2LCBERl9D U1RBVEVfRElTQUxMT1cpKQotCQlyZXR1cm47Ci0KIAlzcGluX2xvY2tfaXJxc2F2ZSgmYWRldi0+ cGNpZV9pZHhfbG9jaywgZmxhZ3MpOwogCVdSRUczMihhZGRyZXNzLCBsb19hZGRyKTsKIAlXUkVH MzIoZGF0YSwgbG9fdmFsKTsKIAlXUkVHMzIoYWRkcmVzcywgaGlfYWRkcik7CiAJV1JFRzMyKGRh dGEsIGhpX3ZhbCk7CiAJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmYWRldi0+cGNpZV9pZHhfbG9j aywgZmxhZ3MpOwotCi0JZGZfdjNfNl9zZXRfZGZfY3N0YXRlKGFkZXYsIERGX0NTVEFURV9BTExP Vyk7CiB9CiAKIC8qIGdldCB0aGUgbnVtYmVyIG9mIGRmIGNvdW50ZXJzIGF2YWlsYWJsZSAqLwot LSAKMi4xNy4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZng=