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:30:36 +0000 Message-ID: <20191018172934.24716-2-jonathan.kim@amd.com> References: <20191018172934.24716-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: <20191018172934.24716-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: "Kuehling, Felix" , "Kim, Jonathan" VGhpcyByZXZlcnRzIGNvbW1pdCA1NDI3NWNkMTY0OWY0MDM0YzY0NTBiNmM1YTgzNThmY2Q0Zjdk ZGE2LgoKU2lnbmVkLW9mZi1ieTogSm9uYXRoYW4gS2ltIDxKb25hdGhhbi5LaW1AYW1kLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9kZl92M182LmMgfCAzNiArLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDM1IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2RmX3Yz XzYuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2RmX3YzXzYuYwppbmRleCBmNDAzYzYy Yzk0NGUuLjE2ZmJkMmJjOGFkMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRn cHUvZGZfdjNfNi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2RmX3YzXzYuYwpA QCAtOTMsMjEgKzkzLDYgQEAgY29uc3Qgc3RydWN0IGF0dHJpYnV0ZV9ncm91cCAqZGZfdjNfNl9h dHRyX2dyb3Vwc1tdID0gewogCQlOVUxMCiB9OwogCi1zdGF0aWMgZGZfdjNfNl9zZXRfZGZfY3N0 YXRlKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LCBpbnQgYWxsb3cpCi17Ci0JaW50IHIgPSAw OwotCi0JaWYgKGlzX3N1cHBvcnRfc3dfc211KGFkZXYpKSB7Ci0JCXIgPSBzbXVfc2V0X2RmX2Nz dGF0ZSgmYWRldi0+c211LCBhbGxvdyk7Ci0JfSBlbHNlIGlmIChhZGV2LT5wb3dlcnBsYXkucHBf ZnVuY3MKLQkJCSYmIGFkZXYtPnBvd2VycGxheS5wcF9mdW5jcy0+c2V0X2RmX2NzdGF0ZSkgewot CQlyID0gYWRldi0+cG93ZXJwbGF5LnBwX2Z1bmNzLT5zZXRfZGZfY3N0YXRlKAotCQkJYWRldi0+ cG93ZXJwbGF5LnBwX2hhbmRsZSwgYWxsb3cpOwotCX0KLQotCXJldHVybiByOwotfQotCiBzdGF0 aWMgdWludDY0X3QgZGZfdjNfNl9nZXRfZmljYShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwK IAkJCQkgdWludDMyX3QgZmljYWFfdmFsKQogewpAQCAtMTE3LDkgKzEwMiw2IEBAIHN0YXRpYyB1 aW50NjRfdCBkZl92M182X2dldF9maWNhKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAogCWFk ZHJlc3MgPSBhZGV2LT5uYmlvLmZ1bmNzLT5nZXRfcGNpZV9pbmRleF9vZmZzZXQoYWRldik7CiAJ ZGF0YSA9IGFkZXYtPm5iaW8uZnVuY3MtPmdldF9wY2llX2RhdGFfb2Zmc2V0KGFkZXYpOwogCi0J aWYgKGRmX3YzXzZfc2V0X2RmX2NzdGF0ZShhZGV2LCBERl9DU1RBVEVfRElTQUxMT1cpKQotCQly ZXR1cm4gMHhGRkZGRkZGRkZGRkZGRkZGOwotCiAJc3Bpbl9sb2NrX2lycXNhdmUoJmFkZXYtPnBj aWVfaWR4X2xvY2ssIGZsYWdzKTsKIAlXUkVHMzIoYWRkcmVzcywgc21uREZfUElFX0FPTl9GYWJy aWNJbmRpcmVjdENvbmZpZ0FjY2Vzc0FkZHJlc3MzKTsKIAlXUkVHMzIoZGF0YSwgZmljYWFfdmFs KTsKQEAgLTEzMiw4ICsxMTQsNiBAQCBzdGF0aWMgdWludDY0X3QgZGZfdjNfNl9nZXRfZmljYShz dHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwKIAogCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmFk ZXYtPnBjaWVfaWR4X2xvY2ssIGZsYWdzKTsKIAotCWRmX3YzXzZfc2V0X2RmX2NzdGF0ZShhZGV2 LCBERl9DU1RBVEVfQUxMT1cpOwotCiAJcmV0dXJuICgoKGZpY2FkaF92YWwgJiAweEZGRkZGRkZG RkZGRkZGRkYpIDw8IDMyKSB8IGZpY2FkbF92YWwpOwogfQogCkBAIC0xNDUsOSArMTI1LDYgQEAg c3RhdGljIHZvaWQgZGZfdjNfNl9zZXRfZmljYShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldiwg dWludDMyX3QgZmljYWFfdmFsLAogCWFkZHJlc3MgPSBhZGV2LT5uYmlvLmZ1bmNzLT5nZXRfcGNp ZV9pbmRleF9vZmZzZXQoYWRldik7CiAJZGF0YSA9IGFkZXYtPm5iaW8uZnVuY3MtPmdldF9wY2ll X2RhdGFfb2Zmc2V0KGFkZXYpOwogCi0JaWYgKGRmX3YzXzZfc2V0X2RmX2NzdGF0ZShhZGV2LCBE Rl9DU1RBVEVfRElTQUxMT1cpKQotCQlyZXR1cm47Ci0KIAlzcGluX2xvY2tfaXJxc2F2ZSgmYWRl di0+cGNpZV9pZHhfbG9jaywgZmxhZ3MpOwogCVdSRUczMihhZGRyZXNzLCBzbW5ERl9QSUVfQU9O X0ZhYnJpY0luZGlyZWN0Q29uZmlnQWNjZXNzQWRkcmVzczMpOwogCVdSRUczMihkYXRhLCBmaWNh YV92YWwpOwpAQCAtMTU3LDkgKzEzNCw4IEBAIHN0YXRpYyB2b2lkIGRmX3YzXzZfc2V0X2ZpY2Eo c3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHVpbnQzMl90IGZpY2FhX3ZhbCwKIAogCVdSRUcz MihhZGRyZXNzLCBzbW5ERl9QSUVfQU9OX0ZhYnJpY0luZGlyZWN0Q29uZmlnQWNjZXNzRGF0YUhp Myk7CiAJV1JFRzMyKGRhdGEsIGZpY2FkaF92YWwpOwotCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUo JmFkZXYtPnBjaWVfaWR4X2xvY2ssIGZsYWdzKTsKIAotCWRmX3YzXzZfc2V0X2RmX2NzdGF0ZShh ZGV2LCBERl9DU1RBVEVfQUxMT1cpOworCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmFkZXYtPnBj aWVfaWR4X2xvY2ssIGZsYWdzKTsKIH0KIAogLyoKQEAgLTE3NywxNyArMTUzLDEyIEBAIHN0YXRp YyB2b2lkIGRmX3YzXzZfcGVyZm1vbl9ycmVnKHN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2LAog CWFkZHJlc3MgPSBhZGV2LT5uYmlvLmZ1bmNzLT5nZXRfcGNpZV9pbmRleF9vZmZzZXQoYWRldik7 CiAJZGF0YSA9IGFkZXYtPm5iaW8uZnVuY3MtPmdldF9wY2llX2RhdGFfb2Zmc2V0KGFkZXYpOwog Ci0JaWYgKGRmX3YzXzZfc2V0X2RmX2NzdGF0ZShhZGV2LCBERl9DU1RBVEVfRElTQUxMT1cpKQot CQlyZXR1cm47Ci0KIAlzcGluX2xvY2tfaXJxc2F2ZSgmYWRldi0+cGNpZV9pZHhfbG9jaywgZmxh Z3MpOwogCVdSRUczMihhZGRyZXNzLCBsb19hZGRyKTsKIAkqbG9fdmFsID0gUlJFRzMyKGRhdGEp OwogCVdSRUczMihhZGRyZXNzLCBoaV9hZGRyKTsKIAkqaGlfdmFsID0gUlJFRzMyKGRhdGEpOwog CXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJmFkZXYtPnBjaWVfaWR4X2xvY2ssIGZsYWdzKTsKLQot CWRmX3YzXzZfc2V0X2RmX2NzdGF0ZShhZGV2LCBERl9DU1RBVEVfQUxMT1cpOwogfQogCiAvKgpA QCAtMjA0LDE3ICsxNzUsMTIgQEAgc3RhdGljIHZvaWQgZGZfdjNfNl9wZXJmbW9uX3dyZWcoc3Ry dWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYsIHVpbnQzMl90IGxvX2FkZHIsCiAJYWRkcmVzcyA9IGFk ZXYtPm5iaW8uZnVuY3MtPmdldF9wY2llX2luZGV4X29mZnNldChhZGV2KTsKIAlkYXRhID0gYWRl di0+bmJpby5mdW5jcy0+Z2V0X3BjaWVfZGF0YV9vZmZzZXQoYWRldik7CiAKLQlpZiAoZGZfdjNf Nl9zZXRfZGZfY3N0YXRlKGFkZXYsIERGX0NTVEFURV9ESVNBTExPVykpCi0JCXJldHVybjsKLQog CXNwaW5fbG9ja19pcnFzYXZlKCZhZGV2LT5wY2llX2lkeF9sb2NrLCBmbGFncyk7CiAJV1JFRzMy KGFkZHJlc3MsIGxvX2FkZHIpOwogCVdSRUczMihkYXRhLCBsb192YWwpOwogCVdSRUczMihhZGRy ZXNzLCBoaV9hZGRyKTsKIAlXUkVHMzIoZGF0YSwgaGlfdmFsKTsKIAlzcGluX3VubG9ja19pcnFy ZXN0b3JlKCZhZGV2LT5wY2llX2lkeF9sb2NrLCBmbGFncyk7Ci0KLQlkZl92M182X3NldF9kZl9j c3RhdGUoYWRldiwgREZfQ1NUQVRFX0FMTE9XKTsKIH0KIAogLyogZ2V0IHRoZSBudW1iZXIgb2Yg ZGYgY291bnRlcnMgYXZhaWxhYmxlICovCi0tIAoyLjE3LjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vYW1kLWdmeA==