From: Tom St Denis Subject: [PATCH 4/4] drm/amd/powerplay: Prevent UVD powerdown before init Date: Tue, 26 Jul 2016 11:38:32 -0400 Message-ID: <20160726153832.15191-5-tom.stdenis@amd.com> References: <20160726153832.15191-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: <20160726153832.15191-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 QmVjYXVzZSBvZiB0aGUgaXBfYmxvY2tzIGluaXQgb3JkZXIgcG93ZXJwbGF5IHdvdWxkIHBvd2Vy IGRvd24KdGhlIFVWRCBibG9jayBiZWZvcmUgVVZEIHN0YXJ0IGlzIGNhbGxlZC4gIFRoaXMgcmVz dWx0cyBpbiBhIFZDUFUKaGFuZy4KClRoaXMgcGF0Y2ggcHJldmVudHMgcG93ZXIgZG93biBiZWZv cmUgVVZEIGlzIGluaXRpYWxpemVkLgoKQWxzbyBjb3JyZWN0IHRoZSBwb3dlciB1cCBvcmRlciBz byBjbG9ja2luZyBpcyBzZXQgYWZ0ZXIgcG93ZXIKaXMgdW5nYXRlZC4KCldpdGggdGhpcyBhcHBs aWVkIGNvbXBhcmFibGUgY2xvY2svcG93ZXIgYmVoYXZpb3VyIHRvIHBvd2VycGxheT0wIHdpdGgK RFBNIGlzIG9ic2VydmVkLgoKU2lnbmVkLW9mZi1ieTogVG9tIFN0IERlbmlzIDx0b20uc3RkZW5p c0BhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdS5oICAgICAg ICAgICAgICAgIHwgIDYgKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVf Y2dzLmMgICAgICAgICAgICB8ICA1IC0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS91 dmRfdjZfMC5jICAgICAgICAgICAgICB8ICA4ICsrKystLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L3ZpLmMgICAgICAgICAgICAgICAgICAgIHwgMTIgKysrKy0tLS0tLS0KIC4uLi9kcm0v YW1kL3Bvd2VycGxheS9od21nci9jel9jbG9ja3Bvd2VyZ2F0aW5nLmMgIHwgMjUgKysrKysrKysr KysrKysrKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvaHdtZ3IvY3pfaHdt Z3IuYyAgICAgfCAgNyArKysrKysKIDYgZmlsZXMgY2hhbmdlZCwgNDMgaW5zZXJ0aW9ucygrKSwg MjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUv YW1kZ3B1LmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHUuaAppbmRleCBkMDQ2 MGVhMmY4NWIuLjU2MTZiMTZlNmMwYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvYW1kZ3B1LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1LmgK QEAgLTE2OTIsNiArMTY5Miw3IEBAIHN0cnVjdCBhbWRncHVfdXZkIHsKIAl1aW50MzJfdCAgICAg ICAgICAgICAgICBzcmJtX3NvZnRfcmVzZXQ7CiAJaW50CQkJY2dfc3RhdGUsIHBnX3N0YXRlOwog CXN0cnVjdCBtdXRleCAgICAgICAgICAgIHBnX2xvY2s7CisJYm9vbAkJCWlzX2luaXQ7CiB9Owog CiAvKgpAQCAtMjUxOCw1ICsyNTE5LDEwIEBAIGludCBhbWRncHVfZG1fZGlzcGxheV9yZXN1bWUo c3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgKTsKIHN0YXRpYyBpbmxpbmUgaW50IGFtZGdwdV9k bV9kaXNwbGF5X3Jlc3VtZShzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldikgeyByZXR1cm4gMDsg fQogI2VuZGlmCiAKK3N0cnVjdCBhbWRncHVfY2dzX2RldmljZSB7CisJc3RydWN0IGNnc19kZXZp Y2UgYmFzZTsKKwlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRldjsKK307CisKICNpbmNsdWRlICJh bWRncHVfb2JqZWN0LmgiCiAjZW5kaWYKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQv YW1kZ3B1L2FtZGdwdV9jZ3MuYyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9j Z3MuYwppbmRleCBlZTk1ZTk1MGExOWIuLmQ1NTNlMzk5YTgzNSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2Nncy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1kZ3B1L2FtZGdwdV9jZ3MuYwpAQCAtMzMsMTEgKzMzLDYgQEAKICNpbmNsdWRlICJhdG9t LmgiCiAjaW5jbHVkZSAiYW1kZ3B1X3Vjb2RlLmgiCiAKLXN0cnVjdCBhbWRncHVfY2dzX2Rldmlj ZSB7Ci0Jc3RydWN0IGNnc19kZXZpY2UgYmFzZTsKLQlzdHJ1Y3QgYW1kZ3B1X2RldmljZSAqYWRl djsKLX07Ci0KICNkZWZpbmUgQ0dTX0ZVTkNfQURFVgkJCQkJCQlcCiAJc3RydWN0IGFtZGdwdV9k ZXZpY2UgKmFkZXYgPQkJCQkJXAogCQkoKHN0cnVjdCBhbWRncHVfY2dzX2RldmljZSAqKWNnc19k ZXZpY2UpLT5hZGV2CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS91dmRf djZfMC5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvdXZkX3Y2XzAuYwppbmRleCA0MjJk NTMwMGI5MmUuLjNiOTMzMjdjNWUyNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvdXZkX3Y2XzAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS91dmRfdjZf MC5jCkBAIC0zODksOSArMzg5LDkgQEAgc3RhdGljIGludCB1dmRfdjZfMF9zdGFydChzdHJ1Y3Qg YW1kZ3B1X2RldmljZSAqYWRldikKIAl1aW50MzJfdCBtcF9zd2FwX2NudGw7CiAJaW50IGksIGos IHI7CiAKLQkvKiBpcyBwb3dlciBnYXRlZD8gdGhlbiB3ZSBjYW4ndCBzdGFydCAoVE9ETzogcmUt ZW5hYmxlIHBvd2VyKSAqLwotCWlmIChhZGV2LT51dmQucGdfc3RhdGUpCi0JCXJldHVybiAtRUlO VkFMOworCS8qIGlzIHBvd2VyIGdhdGVkPyB0aGVuIHdlIGNhbid0IHN0YXJ0IGJ1dCBkb24ndCBy ZXR1cm4gYW4gZXJyb3IgKi8KKwlpZiAoYWRldi0+dXZkLmlzX2luaXQgJiYgYWRldi0+dXZkLnBn X3N0YXRlKQorCQlyZXR1cm4gMDsKIAogCS8qIHNldCBDRyBzdGF0ZSB0byAtMSBmb3IgdW5zZXQg Ki8KIAlhZGV2LT51dmQuY2dfc3RhdGUgPSAtMTsKQEAgLTY2Miw2ICs2NjIsOCBAQCBzdGF0aWMg aW50IHV2ZF92Nl8wX3JpbmdfdGVzdF9yaW5nKHN0cnVjdCBhbWRncHVfcmluZyAqcmluZykKIAkJ CSAgcmluZy0+aWR4LCB0bXApOwogCQlyID0gLUVJTlZBTDsKIAl9CisJaWYgKCFyKQorCQlhZGV2 LT51dmQuaXNfaW5pdCA9IHRydWU7CiAJcmV0dXJuIHI7CiB9CiAKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L3ZpLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS92 aS5jCmluZGV4IDc4ZmVhOTQwZDEyMC4uZjRmZGRlMDY0MWIwIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2FtZGdwdS92aS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1 L3ZpLmMKQEAgLTE1ODMsMTAgKzE1ODMsOCBAQCBzdGF0aWMgaW50IHZpX2NvbW1vbl9lYXJseV9p bml0KHZvaWQgKmhhbmRsZSkKIAkJaWYgKGFkZXYtPnJldl9pZCAhPSAweDAwKSB7CiAJCQlhZGV2 LT5wZ19mbGFncyB8PSBBTURfUEdfU1VQUE9SVF9HRlhfUEcgfAogCQkJCUFNRF9QR19TVVBQT1JU X0dGWF9TTUcgfAotCQkJCUFNRF9QR19TVVBQT1JUX0dGWF9QSVBFTElORTsKLQkJCS8qIHBvd2Vy cGxheSBVVkQgUEcgZG9lc24ndCB3b3JrIHlldCAqLwotCQkJaWYgKCFhbWRncHVfcG93ZXJwbGF5 KQotCQkJCWFkZXYtPnBnX2ZsYWdzIHw9IEFNRF9QR19TVVBQT1JUX1VWRDsKKwkJCQlBTURfUEdf U1VQUE9SVF9HRlhfUElQRUxJTkUgfAorCQkJCUFNRF9QR19TVVBQT1JUX1VWRDsKIAkJfQogCQlh ZGV2LT5leHRlcm5hbF9yZXZfaWQgPSBhZGV2LT5yZXZfaWQgKyAweDE7CiAJCWJyZWFrOwpAQCAt MTYwOCwxMCArMTYwNiw4IEBAIHN0YXRpYyBpbnQgdmlfY29tbW9uX2Vhcmx5X2luaXQodm9pZCAq aGFuZGxlKQogCQkJQU1EX0NHX1NVUFBPUlRfU0RNQV9MUzsKIAkJYWRldi0+cGdfZmxhZ3MgfD0g QU1EX1BHX1NVUFBPUlRfR0ZYX1BHIHwKIAkJCUFNRF9QR19TVVBQT1JUX0dGWF9TTUcgfAotCQkJ QU1EX1BHX1NVUFBPUlRfR0ZYX1BJUEVMSU5FOwotCQkvKiBwb3dlcnBsYXkgVVZEIFBHIGRvZXNu J3Qgd29yayB5ZXQgKi8KLQkJaWYgKCFhbWRncHVfcG93ZXJwbGF5KQotCQkJYWRldi0+cGdfZmxh Z3MgfD0gQU1EX1BHX1NVUFBPUlRfVVZEOworCQkJQU1EX1BHX1NVUFBPUlRfR0ZYX1BJUEVMSU5F IHwKKwkJCUFNRF9QR19TVVBQT1JUX1VWRDsKIAkJYWRldi0+ZXh0ZXJuYWxfcmV2X2lkID0gYWRl di0+cmV2X2lkICsgMHgxOwogCQlicmVhazsKIAlkZWZhdWx0OgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvaHdtZ3IvY3pfY2xvY2twb3dlcmdhdGluZy5jIGIvZHJp dmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvaHdtZ3IvY3pfY2xvY2twb3dlcmdhdGluZy5jCmlu ZGV4IDJkYTU0OGY2MzM3ZS4uYmFhNzM2NmZhZDUzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vYW1kL3Bvd2VycGxheS9od21nci9jel9jbG9ja3Bvd2VyZ2F0aW5nLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvaHdtZ3IvY3pfY2xvY2twb3dlcmdhdGluZy5jCkBAIC0y MSw5ICsyMSwxMyBAQAogICoKICAqLwogCisjaW5jbHVkZSAiYW1kZ3B1LmgiCiAjaW5jbHVkZSAi aHdtZ3IuaCIKICNpbmNsdWRlICJjel9jbG9ja3Bvd2VyZ2F0aW5nLmgiCiAjaW5jbHVkZSAiY3pf cHBzbWMuaCIKKyNpbmNsdWRlICJjZ3NfbGludXguaCIKKyNpbmNsdWRlICJ1dmQvdXZkXzZfMF9k LmgiCisjaW5jbHVkZSAidXZkL3V2ZF82XzBfc2hfbWFzay5oIgogCiAvKiBQaHlJRCAtPiBTdGF0 dXMgTWFwcGluZyBpbiBERElfUEhZX0dFTl9TVEFUVVMKICAgICAwICAgIEdGWDBMICgzOjApLCAg ICAgICAgICAgICAgICAgICgyNzoyNCksCkBAIC0xNjAsMTIgKzE2NCwyNCBAQCBpbnQgY3pfZW5h YmxlX2Rpc2FibGVfdmNlX2RwbShzdHJ1Y3QgcHBfaHdtZ3IgKmh3bWdyLCBib29sIGVuYWJsZSkK IGludCBjel9kcG1fcG93ZXJnYXRlX3V2ZChzdHJ1Y3QgcHBfaHdtZ3IgKmh3bWdyLCBib29sIGJn YXRlKQogewogCXN0cnVjdCBjel9od21nciAqY3pfaHdtZ3IgPSAoc3RydWN0IGN6X2h3bWdyICop KGh3bWdyLT5iYWNrZW5kKTsKKwlzdHJ1Y3QgYW1kZ3B1X2Nnc19kZXZpY2UgKmNnc19kZXYgPSBo d21nci0+ZGV2aWNlOworCXN0cnVjdCBhbWRncHVfZGV2aWNlICphZGV2ID0gY2dzX2Rldi0+YWRl djsKIAotCWlmIChjel9od21nci0+dXZkX3Bvd2VyX2dhdGVkID09IGJnYXRlKQorCWlmICghYWRl di0+dXZkLmlzX2luaXQpCiAJCXJldHVybiAwOwogCisJbXV0ZXhfbG9jaygmYWRldi0+dXZkLnBn X2xvY2spOworCisJaWYgKGN6X2h3bWdyLT51dmRfcG93ZXJfZ2F0ZWQgPT0gYmdhdGUpIHsKKwkJ bXV0ZXhfdW5sb2NrKCZhZGV2LT51dmQucGdfbG9jayk7CisJCXJldHVybiAwOworCX0KKworCWFk ZXYtPnV2ZC5wZ19zdGF0ZSA9IGJnYXRlOwogCWN6X2h3bWdyLT51dmRfcG93ZXJfZ2F0ZWQgPSBi Z2F0ZTsKIAorCVdSRUczMihtbVVWRF9QT1dFUl9TVEFUVVMsIFVWRF9QT1dFUl9TVEFUVVNfX1VW RF9QR19FTl9NQVNLKTsKKwogCWlmIChiZ2F0ZSkgewogCQljZ3Nfc2V0X2Nsb2NrZ2F0aW5nX3N0 YXRlKGh3bWdyLT5kZXZpY2UsCiAJCQkJCQlBTURfSVBfQkxPQ0tfVFlQRV9VVkQsCkBAIC0xNzcs MTQgKzE5MywxNSBAQCBpbnQgY3pfZHBtX3Bvd2VyZ2F0ZV91dmQoc3RydWN0IHBwX2h3bWdyICpo d21nciwgYm9vbCBiZ2F0ZSkKIAkJY3pfZHBtX3Bvd2VyZG93bl91dmQoaHdtZ3IpOwogCX0gZWxz ZSB7CiAJCWN6X2RwbV9wb3dlcnVwX3V2ZChod21ncik7Ci0JCWNnc19zZXRfY2xvY2tnYXRpbmdf c3RhdGUoaHdtZ3ItPmRldmljZSwKLQkJCQkJCUFNRF9JUF9CTE9DS19UWVBFX1VWRCwKLQkJCQkJ CUFNRF9QR19TVEFURV9HQVRFKTsKIAkJY2dzX3NldF9wb3dlcmdhdGluZ19zdGF0ZShod21nci0+ ZGV2aWNlLAogCQkJCQkJQU1EX0lQX0JMT0NLX1RZUEVfVVZELAogCQkJCQkJQU1EX0NHX1NUQVRF X1VOR0FURSk7CisJCWNnc19zZXRfY2xvY2tnYXRpbmdfc3RhdGUoaHdtZ3ItPmRldmljZSwKKwkJ CQkJCUFNRF9JUF9CTE9DS19UWVBFX1VWRCwKKwkJCQkJCUFNRF9QR19TVEFURV9HQVRFKTsKIAkJ Y3pfZHBtX3VwZGF0ZV91dmRfZHBtKGh3bWdyLCBmYWxzZSk7CiAJfQorCW11dGV4X3VubG9jaygm YWRldi0+dXZkLnBnX2xvY2spOwogCiAJcmV0dXJuIDA7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vYW1kL3Bvd2VycGxheS9od21nci9jel9od21nci5jIGIvZHJpdmVycy9ncHUvZHJt L2FtZC9wb3dlcnBsYXkvaHdtZ3IvY3pfaHdtZ3IuYwppbmRleCA5YmY2MjJlMTIzYjYuLmJlZDAw MTM2NzRhMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9wb3dlcnBsYXkvaHdtZ3Iv Y3pfaHdtZ3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL3Bvd2VycGxheS9od21nci9jel9o d21nci5jCkBAIC0zOSw2ICszOSw3IEBACiAjaW5jbHVkZSAicG93ZXJfc3RhdGUuaCIKICNpbmNs dWRlICJjel9jbG9ja3Bvd2VyZ2F0aW5nLmgiCiAjaW5jbHVkZSAicHBfZGVidWcuaCIKKyNpbmNs dWRlICJhbWRncHUuaCIKIAogI2RlZmluZSBpeFNNVVNWSV9OQl9DVVJSRU5UVklEIDB4RDgyMzAw NDQKICNkZWZpbmUgQ1VSUkVOVF9OQl9WSURfTUFTSyAweGZmMDAwMDAwCkBAIC0xMzU2LDYgKzEz NTcsMTIgQEAgc3RhdGljIGludCBjel9kcG1fZm9yY2VfZHBtX2xldmVsKHN0cnVjdCBwcF9od21n ciAqaHdtZ3IsCiAKIGludCBjel9kcG1fcG93ZXJkb3duX3V2ZChzdHJ1Y3QgcHBfaHdtZ3IgKmh3 bWdyKQogeworCXN0cnVjdCBhbWRncHVfY2dzX2RldmljZSAqY2dzX2RldiA9IGh3bWdyLT5kZXZp Y2U7CisJc3RydWN0IGFtZGdwdV9kZXZpY2UgKmFkZXYgPSBjZ3NfZGV2LT5hZGV2OworCisJaWYg KCFhZGV2LT51dmQuaXNfaW5pdCkKKwkJcmV0dXJuIDA7CisKIAlpZiAocGhtX2NhcF9lbmFibGVk KGh3bWdyLT5wbGF0Zm9ybV9kZXNjcmlwdG9yLnBsYXRmb3JtQ2FwcywKIAkJCQkJIFBITV9QbGF0 Zm9ybUNhcHNfVVZEUG93ZXJHYXRpbmcpKQogCQlyZXR1cm4gc211bV9zZW5kX21zZ190b19zbWMo aHdtZ3ItPnNtdW1nciwKLS0gCjIuOS4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2FtZC1nZngK