From mboxrd@z Thu Jan 1 00:00:00 1970 From: Harry Wentland Subject: [PATCH 32/43] drm/amd/display: Reset MPCC muxes during init Date: Thu, 23 Nov 2017 14:53:05 -0500 Message-ID: <20171123195316.8366-33-harry.wentland@amd.com> References: <20171123195316.8366-1-harry.wentland@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171123195316.8366-1-harry.wentland-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: Eric Bernstein RnJvbTogRXJpYyBCZXJuc3RlaW4gPGVyaWMuYmVybnN0ZWluQGFtZC5jb20+CgpEdXJpbmcgSFcg aW5pdGlhbGl6YXRpb24sIGluc3RlYWQgb2YgYXNzdW1pbmcgb3IKZGV0ZWN0aW5nIHRoZSBleGlz dGluZyBNUENDIG11eCBjb25maWd1cmF0aW9uIGFuZAp0aGVuIHJlbW92aW5nIGV4aXN0aW5nIHBs YW5lcywgcmVzZXQgYWxsIHRoZSBNUENDCm11eGVzLgoKU2lnbmVkLW9mZi1ieTogRXJpYyBCZXJu c3RlaW4gPGVyaWMuYmVybnN0ZWluQGFtZC5jb20+ClJldmlld2VkLWJ5OiBUb255IENoZW5nIDxU b255LkNoZW5nQGFtZC5jb20+CkFja2VkLWJ5OiBIYXJyeSBXZW50bGFuZCA8aGFycnkud2VudGxh bmRAYW1kLmNvbT4KLS0tCiAuLi4vZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEwX2h3X3Nl cXVlbmNlci5jICB8IDEzICsrLS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNu MTAvZGNuMTBfbXBjLmMgICB8IDU4ICsrKysrKysrKysrLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9kYy9kY24xMC9kY24xMF9tcGMuaCAgIHwgIDYgKy0tCiBkcml2ZXJz L2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvaW5jL2h3L21wYy5oICAgICAgICB8ICA3ICstLQogNCBm aWxlcyBjaGFuZ2VkLCAzNSBpbnNlcnRpb25zKCspLCA0OSBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMTAvZGNuMTBfaHdfc2VxdWVu Y2VyLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMTAvZGNuMTBfaHdfc2Vx dWVuY2VyLmMKaW5kZXggZDU0MmU0ZGI1NDk1Li43Mzc2NTE0YTE2MmUgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY24xMC9kY24xMF9od19zZXF1ZW5jZXIuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMTAvZGNuMTBfaHdfc2VxdWVu Y2VyLmMKQEAgLTcwMiw3ICs3MDIsNyBAQCBzdGF0aWMgdm9pZCBkY24xMF9kaXNhYmxlX3BsYW5l KHN0cnVjdCBkYyAqZGMsIHN0cnVjdCBwaXBlX2N0eCAqcGlwZV9jdHgpCiAKIHN0YXRpYyB2b2lk IGRjbjEwX2luaXRfaHcoc3RydWN0IGRjICpkYykKIHsKLQlpbnQgaSwgb3BwX2lkOworCWludCBp OwogCXN0cnVjdCBhYm0gKmFibSA9IGRjLT5yZXNfcG9vbC0+YWJtOwogCXN0cnVjdCBkbWN1ICpk bWN1ID0gZGMtPnJlc19wb29sLT5kbWN1OwogCXN0cnVjdCBkY2VfaHdzZXEgKmh3cyA9IGRjLT5o d3NlcTsKQEAgLTc2NSwxMyArNzY1LDggQEAgc3RhdGljIHZvaWQgZGNuMTBfaW5pdF9odyhzdHJ1 Y3QgZGMgKmRjKQogCQl9CiAJfQogCi0JLyogSW5pdGlhbGl6ZSBNUEMgdHJlZSBiYXNlZCBvbiBI VyB2YWx1ZXMgKi8KLQlmb3IgKG9wcF9pZCA9IDA7IG9wcF9pZCA8IGRjLT5yZXNfcG9vbC0+cGlw ZV9jb3VudDsgb3BwX2lkKyspIHsKLQkJc3RydWN0IG91dHB1dF9waXhlbF9wcm9jZXNzb3IgKm9w cCA9IGRjLT5yZXNfcG9vbC0+b3Bwc1tvcHBfaWRdOwotCQlzdHJ1Y3QgbXBjX3RyZWUgKm1wY190 cmVlX3BhcmFtcyA9ICYob3BwLT5tcGNfdHJlZV9wYXJhbXMpOwotCi0JCWRjLT5yZXNfcG9vbC0+ bXBjLT5mdW5jcy0+aW5pdF9tcGNjX2xpc3RfZnJvbV9odyhkYy0+cmVzX3Bvb2wtPm1wYywgbXBj X3RyZWVfcGFyYW1zKTsKLQl9CisJLyogUmVzZXQgYWxsIE1QQ0MgbXV4ZXMgKi8KKwlkYy0+cmVz X3Bvb2wtPm1wYy0+ZnVuY3MtPm1wY19pbml0KGRjLT5yZXNfcG9vbC0+bXBjKTsKIAogCWZvciAo aSA9IDA7IGkgPCBkYy0+cmVzX3Bvb2wtPnBpcGVfY291bnQ7IGkrKykgewogCQlzdHJ1Y3QgdGlt aW5nX2dlbmVyYXRvciAqdGcgPSBkYy0+cmVzX3Bvb2wtPnRpbWluZ19nZW5lcmF0b3JzW2ldOwpA QCAtNzgzLDcgKzc3OCw3IEBAIHN0YXRpYyB2b2lkIGRjbjEwX2luaXRfaHcoc3RydWN0IGRjICpk YykKIAogCQlwaXBlX2N0eC0+cGxhbmVfcmVzLmh1YnAgPSBodWJwOwogCQlodWJwLT5tcGNjX2lk ID0gaTsKLQkJaHVicC0+b3BwX2lkID0gZGMtPnJlc19wb29sLT5tcGMtPmZ1bmNzLT5nZXRfb3Bw X2lkKGRjLT5yZXNfcG9vbC0+bXBjLCBpKTsKKwkJaHVicC0+b3BwX2lkID0gMHhmOwogCQlodWJw LT5wb3dlcl9nYXRlZCA9IGZhbHNlOwogCiAJCWlmIChodWJwLT5vcHBfaWQgIT0gMHhmKQpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEwX21wYy5j IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEwX21wYy5jCmluZGV4 IGQ2NjA2MTgwYjUwYS4uMWU3MmJkNDJkY2E0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v YW1kL2Rpc3BsYXkvZGMvZGNuMTAvZGNuMTBfbXBjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2Ft ZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEwX21wYy5jCkBAIC0xMDEsMTYgKzEwMSw2IEBAIHZvaWQg bXBjMV9hc3NlcnRfaWRsZV9tcGNjKHN0cnVjdCBtcGMgKm1wYywgaW50IGlkKQogCQkJMSwgMTAw MDAwKTsKIH0KIAotc3RhdGljIGludCBtcGMxX2dldF9vcHBfaWQoc3RydWN0IG1wYyAqbXBjLCBp bnQgbXBjY19pZCkKLXsKLQlzdHJ1Y3QgZGNuMTBfbXBjICptcGMxMCA9IFRPX0RDTjEwX01QQyht cGMpOwotCXVuc2lnbmVkIGludCBvcHBfaWQgPSAweEY7Ci0KLQlSRUdfR0VUKE1QQ0NfT1BQX0lE W21wY2NfaWRdLCBNUENDX09QUF9JRCwgJm9wcF9pZCk7Ci0KLQlyZXR1cm4gb3BwX2lkOwotfQot CiBzdHJ1Y3QgbXBjYyAqbXBjMV9nZXRfbXBjYyhzdHJ1Y3QgbXBjICptcGMsIGludCBtcGNjX2lk KQogewogCXN0cnVjdCBkY24xMF9tcGMgKm1wYzEwID0gVE9fRENOMTBfTVBDKG1wYyk7CkBAIC0z MzMsMjQgKzMyMyw0NCBAQCB2b2lkIG1wYzFfcmVtb3ZlX21wY2MoCiAJfQogfQogCitzdGF0aWMg dm9pZCBtcGMxX2luaXRfbXBjYyhzdHJ1Y3QgbXBjYyAqbXBjYywgaW50IG1wY2NfaW5zdCkKK3sK KwltcGNjLT5tcGNjX2lkID0gbXBjY19pbnN0OworCW1wY2MtPmRwcF9pZCA9IDB4ZjsKKwltcGNj LT5tcGNjX2JvdCA9IE5VTEw7CisJbXBjYy0+YmxuZF9jZmcub3ZlcmxhcF9vbmx5ID0gZmFsc2U7 CisJbXBjYy0+YmxuZF9jZmcuZ2xvYmFsX2FscGhhID0gMHhmZjsKKwltcGNjLT5ibG5kX2NmZy5n bG9iYWxfZ2FpbiA9IDB4ZmY7CisJbXBjYy0+c21fY2ZnLmVuYWJsZSA9IGZhbHNlOworfQorCiAv KgogICogUmVzZXQgdGhlIE1QQ0MgSFcgc3RhdHVzIGJ5IGRpc2Nvbm5lY3RpbmcgYWxsIG11eGVz LgogICoKICAqIFBhcmFtZXRlcnM6CiAgKiBbaW4vb3V0XSBtcGMJCS0gTVBDIGNvbnRleHQuCi0g KiBbaW5dICAgICBtcGNjX2lkCS0gVGhlIE1QQ0MgcGh5c2ljYWwgaW5zdGFuY2UgdG8gcmVzZXQu CiAgKgogICogUmV0dXJuOiAgdm9pZAogICovCi12b2lkIG1wYzFfcmVzZXRfbXBjYygKLQlzdHJ1 Y3QgbXBjICptcGMsCi0JaW50IG1wY2NfaWQpCit2b2lkIG1wYzFfbXBjX2luaXQoc3RydWN0IG1w YyAqbXBjKQogewogCXN0cnVjdCBkY24xMF9tcGMgKm1wYzEwID0gVE9fRENOMTBfTVBDKG1wYyk7 CisJaW50IG1wY2NfaWQ7CisJaW50IG9wcF9pZDsKIAotCVJFR19TRVQoTVBDQ19UT1BfU0VMW21w Y2NfaWRdLCAwLCBNUENDX1RPUF9TRUwsIDB4Zik7Ci0JUkVHX1NFVChNUENDX0JPVF9TRUxbbXBj Y19pZF0sIDAsIE1QQ0NfQk9UX1NFTCwgMHhmKTsKLQlSRUdfU0VUKE1QQ0NfT1BQX0lEW21wY2Nf aWRdLCAgMCwgTVBDQ19PUFBfSUQsICAweGYpOworCW1wYzEwLT5tcGNjX2luX3VzZV9tYXNrID0g MDsKKwlmb3IgKG1wY2NfaWQgPSAwOyBtcGNjX2lkIDwgbXBjMTAtPm51bV9tcGNjOyBtcGNjX2lk KyspIHsKKwkJUkVHX1NFVChNUENDX1RPUF9TRUxbbXBjY19pZF0sIDAsIE1QQ0NfVE9QX1NFTCwg MHhmKTsKKwkJUkVHX1NFVChNUENDX0JPVF9TRUxbbXBjY19pZF0sIDAsIE1QQ0NfQk9UX1NFTCwg MHhmKTsKKwkJUkVHX1NFVChNUENDX09QUF9JRFttcGNjX2lkXSwgIDAsIE1QQ0NfT1BQX0lELCAg MHhmKTsKKworCQltcGMxX2luaXRfbXBjYygmKG1wYy0+bXBjY19hcnJheVttcGNjX2lkXSksIG1w Y2NfaWQpOworCX0KKworCWZvciAob3BwX2lkID0gMDsgb3BwX2lkIDwgTUFYX09QUDsgb3BwX2lk KyspIHsKKwkJaWYgKFJFRyhNVVhbb3BwX2lkXSkpCisJCQlSRUdfU0VUKE1VWFtvcHBfaWRdLCAw LCBNUENfT1VUX01VWCwgMHhmKTsKKwl9CiB9CiAKIHZvaWQgbXBjMV9pbml0X21wY2NfbGlzdF9m cm9tX2h3KApAQCAtMzk5LDI3ICs0MDksMTUgQEAgdm9pZCBtcGMxX2luaXRfbXBjY19saXN0X2Zy b21faHcoCiAJfQogfQogCi1zdGF0aWMgdm9pZCBtcGMxX2luaXRfbXBjYyhzdHJ1Y3QgbXBjYyAq bXBjYywgaW50IG1wY2NfaW5zdCkKLXsKLQltcGNjLT5tcGNjX2lkID0gbXBjY19pbnN0OwotCW1w Y2MtPmRwcF9pZCA9IDB4ZjsKLQltcGNjLT5tcGNjX2JvdCA9IE5VTEw7Ci0JbXBjYy0+YmxuZF9j Zmcub3ZlcmxhcF9vbmx5ID0gZmFsc2U7Ci0JbXBjYy0+YmxuZF9jZmcuZ2xvYmFsX2FscGhhID0g MHhmZjsKLQltcGNjLT5ibG5kX2NmZy5nbG9iYWxfZ2FpbiA9IDB4ZmY7Ci0JbXBjYy0+c21fY2Zn LmVuYWJsZSA9IGZhbHNlOwotfQotCiBjb25zdCBzdHJ1Y3QgbXBjX2Z1bmNzIGRjbjEwX21wY19m dW5jcyA9IHsKIAkuaW5zZXJ0X3BsYW5lID0gbXBjMV9pbnNlcnRfcGxhbmUsCiAJLnJlbW92ZV9t cGNjID0gbXBjMV9yZW1vdmVfbXBjYywKLQkucmVzZXRfbXBjYyA9IG1wYzFfcmVzZXRfbXBjYywK KwkubXBjX2luaXQgPSBtcGMxX21wY19pbml0LAogCS5nZXRfbXBjY19mb3JfZHBwID0gbXBjMV9n ZXRfbXBjY19mb3JfZHBwLAogCS53YWl0X2Zvcl9pZGxlID0gbXBjMV9hc3NlcnRfaWRsZV9tcGNj LAogCS5hc3NlcnRfbXBjY19pZGxlX2JlZm9yZV9jb25uZWN0ID0gbXBjMV9hc3NlcnRfbXBjY19p ZGxlX2JlZm9yZV9jb25uZWN0LAogCS5pbml0X21wY2NfbGlzdF9mcm9tX2h3ID0gbXBjMV9pbml0 X21wY2NfbGlzdF9mcm9tX2h3LAogCS51cGRhdGVfYmxlbmRpbmcgPSBtcGMxX3VwZGF0ZV9ibGVu ZGluZywKLQkuZ2V0X29wcF9pZCA9IG1wYzFfZ2V0X29wcF9pZCwKIH07CiAKIHZvaWQgZGNuMTBf bXBjX2NvbnN0cnVjdChzdHJ1Y3QgZGNuMTBfbXBjICptcGMxMCwKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY24xMC9kY24xMF9tcGMuaCBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9kYy9kY24xMC9kY24xMF9tcGMuaAppbmRleCBhYTJjZDQwZGMwMjIu LjI2N2EyOTk1ZWY2ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2Rj L2RjbjEwL2RjbjEwX21wYy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9k Y24xMC9kY24xMF9tcGMuaApAQCAtMTQ2LDEwICsxNDYsOCBAQCB2b2lkIG1wYzFfcmVtb3ZlX21w Y2MoCiAJc3RydWN0IG1wY190cmVlICp0cmVlLAogCXN0cnVjdCBtcGNjICptcGNjKTsKIAotdm9p ZCBtcGMxX3Jlc2V0X21wY2MoCi0Jc3RydWN0IG1wYyAqbXBjLAotCWludCBtcGNjX2lkKTsKLQor dm9pZCBtcGMxX21wY19pbml0KAorCXN0cnVjdCBtcGMgKm1wYyk7CiAKIHZvaWQgbXBjMV9hc3Nl cnRfaWRsZV9tcGNjKAogCXN0cnVjdCBtcGMgKm1wYywKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9kYy9pbmMvaHcvbXBjLmggYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rp c3BsYXkvZGMvaW5jL2h3L21wYy5oCmluZGV4IDIzOTZiMTViZWZiMC4uMjNhOGQ1ZTUzYTg5IDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvaW5jL2h3L21wYy5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9pbmMvaHcvbXBjLmgKQEAgLTE1MSwx MyArMTUxLDEwIEBAIHN0cnVjdCBtcGNfZnVuY3MgewogCSAqCiAJICogUGFyYW1ldGVyczoKIAkg KiBbaW4vb3V0XSBtcGMJCS0gTVBDIGNvbnRleHQuCi0JICogW2luXSAgICAgbXBjY19pZAktIFRo ZSBNUENDIHBoeXNpY2FsIGluc3RhbmNlIHRvIHJlc2V0LgogCSAqCiAJICogUmV0dXJuOiAgdm9p ZAogCSAqLwotCXZvaWQgKCpyZXNldF9tcGNjKSgKLQkJc3RydWN0IG1wYyAqbXBjLAotCQlpbnQg bXBjY19pZCk7CisJdm9pZCAoKm1wY19pbml0KShzdHJ1Y3QgbXBjICptcGMpOwogCiAJLyoKIAkg KiBVcGRhdGUgdGhlIGJsZW5kaW5nIGNvbmZpZ3VyYXRpb24gZm9yIGEgc3BlY2lmaWVkIE1QQ0Mu CkBAIC0xODYsOCArMTgzLDYgQEAgc3RydWN0IG1wY19mdW5jcyB7CiAJCXN0cnVjdCBtcGMgKm1w YywKIAkJc3RydWN0IG1wY190cmVlICp0cmVlKTsKIAotCWludCAoKmdldF9vcHBfaWQpKHN0cnVj dCBtcGMgKm1wYywgaW50IG1wY2NfaWQpOwotCiB9OwogCiAjZW5kaWYKLS0gCjIuMTQuMQoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWls aW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQtZ2Z4Cg==