From: Harry Wentland Subject: [PATCH 12/31] drm/amd/display: do not set_mpc_tree if tree is already setup Date: Fri, 12 May 2017 11:20:45 -0400 Message-ID: <20170512152104.5354-13-harry.wentland@amd.com> References: <20170512152104.5354-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: <20170512152104.5354-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: Tony Cheng RnJvbTogVG9ueSBDaGVuZyA8dG9ueS5jaGVuZ0BhbWQuY29tPgoKQ2hhbmdlLUlkOiBJNzE0MDE1 NWE2MmMyYTI1YmE4ODhjYjAyZTkzZWNmZjVkZjU0ZjYxZQpTaWduZWQtb2ZmLWJ5OiBUb255IENo ZW5nIDx0b255LmNoZW5nQGFtZC5jb20+ClJldmlld2VkLWJ5OiBZb25ncWlhbmcgU3VuIDx5b25n cWlhbmcuc3VuQGFtZC5jb20+CkFja2VkLWJ5OiBIYXJyeSBXZW50bGFuZCA8SGFycnkuV2VudGxh bmRAYW1kLmNvbT4KLS0tCiAuLi4vZHJtL2FtZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEwX2h3X3Nl cXVlbmNlci5jICB8IDMwICsrKysrKysrKysrKysrKysrLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAy MyBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9kYy9kY24xMC9kY24xMF9od19zZXF1ZW5jZXIuYyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY24xMC9kY24xMF9od19zZXF1ZW5jZXIuYwppbmRleCBl Y2U4Yzk2ZjM2MzYuLjQxYTZmYTUwNzk4MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9kaXNwbGF5L2RjL2RjbjEwL2RjbjEwX2h3X3NlcXVlbmNlci5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9kYy9kY24xMC9kY24xMF9od19zZXF1ZW5jZXIuYwpAQCAtODI4LDcg KzgyOCw3IEBAIHN0YXRpYyB2b2lkIHJlc2V0X2Zyb250X2VuZF9mb3JfcGlwZSgKIAkvKiBUT0RP OiBidWlsZCBzdHJlYW0gcGlwZXMgZ3JvdXAgaWQuIEZvciBub3csIHVzZSBzdHJlYW0gb3RnCiAJ ICogaWQgYXMgcGlwZSBncm91cCBpZAogCSAqLwotCXRyZWVfY2ZnID0gJmNvbnRleHQtPnJlc19j dHgubXBjX3RyZWVbcGlwZV9jdHgtPm1wY19pZHhdOworCXRyZWVfY2ZnID0gJmRjLT5jdXJyZW50 X2NvbnRleHQtPnJlc19jdHgubXBjX3RyZWVbcGlwZV9jdHgtPm1wY19pZHhdOwogCiAJaWYgKHBp cGVfY3R4LT50b3BfcGlwZSA9PSBOVUxMKQogCQlkY24xMF9kZWxldGVfbXBjX3RyZWUobXBjLCB0 cmVlX2NmZyk7CkBAIC0xNTIzLDYgKzE1MjMsOCBAQCBzdGF0aWMgdm9pZCB1cGRhdGVfZGNodWJw X2RwcCgKIAlzdHJ1Y3QgdGdfY29sb3IgYmxhY2tfY29sb3IgPSB7MH07CiAJc3RydWN0IGRjbjEw X21wYyAqbXBjID0gVE9fRENOMTBfTVBDKGRjLT5yZXNfcG9vbC0+bXBjKTsKIAorCXN0cnVjdCBw aXBlX2N0eCAqY3VyX3BpcGVfY3R4ID0gJmRjLT5jdXJyZW50X2NvbnRleHQtPnJlc19jdHgucGlw ZV9jdHhbcGlwZV9jdHgtPnBpcGVfaWR4XTsKKwogCS8qIGRlcGVuZHMgb24gRE1MIGNhbGN1bGF0 aW9uLCBEUFAgY2xvY2sgdmFsdWUgbWF5IGNoYW5nZSBkeW5hbWljYWxseSAqLwogCWVuYWJsZV9k cHBjbGsoCiAJCWRjLT5jdHgsCkBAIC0xNTY2LDYgKzE1NjgsNyBAQCBzdGF0aWMgdm9pZCB1cGRh dGVfZGNodWJwX2RwcCgKIAkgKi8KIAlwaXBlX2N0eC0+bXBjX2lkeCA9IHBpcGVfY3R4LT50Zy0+ aW5zdDsKIAl0cmVlX2NmZyA9ICZjb250ZXh0LT5yZXNfY3R4Lm1wY190cmVlW3BpcGVfY3R4LT5t cGNfaWR4XTsKKwogCS8qIGVuYWJsZSB3aGVuIGJvdHRvbSBwaXBlIGlzIHByZXNlbnQgYW5kCiAJ ICogaXQgZG9lcyBub3Qgc2hhcmUgYSBzdXJmYWNlIHdpdGggY3VycmVudCBwaXBlCiAJICovCkBA IC0xNTc2LDIxICsxNTc5LDI5IEBAIHN0YXRpYyB2b2lkIHVwZGF0ZV9kY2h1YnBfZHBwKAogCQlw aXBlX2N0eC0+c2NsX2RhdGEubGJfcGFyYW1zLmFscGhhX2VuID0gMDsKIAkJdHJlZV9jZmctPm1v ZGUgPSBUT1BfUEFTU1RIUlU7CiAJfQotCWlmICghcGlwZV9jdHgtPnRvcF9waXBlKSB7CisJaWYg KCFwaXBlX2N0eC0+dG9wX3BpcGUgJiYgIWN1cl9waXBlX2N0eC0+Ym90dG9tX3BpcGUpIHsKIAkJ LyogcHJpbWFyeSBwaXBlLCBzZXQgbXBjIHRyZWUgaW5kZXggMCBvbmx5ICovCiAJCXRyZWVfY2Zn LT5udW1fcGlwZXMgPSAxOwogCQl0cmVlX2NmZy0+b3BwX2lkID0gcGlwZV9jdHgtPnRnLT5pbnN0 OwogCQl0cmVlX2NmZy0+ZHBwWzBdID0gcGlwZV9jdHgtPnBpcGVfaWR4OwogCQl0cmVlX2NmZy0+ bXBjY1swXSA9IHBpcGVfY3R4LT5waXBlX2lkeDsKLQkJZGNuMTBfc2V0X21wY190cmVlKG1wYywg dHJlZV9jZmcpOwotCX0gZWxzZSB7Ci0JCS8qIFRPRE86IGFkZCBwb3NpdGlvbiBpcyBoYXJkIGNv ZGUgdG8gMSBmb3Igbm93Ci0JCSAqIElmIG1vcmUgdGhhbiAyIHBpcGVzIGFyZSBzdXBwb3J0ZWQs IGNhbGN1bGF0ZSBwb3NpdGlvbgotCQkgKi8KKwl9CisKKwlpZiAoIWN1cl9waXBlX2N0eC0+dG9w X3BpcGUgJiYgIXBpcGVfY3R4LT50b3BfcGlwZSkgeworCisJCWlmICghY3VyX3BpcGVfY3R4LT5i b3R0b21fcGlwZSkKKwkJCWRjbjEwX3NldF9tcGNfdHJlZShtcGMsIHRyZWVfY2ZnKTsKKworCX0g ZWxzZSBpZiAoIWN1cl9waXBlX2N0eC0+dG9wX3BpcGUgJiYgcGlwZV9jdHgtPnRvcF9waXBlKSB7 CisKIAkJZGNuMTBfYWRkX2RwcChtcGMsIHRyZWVfY2ZnLAogCQkJcGlwZV9jdHgtPnBpcGVfaWR4 LCBwaXBlX2N0eC0+cGlwZV9pZHgsIDEpOworCX0gZWxzZSB7CisJCS8qIG5vdGhpbmcgdG8gYmUg ZG9uZSBoZXJlICovCisJCUFTU0VSVChjdXJfcGlwZV9jdHgtPnRvcF9waXBlICYmIHBpcGVfY3R4 LT50b3BfcGlwZSk7CiAJfQogCisKIAljb2xvcl9zcGFjZSA9IHBpcGVfY3R4LT5zdHJlYW0tPnB1 YmxpYy5vdXRwdXRfY29sb3Jfc3BhY2U7CiAJY29sb3Jfc3BhY2VfdG9fYmxhY2tfY29sb3IoZGMs IGNvbG9yX3NwYWNlLCAmYmxhY2tfY29sb3IpOwogCWRjbjEwX3NldF9tcGNfYmFja2dyb3VuZF9j b2xvcihtcGMsIHBpcGVfY3R4LT5waXBlX2lkeCwgJmJsYWNrX2NvbG9yKTsKQEAgLTE2NDEsMTMg KzE2NTIsMTggQEAgc3RhdGljIHZvaWQgcHJvZ3JhbV9hbGxfcGlwZV9pbl90cmVlKAogCQkJCQlw aXBlX2N0eC0+bWksICZjb250ZXh0LT53YXRlcm1hcmtzLCByZWZfY2xrX21oeik7CiAJCQlsb2Nr X290Z19tYXN0ZXJfdXBkYXRlKGRjLT5jdHgsIHBpcGVfY3R4LT50Zy0+aW5zdCk7CiAJCX0KKwog CQlwaXBlX2N0eC0+dGctPmRsZ19vdGdfcGFyYW0udnJlYWR5X29mZnNldCA9IHBpcGVfY3R4LT5w aXBlX2RsZ19wYXJhbS52cmVhZHlfb2Zmc2V0OwogCQlwaXBlX2N0eC0+dGctPmRsZ19vdGdfcGFy YW0udnN0YXJ0dXBfc3RhcnQgPSBwaXBlX2N0eC0+cGlwZV9kbGdfcGFyYW0udnN0YXJ0dXBfc3Rh cnQ7CiAJCXBpcGVfY3R4LT50Zy0+ZGxnX290Z19wYXJhbS52dXBkYXRlX29mZnNldCA9IHBpcGVf Y3R4LT5waXBlX2RsZ19wYXJhbS52dXBkYXRlX29mZnNldDsKIAkJcGlwZV9jdHgtPnRnLT5kbGdf b3RnX3BhcmFtLnZ1cGRhdGVfd2lkdGggPSBwaXBlX2N0eC0+cGlwZV9kbGdfcGFyYW0udnVwZGF0 ZV93aWR0aDsKIAkJcGlwZV9jdHgtPnRnLT5kbGdfb3RnX3BhcmFtLnNpZ25hbCA9ICBwaXBlX2N0 eC0+c3RyZWFtLT5zaWduYWw7CisKIAkJcGlwZV9jdHgtPnRnLT5mdW5jcy0+cHJvZ3JhbV9nbG9i YWxfc3luYygKIAkJCQlwaXBlX2N0eC0+dGcpOworCisKKwogCQl1cGRhdGVfZGNodWJwX2RwcChk YywgcGlwZV9jdHgsIGNvbnRleHQpOwogCX0KIAotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK