From: Tom St Denis Subject: [PATCH 4/4] drm/amd/powerplay: Fix PG/CG for UVD Date: Wed, 27 Jul 2016 12:21:02 -0400 Message-ID: <20160727162102.30679-5-tom.stdenis@amd.com> References: <20160727162102.30679-1-tom.stdenis@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20160727162102.30679-1-tom.stdenis-5C7GfCeVMHo@public.gmane.org> 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: Tom St Denis VGhpcyBwYXRjaCByZW1vdmVzIHRoZSBlbmFibGVfY2xvY2tfcG93ZXJfZ2F0aW5nc190YXNrcwp0 YXNrIGZyb20gdGhlIGluaXRpYWxpemUgc2VxdWVuY2Ugd2hpY2ggd291bGQgaGF2ZSBwb3dlcmVk Cm9mZiB0aGUgVVZEIChhbmQgb3RoZXIpIGJsb2NrcyBiZWZvcmUgaW5pdC4KClRoZSBwYXRjaCBh bHNvIGZpeGVzIHRoZSBwb3dlciB1cCBvcmRlciB0byBzZXQgdGhlIGNsb2NrZ2F0aW5nCmFmdGVy IHVuZ2F0aW5nIHBvd2VyLgoKRmluYWxseSwgdGhlIHBhdGNoIGVuYWJsZXMgVVZEIFBHIHdpdGgg cG93ZXJwbGF5IGVuYWJsZWQuCgpTaWduZWQtb2ZmLWJ5OiBUb20gU3QgRGVuaXMgPHRvbS5zdGRl bmlzQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmggICAg ICAgICAgICAgICAgfCAgNSArKysrKwogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 X2Nncy5jICAgICAgICAgICAgfCAgNSAtLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv dXZkX3Y2XzAuYyAgICAgICAgICAgICAgfCAgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Ft ZGdwdS92aS5jICAgICAgICAgICAgICAgICAgICB8IDEyICsrKystLS0tLS0tLQogLi4uL2RybS9h bWQvcG93ZXJwbGF5L2V2ZW50bWdyL2V2ZW50YWN0aW9uY2hhaW5zLmMgfCAgMSAtCiAuLi4vZHJt L2FtZC9wb3dlcnBsYXkvaHdtZ3IvY3pfY2xvY2twb3dlcmdhdGluZy5jICB8IDIyICsrKysrKysr KysrKysrKysrKy0tLS0KIDYgZmlsZXMgY2hhbmdlZCwgMjkgaW5zZXJ0aW9ucygrKSwgMjAgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1 LmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaAppbmRleCBkMDQ2MGVhMmY4 NWIuLjQ2ZDMwMTAwYzQxYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgKQEAgLTI1 MTgsNSArMjUxOCwxMCBAQCBpbnQgYW1kZ3B1X2RtX2Rpc3BsYXlfcmVzdW1lKHN0cnVjdCBhbWRn cHVfZGV2aWNlICphZGV2ICk7CiBzdGF0aWMgaW5saW5lIGludCBhbWRncHVfZG1fZGlzcGxheV9y ZXN1bWUoc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYpIHsgcmV0dXJuIDA7IH0KICNlbmRpZgog CitzdHJ1Y3QgYW1kZ3B1X2Nnc19kZXZpY2UgeworCXN0cnVjdCBjZ3NfZGV2aWNlIGJhc2U7CisJ c3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXY7Cit9OworCiAjaW5jbHVkZSAiYW1kZ3B1X29iamVj dC5oIgogI2VuZGlmCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRn cHVfY2dzLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfY2dzLmMKaW5kZXgg ZWU5NWU5NTBhMTliLi5kNTUzZTM5OWE4MzUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV9jZ3MuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9h bWRncHVfY2dzLmMKQEAgLTMzLDExICszMyw2IEBACiAjaW5jbHVkZSAiYXRvbS5oIgogI2luY2x1 ZGUgImFtZGdwdV91Y29kZS5oIgogCi1zdHJ1Y3QgYW1kZ3B1X2Nnc19kZXZpY2UgewotCXN0cnVj dCBjZ3NfZGV2aWNlIGJhc2U7Ci0Jc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXY7Ci19OwotCiAj ZGVmaW5lIENHU19GVU5DX0FERVYJCQkJCQkJXAogCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2 ID0JCQkJCVwKIAkJKChzdHJ1Y3QgYW1kZ3B1X2Nnc19kZXZpY2UgKiljZ3NfZGV2aWNlKS0+YWRl dgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdXZkX3Y2XzAuYyBiL2Ry aXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3V2ZF92Nl8wLmMKaW5kZXggNDIyZDUzMDBiOTJlLi5h NzNkODE5OWM0ODYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3V2ZF92 Nl8wLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdXZkX3Y2XzAuYwpAQCAtMzg5 LDkgKzM4OSw5IEBAIHN0YXRpYyBpbnQgdXZkX3Y2XzBfc3RhcnQoc3RydWN0IGFtZGdwdV9kZXZp Y2UgKmFkZXYpCiAJdWludDMyX3QgbXBfc3dhcF9jbnRsOwogCWludCBpLCBqLCByOwogCi0JLyog aXMgcG93ZXIgZ2F0ZWQ/IHRoZW4gd2UgY2FuJ3Qgc3RhcnQgKFRPRE86IHJlLWVuYWJsZSBwb3dl cikgKi8KKwkvKiBpcyBwb3dlciBnYXRlZD8gdGhlbiB3ZSBjYW4ndCBzdGFydCBidXQgZG9uJ3Qg cmV0dXJuIGFuIGVycm9yICovCiAJaWYgKGFkZXYtPnV2ZC5wZ19zdGF0ZSkKLQkJcmV0dXJuIC1F SU5WQUw7CisJCXJldHVybiAwOwogCiAJLyogc2V0IENHIHN0YXRlIHRvIC0xIGZvciB1bnNldCAq LwogCWFkZXYtPnV2ZC5jZ19zdGF0ZSA9IC0xOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2FtZC9hbWRncHUvdmkuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3ZpLmMKaW5kZXgg M2FmNGYyMDQ4MTBmLi5hODlhYThhMjY2YzMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L3ZpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdmkuYwpAQCAt MTU4MywxMCArMTU4Myw4IEBAIHN0YXRpYyBpbnQgdmlfY29tbW9uX2Vhcmx5X2luaXQodm9pZCAq aGFuZGxlKQogCQlpZiAoYWRldi0+cmV2X2lkICE9IDB4MDApIHsKIAkJCWFkZXYtPnBnX2ZsYWdz IHw9IEFNRF9QR19TVVBQT1JUX0dGWF9QRyB8CiAJCQkJQU1EX1BHX1NVUFBPUlRfR0ZYX1NNRyB8 Ci0JCQkJQU1EX1BHX1NVUFBPUlRfR0ZYX1BJUEVMSU5FOwotCQkJLyogcG93ZXJwbGF5IFVWRCBQ RyBkb2Vzbid0IHdvcmsgeWV0ICovCi0JCQlpZiAoIWFtZGdwdV9wb3dlcnBsYXkpCi0JCQkJYWRl di0+cGdfZmxhZ3MgfD0gQU1EX1BHX1NVUFBPUlRfVVZEOworCQkJCUFNRF9QR19TVVBQT1JUX0dG WF9QSVBFTElORSB8CisJCQkJQU1EX1BHX1NVUFBPUlRfVVZEOwogCQl9CiAJCWFkZXYtPmV4dGVy bmFsX3Jldl9pZCA9IGFkZXYtPnJldl9pZCArIDB4MTsKIAkJYnJlYWs7CkBAIC0xNjA4LDEwICsx NjA2LDggQEAgc3RhdGljIGludCB2aV9jb21tb25fZWFybHlfaW5pdCh2b2lkICpoYW5kbGUpCiAJ CQlBTURfQ0dfU1VQUE9SVF9TRE1BX0xTOwogCQlhZGV2LT5wZ19mbGFncyB8PSBBTURfUEdfU1VQ UE9SVF9HRlhfUEcgfAogCQkJQU1EX1BHX1NVUFBPUlRfR0ZYX1NNRyB8Ci0JCQlBTURfUEdfU1VQ UE9SVF9HRlhfUElQRUxJTkU7Ci0JCS8qIHBvd2VycGxheSBVVkQgUEcgZG9lc24ndCB3b3JrIHll dCAqLwotCQlpZiAoIWFtZGdwdV9wb3dlcnBsYXkpCi0JCQlhZGV2LT5wZ19mbGFncyB8PSBBTURf UEdfU1VQUE9SVF9VVkQ7CisJCQlBTURfUEdfU1VQUE9SVF9HRlhfUElQRUxJTkUgfAorCQkJQU1E X1BHX1NVUFBPUlRfVVZEOwogCQlhZGV2LT5leHRlcm5hbF9yZXZfaWQgPSBhZGV2LT5yZXZfaWQg KyAweDE7CiAJCWJyZWFrOwogCWRlZmF1bHQ6CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v YW1kL3Bvd2VycGxheS9ldmVudG1nci9ldmVudGFjdGlvbmNoYWlucy5jIGIvZHJpdmVycy9ncHUv ZHJtL2FtZC9wb3dlcnBsYXkvZXZlbnRtZ3IvZXZlbnRhY3Rpb25jaGFpbnMuYwppbmRleCBkNjYz NWNjNGIwZmMuLmE0MjA5MGE2MDhlNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9w b3dlcnBsYXkvZXZlbnRtZ3IvZXZlbnRhY3Rpb25jaGFpbnMuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vYW1kL3Bvd2VycGxheS9ldmVudG1nci9ldmVudGFjdGlvbmNoYWlucy5jCkBAIC0zMCw3ICsz MCw2IEBAIHN0YXRpYyBjb25zdCBwZW1fZXZlbnRfYWN0aW9uICogY29uc3QgaW5pdGlhbGl6ZV9l dmVudFtdID0gewogCXN5c3RlbV9jb25maWdfdGFza3MsCiAJc2V0dXBfYXNpY190YXNrcywKIAll bmFibGVfZHluYW1pY19zdGF0ZV9tYW5hZ2VtZW50X3Rhc2tzLAotCWVuYWJsZV9jbG9ja19wb3dl cl9nYXRpbmdzX3Rhc2tzLAogCWdldF8yZF9wZXJmb3JtYW5jZV9zdGF0ZV90YXNrcywKIAlzZXRf cGVyZm9ybWFuY2Vfc3RhdGVfdGFza3MsCiAJaW5pdGlhbGl6ZV90aGVybWFsX2NvbnRyb2xsZXJf dGFza3MsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9od21nci9j el9jbG9ja3Bvd2VyZ2F0aW5nLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9od21n ci9jel9jbG9ja3Bvd2VyZ2F0aW5nLmMKaW5kZXggMmRhNTQ4ZjYzMzdlLi4xZjAxOTBhNWIwMGYg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvcG93ZXJwbGF5L2h3bWdyL2N6X2Nsb2Nr cG93ZXJnYXRpbmcuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9od21nci9j el9jbG9ja3Bvd2VyZ2F0aW5nLmMKQEAgLTIxLDkgKzIxLDEzIEBACiAgKgogICovCiAKKyNpbmNs dWRlICJhbWRncHUuaCIKICNpbmNsdWRlICJod21nci5oIgogI2luY2x1ZGUgImN6X2Nsb2NrcG93 ZXJnYXRpbmcuaCIKICNpbmNsdWRlICJjel9wcHNtYy5oIgorI2luY2x1ZGUgImNnc19saW51eC5o IgorI2luY2x1ZGUgInV2ZC91dmRfNl8wX2QuaCIKKyNpbmNsdWRlICJ1dmQvdXZkXzZfMF9zaF9t YXNrLmgiCiAKIC8qIFBoeUlEIC0+IFN0YXR1cyBNYXBwaW5nIGluIERESV9QSFlfR0VOX1NUQVRV UwogICAgIDAgICAgR0ZYMEwgKDM6MCksICAgICAgICAgICAgICAgICAgKDI3OjI0KSwKQEAgLTE2 MCwxMiArMTY0LDIxIEBAIGludCBjel9lbmFibGVfZGlzYWJsZV92Y2VfZHBtKHN0cnVjdCBwcF9o d21nciAqaHdtZ3IsIGJvb2wgZW5hYmxlKQogaW50IGN6X2RwbV9wb3dlcmdhdGVfdXZkKHN0cnVj dCBwcF9od21nciAqaHdtZ3IsIGJvb2wgYmdhdGUpCiB7CiAJc3RydWN0IGN6X2h3bWdyICpjel9o d21nciA9IChzdHJ1Y3QgY3pfaHdtZ3IgKikoaHdtZ3ItPmJhY2tlbmQpOworCXN0cnVjdCBhbWRn cHVfY2dzX2RldmljZSAqY2dzX2RldiA9IGh3bWdyLT5kZXZpY2U7CisJc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYgPSBjZ3NfZGV2LT5hZGV2OwogCi0JaWYgKGN6X2h3bWdyLT51dmRfcG93ZXJf Z2F0ZWQgPT0gYmdhdGUpCisJbXV0ZXhfbG9jaygmYWRldi0+dXZkLnBnX2xvY2spOworCisJaWYg KGN6X2h3bWdyLT51dmRfcG93ZXJfZ2F0ZWQgPT0gYmdhdGUpIHsKKwkJbXV0ZXhfdW5sb2NrKCZh ZGV2LT51dmQucGdfbG9jayk7CiAJCXJldHVybiAwOworCX0KIAorCWFkZXYtPnV2ZC5wZ19zdGF0 ZSA9IGJnYXRlOwogCWN6X2h3bWdyLT51dmRfcG93ZXJfZ2F0ZWQgPSBiZ2F0ZTsKIAorCVdSRUcz MihtbVVWRF9QT1dFUl9TVEFUVVMsIFVWRF9QT1dFUl9TVEFUVVNfX1VWRF9QR19FTl9NQVNLKTsK KwogCWlmIChiZ2F0ZSkgewogCQljZ3Nfc2V0X2Nsb2NrZ2F0aW5nX3N0YXRlKGh3bWdyLT5kZXZp Y2UsCiAJCQkJCQlBTURfSVBfQkxPQ0tfVFlQRV9VVkQsCkBAIC0xNzcsMTQgKzE5MCwxNSBAQCBp bnQgY3pfZHBtX3Bvd2VyZ2F0ZV91dmQoc3RydWN0IHBwX2h3bWdyICpod21nciwgYm9vbCBiZ2F0 ZSkKIAkJY3pfZHBtX3Bvd2VyZG93bl91dmQoaHdtZ3IpOwogCX0gZWxzZSB7CiAJCWN6X2RwbV9w b3dlcnVwX3V2ZChod21ncik7Ci0JCWNnc19zZXRfY2xvY2tnYXRpbmdfc3RhdGUoaHdtZ3ItPmRl dmljZSwKLQkJCQkJCUFNRF9JUF9CTE9DS19UWVBFX1VWRCwKLQkJCQkJCUFNRF9QR19TVEFURV9H QVRFKTsKIAkJY2dzX3NldF9wb3dlcmdhdGluZ19zdGF0ZShod21nci0+ZGV2aWNlLAogCQkJCQkJ QU1EX0lQX0JMT0NLX1RZUEVfVVZELAogCQkJCQkJQU1EX0NHX1NUQVRFX1VOR0FURSk7CisJCWNn c19zZXRfY2xvY2tnYXRpbmdfc3RhdGUoaHdtZ3ItPmRldmljZSwKKwkJCQkJCUFNRF9JUF9CTE9D S19UWVBFX1VWRCwKKwkJCQkJCUFNRF9QR19TVEFURV9HQVRFKTsKIAkJY3pfZHBtX3VwZGF0ZV91 dmRfZHBtKGh3bWdyLCBmYWxzZSk7CiAJfQorCW11dGV4X3VubG9jaygmYWRldi0+dXZkLnBnX2xv Y2spOwogCiAJcmV0dXJuIDA7CiB9Ci0tIAoyLjkuMgoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9hbWQtZ2Z4Cg==