From: Harry Wentland Subject: [PATCH 03/27] drm/amd/display: fix mpo + split pipe aquisition failure Date: Fri, 9 Jun 2017 16:11:16 -0400 Message-ID: <20170609201140.1046-4-harry.wentland@amd.com> References: <20170609201140.1046-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: <20170609201140.1046-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: Dmytro Laktyushkin RnJvbTogRG15dHJvIExha3R5dXNoa2luIDxEbXl0cm8uTGFrdHl1c2hraW5AYW1kLmNvbT4KCkNo YW5nZS1JZDogSWMwZDE1MzMzOTcxYzMzMTAyYjg4N2I4YzQyNWI2YzQyMzFkMDNkOGIKU2lnbmVk LW9mZi1ieTogRG15dHJvIExha3R5dXNoa2luIDxEbXl0cm8uTGFrdHl1c2hraW5AYW1kLmNvbT4K UmV2aWV3ZWQtYnk6IFRvbnkgQ2hlbmcgPFRvbnkuQ2hlbmdAYW1kLmNvbT4KQWNrZWQtYnk6IEhh cnJ5IFdlbnRsYW5kIDxIYXJyeS5XZW50bGFuZEBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3Jlc291cmNlLmMgfCA4MCArKysrKysrKysrKysrLS0t LS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQ0IGluc2VydGlvbnMoKyksIDM2IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3Jl c291cmNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19yZXNvdXJj ZS5jCmluZGV4IGM5N2QwZDFkNDcxZS4uMjM2YzhlOWMwZjZhIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19yZXNvdXJjZS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3Jlc291cmNlLmMKQEAgLTk5NSw2ICs5OTUs NDMgQEAgc3RhdGljIHZvaWQgcmVsZWFzZV9mcmVlX3BpcGVzX2Zvcl9zdHJlYW0oCiAJfQogfQog CisjaWYgZGVmaW5lZChDT05GSUdfRFJNX0FNRF9EQ19EQ04xXzApCitzdGF0aWMgaW50IGFjcXVp cmVfZmlyc3Rfc3BsaXRfcGlwZSgKKwkJc3RydWN0IHJlc291cmNlX2NvbnRleHQgKnJlc19jdHgs CisJCWNvbnN0IHN0cnVjdCByZXNvdXJjZV9wb29sICpwb29sLAorCQlzdHJ1Y3QgY29yZV9zdHJl YW0gKnN0cmVhbSkKK3sKKwlpbnQgaTsKKworCWZvciAoaSA9IDA7IGkgPCBwb29sLT5waXBlX2Nv dW50OyBpKyspIHsKKwkJc3RydWN0IHBpcGVfY3R4ICpwaXBlX2N0eCA9ICZyZXNfY3R4LT5waXBl X2N0eFtpXTsKKworCQlpZiAocGlwZV9jdHgtPnRvcF9waXBlICYmCisJCQkJcGlwZV9jdHgtPnRv cF9waXBlLT5zdXJmYWNlID09IHBpcGVfY3R4LT5zdXJmYWNlKSB7CisJCQlpbnQgbXBjX2lkeCA9 IHBpcGVfY3R4LT5tcGNfaWR4OworCisJCQlwaXBlX2N0eC0+dG9wX3BpcGUtPmJvdHRvbV9waXBl ID0gcGlwZV9jdHgtPmJvdHRvbV9waXBlOworCQkJaWYgKHBpcGVfY3R4LT5ib3R0b21fcGlwZSkK KwkJCQlwaXBlX2N0eC0+Ym90dG9tX3BpcGUtPnRvcF9waXBlID0gcGlwZV9jdHgtPnRvcF9waXBl OworCisJCQltZW1zZXQocGlwZV9jdHgsIDAsIHNpemVvZigqcGlwZV9jdHgpKTsKKwkJCXBpcGVf Y3R4LT50ZyA9IHBvb2wtPnRpbWluZ19nZW5lcmF0b3JzW2ldOworCQkJcGlwZV9jdHgtPm1pID0g cG9vbC0+bWlzW2ldOworCQkJcGlwZV9jdHgtPmlwcCA9IHBvb2wtPmlwcHNbaV07CisJCQlwaXBl X2N0eC0+eGZtID0gcG9vbC0+dHJhbnNmb3Jtc1tpXTsKKwkJCXBpcGVfY3R4LT5vcHAgPSBwb29s LT5vcHBzW2ldOworCQkJcGlwZV9jdHgtPmRpc19jbGsgPSBwb29sLT5kaXNwbGF5X2Nsb2NrOwor CQkJcGlwZV9jdHgtPnBpcGVfaWR4ID0gaTsKKwkJCXBpcGVfY3R4LT5tcGNfaWR4ID0gbXBjX2lk eDsKKworCQkJcGlwZV9jdHgtPnN0cmVhbSA9IHN0cmVhbTsKKwkJCXJldHVybiBpOworCQl9CisJ fQorCXJldHVybiAtMTsKK30KKyNlbmRpZgorCiBib29sIHJlc291cmNlX2F0dGFjaF9zdXJmYWNl c190b19jb250ZXh0KAogCQljb25zdCBzdHJ1Y3QgZGNfc3VyZmFjZSAqIGNvbnN0ICpzdXJmYWNl cywKIAkJaW50IHN1cmZhY2VfY291bnQsCkBAIC0xMDQ4LDYgKzEwODUsMTMgQEAgYm9vbCByZXNv dXJjZV9hdHRhY2hfc3VyZmFjZXNfdG9fY29udGV4dCgKIAkJc3RydWN0IHBpcGVfY3R4ICpmcmVl X3BpcGUgPSBhY3F1aXJlX2ZyZWVfcGlwZV9mb3Jfc3RyZWFtKAogCQkJCWNvbnRleHQsIHBvb2ws IGRjX3N0cmVhbSk7CiAKKyNpZiBkZWZpbmVkKENPTkZJR19EUk1fQU1EX0RDX0RDTjFfMCkKKwkJ aWYgKCFmcmVlX3BpcGUpIHsKKwkJCWludCBwaXBlX2lkeCA9IGFjcXVpcmVfZmlyc3Rfc3BsaXRf cGlwZSgmY29udGV4dC0+cmVzX2N0eCwgcG9vbCwgc3RyZWFtKTsKKwkJCWlmIChwaXBlX2lkeCA+ PSAwKQorCQkJCWZyZWVfcGlwZSA9ICZjb250ZXh0LT5yZXNfY3R4LnBpcGVfY3R4W3BpcGVfaWR4 XTsKKwkJfQorI2VuZGlmCiAJCWlmICghZnJlZV9waXBlKSB7CiAJCQlzdHJlYW1fc3RhdHVzLT5z dXJmYWNlc1tpXSA9IE5VTEw7CiAJCQlyZXR1cm4gZmFsc2U7CkBAIC0xMzkxLDQyICsxNDM1LDYg QEAgc3RhdGljIHZvaWQgY2FsY3VsYXRlX3BoeV9waXhfY2xrcyhzdHJ1Y3QgdmFsaWRhdGVfY29u dGV4dCAqY29udGV4dCkKIAl9CiB9CiAKLSNpZiBkZWZpbmVkKENPTkZJR19EUk1fQU1EX0RDX0RD TjFfMCkKLXN0YXRpYyBpbnQgYWNxdWlyZV9maXJzdF9zcGxpdF9waXBlKAotCQlzdHJ1Y3QgcmVz b3VyY2VfY29udGV4dCAqcmVzX2N0eCwKLQkJY29uc3Qgc3RydWN0IHJlc291cmNlX3Bvb2wgKnBv b2wsCi0JCXN0cnVjdCBjb3JlX3N0cmVhbSAqc3RyZWFtKQotewotCWludCBpOwotCi0JZm9yIChp ID0gMDsgaSA8IHBvb2wtPnBpcGVfY291bnQ7IGkrKykgewotCQlzdHJ1Y3QgcGlwZV9jdHggKnBp cGVfY3R4ID0gJnJlc19jdHgtPnBpcGVfY3R4W2ldOwotCi0JCWlmIChwaXBlX2N0eC0+dG9wX3Bp cGUgJiYKLQkJCQlwaXBlX2N0eC0+dG9wX3BpcGUtPnN1cmZhY2UgPT0gcGlwZV9jdHgtPnN1cmZh Y2UpIHsKLQkJCWludCBtcGNfaWR4ID0gcGlwZV9jdHgtPm1wY19pZHg7Ci0KLQkJCXBpcGVfY3R4 LT50b3BfcGlwZS0+Ym90dG9tX3BpcGUgPSBwaXBlX2N0eC0+Ym90dG9tX3BpcGU7Ci0JCQlwaXBl X2N0eC0+Ym90dG9tX3BpcGUtPnRvcF9waXBlID0gcGlwZV9jdHgtPnRvcF9waXBlOwotCi0JCQlt ZW1zZXQocGlwZV9jdHgsIDAsIHNpemVvZigqcGlwZV9jdHgpKTsKLQkJCXBpcGVfY3R4LT50ZyA9 IHBvb2wtPnRpbWluZ19nZW5lcmF0b3JzW2ldOwotCQkJcGlwZV9jdHgtPm1pID0gcG9vbC0+bWlz W2ldOwotCQkJcGlwZV9jdHgtPmlwcCA9IHBvb2wtPmlwcHNbaV07Ci0JCQlwaXBlX2N0eC0+eGZt ID0gcG9vbC0+dHJhbnNmb3Jtc1tpXTsKLQkJCXBpcGVfY3R4LT5vcHAgPSBwb29sLT5vcHBzW2ld OwotCQkJcGlwZV9jdHgtPmRpc19jbGsgPSBwb29sLT5kaXNwbGF5X2Nsb2NrOwotCQkJcGlwZV9j dHgtPnBpcGVfaWR4ID0gaTsKLQkJCXBpcGVfY3R4LT5tcGNfaWR4ID0gbXBjX2lkeDsKLQotCQkJ cGlwZV9jdHgtPnN0cmVhbSA9IHN0cmVhbTsKLQkJCXJldHVybiBpOwotCQl9Ci0JfQotCXJldHVy biAtMTsKLX0KLSNlbmRpZgotCiBlbnVtIGRjX3N0YXR1cyByZXNvdXJjZV9tYXBfcG9vbF9yZXNv dXJjZXMoCiAJCWNvbnN0IHN0cnVjdCBjb3JlX2RjICpkYywKIAkJc3RydWN0IHZhbGlkYXRlX2Nv bnRleHQgKmNvbnRleHQsCi0tIAoyLjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vYW1kLWdmeAo=