From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rex Zhu Subject: [PATCH] drm/amd/powerplay: fix issue vce dpm can't be enabled on tonga. Date: Tue, 30 Aug 2016 17:21:37 +0800 Message-ID: <1472548897-17536-1-git-send-email-Rex.Zhu@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: Rex Zhu U2lnbmVkLW9mZi1ieTogUmV4IFpodSA8UmV4LlpodUBhbWQuY29tPgoKQ2hhbmdlLUlkOiBJZjdm YTQ1Y2YzZTgxYzMxYTg4MjhmMjA4ZWU5YmEwMmJiOWYxOGExYwotLS0KIC4uLi9hbWQvcG93ZXJw bGF5L2h3bWdyL3RvbmdhX2Nsb2NrcG93ZXJnYXRpbmcuYyAgIHwgNjAgKysrKystLS0tLS0tLS0t LS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvaHdtZ3IvdG9uZ2FfaHdtZ3Iu YyAgfCAzNCArKysrKystLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L2h3bWdy L3RvbmdhX2h3bWdyLmggIHwgIDIgKy0KIDMgZmlsZXMgY2hhbmdlZCwgMzEgaW5zZXJ0aW9ucygr KSwgNjUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dl cnBsYXkvaHdtZ3IvdG9uZ2FfY2xvY2twb3dlcmdhdGluZy5jIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9wb3dlcnBsYXkvaHdtZ3IvdG9uZ2FfY2xvY2twb3dlcmdhdGluZy5jCmluZGV4IGU1OGQwMzgu LjZmMmFjMTAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L2h3bWdy L3RvbmdhX2Nsb2NrcG93ZXJnYXRpbmcuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2Vy cGxheS9od21nci90b25nYV9jbG9ja3Bvd2VyZ2F0aW5nLmMKQEAgLTEzNyw1NSArMTM3LDIzIEBA IGludCB0b25nYV9waG1fcG93ZXJnYXRlX3V2ZChzdHJ1Y3QgcHBfaHdtZ3IgKmh3bWdyLCBib29s IGJnYXRlKQogaW50IHRvbmdhX3BobV9wb3dlcmdhdGVfdmNlKHN0cnVjdCBwcF9od21nciAqaHdt Z3IsIGJvb2wgYmdhdGUpCiB7CiAJc3RydWN0IHRvbmdhX2h3bWdyICpkYXRhID0gKHN0cnVjdCB0 b25nYV9od21nciAqKShod21nci0+YmFja2VuZCk7Ci0Jc3RydWN0IHBobV9zZXRfcG93ZXJfc3Rh dGVfaW5wdXQgc3RhdGVzOwotCWNvbnN0IHN0cnVjdCBwcF9wb3dlcl9zdGF0ZSAgKnBjdXJyZW50 OwotCXN0cnVjdCBwcF9wb3dlcl9zdGF0ZSAgKnJlcXVlc3RlZDsKLQotCXBjdXJyZW50ID0gaHdt Z3ItPmN1cnJlbnRfcHM7Ci0JcmVxdWVzdGVkID0gaHdtZ3ItPnJlcXVlc3RfcHM7Ci0KLQlzdGF0 ZXMucGN1cnJlbnRfc3RhdGUgPSAmKHBjdXJyZW50LT5oYXJkd2FyZSk7Ci0Jc3RhdGVzLnBuZXdf c3RhdGUgPSAmKHJlcXVlc3RlZC0+aGFyZHdhcmUpOwotCi0JaWYgKHBobV9jZl93YW50X3ZjZV9w b3dlcl9nYXRpbmcoaHdtZ3IpKSB7Ci0JCWlmIChkYXRhLT52Y2VfcG93ZXJfZ2F0ZWQgIT0gYmdh dGUpIHsKLQkJCWlmIChiZ2F0ZSkgewotCQkJCWNnc19zZXRfY2xvY2tnYXRpbmdfc3RhdGUoCi0J CQkJCQkJaHdtZ3ItPmRldmljZSwKLQkJCQkJCQlBTURfSVBfQkxPQ0tfVFlQRV9WQ0UsCi0JCQkJ CQkJQU1EX0NHX1NUQVRFX1VOR0FURSk7Ci0JCQkJY2dzX3NldF9wb3dlcmdhdGluZ19zdGF0ZSgK LQkJCQkJCQlod21nci0+ZGV2aWNlLAotCQkJCQkJCUFNRF9JUF9CTE9DS19UWVBFX1ZDRSwKLQkJ CQkJCQlBTURfUEdfU1RBVEVfR0FURSk7Ci0JCQkJdG9uZ2FfZW5hYmxlX2Rpc2FibGVfdmNlX2Rw bShod21nciwgZmFsc2UpOwotCQkJCWRhdGEtPnZjZV9wb3dlcl9nYXRlZCA9IHRydWU7Ci0JCQl9 IGVsc2UgewotCQkJCXRvbmdhX3BobV9wb3dlcnVwX3ZjZShod21ncik7Ci0JCQkJZGF0YS0+dmNl X3Bvd2VyX2dhdGVkID0gZmFsc2U7Ci0JCQkJY2dzX3NldF9wb3dlcmdhdGluZ19zdGF0ZSgKLQkJ CQkJCQlod21nci0+ZGV2aWNlLAotCQkJCQkJCUFNRF9JUF9CTE9DS19UWVBFX1ZDRSwKLQkJCQkJ CQlBTURfUEdfU1RBVEVfVU5HQVRFKTsKLQkJCQljZ3Nfc2V0X2Nsb2NrZ2F0aW5nX3N0YXRlKAot CQkJCQkJCWh3bWdyLT5kZXZpY2UsCi0JCQkJCQkJQU1EX0lQX0JMT0NLX1RZUEVfVkNFLAotCQkJ CQkJCUFNRF9QR19TVEFURV9HQVRFKTsKLQotCQkJCXRvbmdhX3VwZGF0ZV92Y2VfZHBtKGh3bWdy LCAmc3RhdGVzKTsKLQkJCQl0b25nYV9lbmFibGVfZGlzYWJsZV92Y2VfZHBtKGh3bWdyLCB0cnVl KTsKLQkJCQlyZXR1cm4gMDsKLQkJCX0KLQkJfQotCX0gZWxzZSB7Ci0JCXRvbmdhX3VwZGF0ZV92 Y2VfZHBtKGh3bWdyLCAmc3RhdGVzKTsKLQkJdG9uZ2FfZW5hYmxlX2Rpc2FibGVfdmNlX2RwbSho d21nciwgdHJ1ZSk7CisKKwlpZiAoZGF0YS0+dmNlX3Bvd2VyX2dhdGVkID09IGJnYXRlKQogCQly ZXR1cm4gMDsKLQl9CiAKLQlpZiAoIWRhdGEtPnZjZV9wb3dlcl9nYXRlZCkKLQkJdG9uZ2FfdXBk YXRlX3ZjZV9kcG0oaHdtZ3IsICZzdGF0ZXMpOworCWRhdGEtPnZjZV9wb3dlcl9nYXRlZCA9IGJn YXRlOwogCisJaWYgKGJnYXRlKSB7CisJCWNnc19zZXRfY2xvY2tnYXRpbmdfc3RhdGUoaHdtZ3It PmRldmljZSwKKwkJCQlBTURfSVBfQkxPQ0tfVFlQRV9WQ0UsCisJCQkJQU1EX0NHX1NUQVRFX0dB VEUpOworCQl0b25nYV91cGRhdGVfdmNlX2RwbShod21nciwgdHJ1ZSk7CisJfSBlbHNlIHsKKwkJ dG9uZ2FfdXBkYXRlX3ZjZV9kcG0oaHdtZ3IsIGZhbHNlKTsKKwkJY2dzX3NldF9jbG9ja2dhdGlu Z19zdGF0ZShod21nci0+ZGV2aWNlLAorCQkJCUFNRF9JUF9CTE9DS19UWVBFX1ZDRSwKKwkJCQlB TURfQ0dfU1RBVEVfVU5HQVRFKTsKKwl9CiAJcmV0dXJuIDA7CiB9CiAKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L2h3bWdyL3RvbmdhX2h3bWdyLmMgYi9kcml2ZXJz L2dwdS9kcm0vYW1kL3Bvd2VycGxheS9od21nci90b25nYV9od21nci5jCmluZGV4IGUwOTg0N2Qu LjJjMWM0ZjggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L2h3bWdy L3RvbmdhX2h3bWdyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvaHdtZ3Iv dG9uZ2FfaHdtZ3IuYwpAQCAtNTU2NywzNSArNTU2NywzNiBAQCBpbnQgdG9uZ2FfdXBkYXRlX3V2 ZF9kcG0oc3RydWN0IHBwX2h3bWdyICpod21nciwgYm9vbCBiZ2F0ZSkKIAlyZXR1cm4gdG9uZ2Ff ZW5hYmxlX2Rpc2FibGVfdXZkX2RwbShod21nciwgIWJnYXRlKTsKIH0KIAotaW50IHRvbmdhX3Vw ZGF0ZV92Y2VfZHBtKHN0cnVjdCBwcF9od21nciAqaHdtZ3IsIGNvbnN0IHZvaWQgKmlucHV0KQor aW50IHRvbmdhX3VwZGF0ZV92Y2VfZHBtKHN0cnVjdCBwcF9od21nciAqaHdtZ3IsIGJvb2wgYmdh dGUpCiB7Ci0JY29uc3Qgc3RydWN0IHBobV9zZXRfcG93ZXJfc3RhdGVfaW5wdXQgKnN0YXRlcyA9 IChjb25zdCBzdHJ1Y3QgcGhtX3NldF9wb3dlcl9zdGF0ZV9pbnB1dCAqKWlucHV0OwogCXN0cnVj dCB0b25nYV9od21nciAqZGF0YSA9IChzdHJ1Y3QgdG9uZ2FfaHdtZ3IgKikoaHdtZ3ItPmJhY2tl bmQpOwotCWNvbnN0IHN0cnVjdCB0b25nYV9wb3dlcl9zdGF0ZSAqdG9uZ2FfbnBzID0gY2FzdF9j b25zdF9waHdfdG9uZ2FfcG93ZXJfc3RhdGUoc3RhdGVzLT5wbmV3X3N0YXRlKTsKLQljb25zdCBz dHJ1Y3QgdG9uZ2FfcG93ZXJfc3RhdGUgKnRvbmdhX2NwcyA9IGNhc3RfY29uc3RfcGh3X3Rvbmdh X3Bvd2VyX3N0YXRlKHN0YXRlcy0+cGN1cnJlbnRfc3RhdGUpOwotCiAJdWludDMyX3QgbW1fYm9v dF9sZXZlbF9vZmZzZXQsIG1tX2Jvb3RfbGV2ZWxfdmFsdWU7Ci0Jc3RydWN0IHBobV9wcHRfdjFf aW5mb3JtYXRpb24gKnBwdGFibGVfaW5mbyA9IChzdHJ1Y3QgcGhtX3BwdF92MV9pbmZvcm1hdGlv biAqKShod21nci0+cHB0YWJsZSk7CisJc3RydWN0IHBobV9wcHRfdjFfaW5mb3JtYXRpb24gKnRh YmxlX2luZm8gPSAoc3RydWN0IHBobV9wcHRfdjFfaW5mb3JtYXRpb24gKikoaHdtZ3ItPnBwdGFi bGUpOwogCi0JaWYgKHRvbmdhX25wcy0+dmNlX2Nsb2Nrcy5FVkNMSyA+IDAgJiYgKHRvbmdhX2Nw cyA9PSBOVUxMIHx8IHRvbmdhX2Nwcy0+dmNlX2Nsb2Nrcy5FVkNMSyA9PSAwKSkgewotCQlkYXRh LT5zbWNfc3RhdGVfdGFibGUuVmNlQm9vdExldmVsID0gKHVpbnQ4X3QpIChwcHRhYmxlX2luZm8t Pm1tX2RlcF90YWJsZS0+Y291bnQgLSAxKTsKKwlpZiAoIWJnYXRlKSB7CisJCWlmIChwaG1fY2Fw X2VuYWJsZWQoaHdtZ3ItPnBsYXRmb3JtX2Rlc2NyaXB0b3IucGxhdGZvcm1DYXBzLAorCQkJCQkJ UEhNX1BsYXRmb3JtQ2Fwc19TdGFibGVQU3RhdGUpKQorCQkJZGF0YS0+c21jX3N0YXRlX3RhYmxl LlZjZUJvb3RMZXZlbCA9CisJCQkJKHVpbnQ4X3QpICh0YWJsZV9pbmZvLT5tbV9kZXBfdGFibGUt PmNvdW50IC0gMSk7CiAKLQkJbW1fYm9vdF9sZXZlbF9vZmZzZXQgPSBkYXRhLT5kcG1fdGFibGVf c3RhcnQgKyBvZmZzZXRvZihTTVU3Ml9EaXNjcmV0ZV9EcG1UYWJsZSwgVmNlQm9vdExldmVsKTsK KwkJbW1fYm9vdF9sZXZlbF9vZmZzZXQgPSBkYXRhLT5kcG1fdGFibGVfc3RhcnQgKworCQkJCW9m ZnNldG9mKFNNVTcyX0Rpc2NyZXRlX0RwbVRhYmxlLCBWY2VCb290TGV2ZWwpOwogCQltbV9ib290 X2xldmVsX29mZnNldCAvPSA0OwogCQltbV9ib290X2xldmVsX29mZnNldCAqPSA0OwotCQltbV9i b290X2xldmVsX3ZhbHVlID0gY2dzX3JlYWRfaW5kX3JlZ2lzdGVyKGh3bWdyLT5kZXZpY2UsIENH U19JTkRfUkVHX19TTUMsIG1tX2Jvb3RfbGV2ZWxfb2Zmc2V0KTsKKwkJbW1fYm9vdF9sZXZlbF92 YWx1ZSA9IGNnc19yZWFkX2luZF9yZWdpc3Rlcihod21nci0+ZGV2aWNlLAorCQkJCUNHU19JTkRf UkVHX19TTUMsIG1tX2Jvb3RfbGV2ZWxfb2Zmc2V0KTsKIAkJbW1fYm9vdF9sZXZlbF92YWx1ZSAm PSAweEZGMDBGRkZGOwogCQltbV9ib290X2xldmVsX3ZhbHVlIHw9IGRhdGEtPnNtY19zdGF0ZV90 YWJsZS5WY2VCb290TGV2ZWwgPDwgMTY7Ci0JCWNnc193cml0ZV9pbmRfcmVnaXN0ZXIoaHdtZ3It PmRldmljZSwgQ0dTX0lORF9SRUdfX1NNQywgbW1fYm9vdF9sZXZlbF9vZmZzZXQsIG1tX2Jvb3Rf bGV2ZWxfdmFsdWUpOworCQljZ3Nfd3JpdGVfaW5kX3JlZ2lzdGVyKGh3bWdyLT5kZXZpY2UsCisJ CQkJQ0dTX0lORF9SRUdfX1NNQywgbW1fYm9vdF9sZXZlbF9vZmZzZXQsIG1tX2Jvb3RfbGV2ZWxf dmFsdWUpOwogCiAJCWlmIChwaG1fY2FwX2VuYWJsZWQoaHdtZ3ItPnBsYXRmb3JtX2Rlc2NyaXB0 b3IucGxhdGZvcm1DYXBzLCBQSE1fUGxhdGZvcm1DYXBzX1N0YWJsZVBTdGF0ZSkpCiAJCQlzbXVt X3NlbmRfbXNnX3RvX3NtY193aXRoX3BhcmFtZXRlcihod21nci0+c211bWdyLAogCQkJCQlQUFNN Q19NU0dfVkNFRFBNX1NldEVuYWJsZWRNYXNrLAotCQkJCSh1aW50MzJfdCkoMSA8PCBkYXRhLT5z bWNfc3RhdGVfdGFibGUuVmNlQm9vdExldmVsKSk7CisJCQkJCSh1aW50MzJfdCkxIDw8IGRhdGEt PnNtY19zdGF0ZV90YWJsZS5WY2VCb290TGV2ZWwpOworCX0KIAotCQl0b25nYV9lbmFibGVfZGlz YWJsZV92Y2VfZHBtKGh3bWdyLCB0cnVlKTsKLQl9IGVsc2UgaWYgKHRvbmdhX25wcy0+dmNlX2Ns b2Nrcy5FVkNMSyA9PSAwICYmIHRvbmdhX2NwcyAhPSBOVUxMICYmIHRvbmdhX2Nwcy0+dmNlX2Ns b2Nrcy5FVkNMSyA+IDApCi0JCXRvbmdhX2VuYWJsZV9kaXNhYmxlX3ZjZV9kcG0oaHdtZ3IsIGZh bHNlKTsKKwl0b25nYV9lbmFibGVfZGlzYWJsZV92Y2VfZHBtKGh3bWdyLCAhYmdhdGUpOwogCiAJ cmV0dXJuIDA7CiB9CkBAIC01NzMyLDkgKzU3MzMsNiBAQCBzdGF0aWMgaW50IHRvbmdhX3NldF9w b3dlcl9zdGF0ZV90YXNrcyhzdHJ1Y3QgcHBfaHdtZ3IgKmh3bWdyLCBjb25zdCB2b2lkICppbnB1 dAogCXRtcF9yZXN1bHQgPSB0b25nYV9nZW5lcmF0ZV9kcG1fbGV2ZWxfZW5hYmxlX21hc2soaHdt Z3IsIGlucHV0KTsKIAlQUF9BU1NFUlRfV0lUSF9DT0RFKCgwID09IHRtcF9yZXN1bHQpLCAiRmFp bGVkIHRvIGdlbmVyYXRlIERQTSBsZXZlbCBlbmFibGVkIG1hc2shIiwgcmVzdWx0ID0gdG1wX3Jl c3VsdCk7CiAKLQl0bXBfcmVzdWx0ID0gdG9uZ2FfdXBkYXRlX3ZjZV9kcG0oaHdtZ3IsIGlucHV0 KTsKLQlQUF9BU1NFUlRfV0lUSF9DT0RFKCgwID09IHRtcF9yZXN1bHQpLCAiRmFpbGVkIHRvIHVw ZGF0ZSBWQ0UgRFBNISIsIHJlc3VsdCA9IHRtcF9yZXN1bHQpOwotCiAJdG1wX3Jlc3VsdCA9IHRv bmdhX3VwZGF0ZV9zY2xrX3RocmVzaG9sZChod21ncik7CiAJUFBfQVNTRVJUX1dJVEhfQ09ERSgo MCA9PSB0bXBfcmVzdWx0KSwgIkZhaWxlZCB0byB1cGRhdGUgU0NMSyB0aHJlc2hvbGQhIiwgcmVz dWx0ID0gdG1wX3Jlc3VsdCk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93 ZXJwbGF5L2h3bWdyL3RvbmdhX2h3bWdyLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxh eS9od21nci90b25nYV9od21nci5oCmluZGV4IGZjYWQ5NDIuLmY2Zjc2ZDQgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L2h3bWdyL3RvbmdhX2h3bWdyLmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvaHdtZ3IvdG9uZ2FfaHdtZ3IuaApAQCAtMzky LDcgKzM5Miw3IEBAIHR5cGVkZWYgc3RydWN0IHRvbmdhX2h3bWdyIHRvbmdhX2h3bWdyOwogI2Rl ZmluZSBUT05HQV9VTlVTRURfR1BJT19QSU4gICAgICAgICAgICAgICAgICAgICAgICAweDdGCiAK IGludCB0b25nYV9od21ncl9pbml0KHN0cnVjdCBwcF9od21nciAqaHdtZ3IpOwotaW50IHRvbmdh X3VwZGF0ZV92Y2VfZHBtKHN0cnVjdCBwcF9od21nciAqaHdtZ3IsIGNvbnN0IHZvaWQgKmlucHV0 KTsKK2ludCB0b25nYV91cGRhdGVfdmNlX2RwbShzdHJ1Y3QgcHBfaHdtZ3IgKmh3bWdyLCBib29s IGJnYXRlKTsKIGludCB0b25nYV91cGRhdGVfdXZkX2RwbShzdHJ1Y3QgcHBfaHdtZ3IgKmh3bWdy LCBib29sIGJnYXRlKTsKIGludCB0b25nYV9lbmFibGVfZGlzYWJsZV91dmRfZHBtKHN0cnVjdCBw cF9od21nciAqaHdtZ3IsIGJvb2wgZW5hYmxlKTsKIGludCB0b25nYV9lbmFibGVfZGlzYWJsZV92 Y2VfZHBtKHN0cnVjdCBwcF9od21nciAqaHdtZ3IsIGJvb2wgZW5hYmxlKTsKLS0gCjEuOS4xCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1h aWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK