From: Harry Wentland Subject: [PATCH 02/27] drm/amd/display: fix surface attachment handling of pipe split Date: Fri, 9 Jun 2017 16:11:15 -0400 Message-ID: <20170609201140.1046-3-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 YW5nZS1JZDogSTVmODEzMzNlMjE2NThjZGQxYTVjOTkzMmNmYzkxZDZlOWE1NmVjMDIKU2lnbmVk LW9mZi1ieTogRG15dHJvIExha3R5dXNoa2luIDxEbXl0cm8uTGFrdHl1c2hraW5AYW1kLmNvbT4K UmV2aWV3ZWQtYnk6IFRvbnkgQ2hlbmcgPFRvbnkuQ2hlbmdAYW1kLmNvbT4KQWNrZWQtYnk6IEhh cnJ5IFdlbnRsYW5kIDxIYXJyeS5XZW50bGFuZEBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2Ry bS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3Jlc291cmNlLmMgfCAzNSArKysrKysrLS0tLS0tLS0t LS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEwIGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3Jl c291cmNlLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19yZXNvdXJj ZS5jCmluZGV4IGZlYjBmNWQzODViMi4uYzk3ZDBkMWQ0NzFlIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19yZXNvdXJjZS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjX3Jlc291cmNlLmMKQEAgLTg5NCwyNCArODk0 LDYgQEAgZW51bSBkY19zdGF0dXMgcmVzb3VyY2VfYnVpbGRfc2NhbGluZ19wYXJhbXNfZm9yX2Nv bnRleHQoCiAJcmV0dXJuIERDX09LOwogfQogCi1zdGF0aWMgdm9pZCBkZXRhY2hfc3VyZmFjZXNf Zm9yX3N0cmVhbSgKLQkJc3RydWN0IHZhbGlkYXRlX2NvbnRleHQgKmNvbnRleHQsCi0JCWNvbnN0 IHN0cnVjdCByZXNvdXJjZV9wb29sICpwb29sLAotCQljb25zdCBzdHJ1Y3QgZGNfc3RyZWFtICpk Y19zdHJlYW0pCi17Ci0JaW50IGk7Ci0Jc3RydWN0IGNvcmVfc3RyZWFtICpzdHJlYW0gPSBEQ19T VFJFQU1fVE9fQ09SRShkY19zdHJlYW0pOwotCi0JZm9yIChpID0gMDsgaSA8IHBvb2wtPnBpcGVf Y291bnQ7IGkrKykgewotCQlzdHJ1Y3QgcGlwZV9jdHggKmN1cl9waXBlID0gJmNvbnRleHQtPnJl c19jdHgucGlwZV9jdHhbaV07Ci0JCWlmIChjdXJfcGlwZS0+c3RyZWFtID09IHN0cmVhbSkgewot CQkJY3VyX3BpcGUtPnN1cmZhY2UgPSBOVUxMOwotCQkJY3VyX3BpcGUtPnRvcF9waXBlID0gTlVM TDsKLQkJCWN1cl9waXBlLT5ib3R0b21fcGlwZSA9IE5VTEw7Ci0JCX0KLQl9Ci19Ci0KIHN0cnVj dCBwaXBlX2N0eCAqZmluZF9pZGxlX3NlY29uZGFyeV9waXBlKAogCQlzdHJ1Y3QgcmVzb3VyY2Vf Y29udGV4dCAqcmVzX2N0eCwKIAkJY29uc3Qgc3RydWN0IHJlc291cmNlX3Bvb2wgKnBvb2wpCkBA IC0xMDA0LDkgKzk4NiwxMSBAQCBzdGF0aWMgdm9pZCByZWxlYXNlX2ZyZWVfcGlwZXNfZm9yX3N0 cmVhbSgKIAlzdHJ1Y3QgY29yZV9zdHJlYW0gKnN0cmVhbSA9IERDX1NUUkVBTV9UT19DT1JFKGRj X3N0cmVhbSk7CiAKIAlmb3IgKGkgPSBNQVhfUElQRVMgLSAxOyBpID49IDA7IGktLSkgeworCQkv KiBuZXZlciByZWxlYXNlIHRoZSB0b3Btb3N0IHBpcGUqLwogCQlpZiAocmVzX2N0eC0+cGlwZV9j dHhbaV0uc3RyZWFtID09IHN0cmVhbSAmJgorCQkJCXJlc19jdHgtPnBpcGVfY3R4W2ldLnRvcF9w aXBlICYmCiAJCQkJIXJlc19jdHgtPnBpcGVfY3R4W2ldLnN1cmZhY2UpIHsKLQkJCXJlc19jdHgt PnBpcGVfY3R4W2ldLnN0cmVhbSA9IE5VTEw7CisJCQltZW1zZXQoJnJlc19jdHgtPnBpcGVfY3R4 W2ldLCAwLCBzaXplb2Yoc3RydWN0IHBpcGVfY3R4KSk7CiAJCX0KIAl9CiB9CkBAIC0xMDIxLDYg KzEwMDUsNyBAQCBib29sIHJlc291cmNlX2F0dGFjaF9zdXJmYWNlc190b19jb250ZXh0KAogCWlu dCBpOwogCXN0cnVjdCBwaXBlX2N0eCAqdGFpbF9waXBlOwogCXN0cnVjdCBkY19zdHJlYW1fc3Rh dHVzICpzdHJlYW1fc3RhdHVzID0gTlVMTDsKKwlzdHJ1Y3QgY29yZV9zdHJlYW0gKnN0cmVhbSA9 IERDX1NUUkVBTV9UT19DT1JFKGRjX3N0cmVhbSk7CiAKIAogCWlmIChzdXJmYWNlX2NvdW50ID4g TUFYX1NVUkZBQ0VfTlVNKSB7CkBAIC0xMDQzLDcgKzEwMjgsMTIgQEAgYm9vbCByZXNvdXJjZV9h dHRhY2hfc3VyZmFjZXNfdG9fY29udGV4dCgKIAlmb3IgKGkgPSAwOyBpIDwgc3VyZmFjZV9jb3Vu dDsgaSsrKQogCQlkY19zdXJmYWNlX3JldGFpbihzdXJmYWNlc1tpXSk7CiAKLQlkZXRhY2hfc3Vy ZmFjZXNfZm9yX3N0cmVhbShjb250ZXh0LCBwb29sLCBkY19zdHJlYW0pOworCS8qIGRldGFjaCBz dXJmYWNlcyBmcm9tIHBpcGVzICovCisJZm9yIChpID0gMDsgaSA8IHBvb2wtPnBpcGVfY291bnQ7 IGkrKykKKwkJaWYgKGNvbnRleHQtPnJlc19jdHgucGlwZV9jdHhbaV0uc3RyZWFtID09IHN0cmVh bSkgeworCQkJY29udGV4dC0+cmVzX2N0eC5waXBlX2N0eFtpXS5zdXJmYWNlID0gTlVMTDsKKwkJ CWNvbnRleHQtPnJlc19jdHgucGlwZV9jdHhbaV0uYm90dG9tX3BpcGUgPSBOVUxMOworCQl9CiAK IAkvKiByZWxlYXNlIGV4aXN0aW5nIHN1cmZhY2VzKi8KIAlmb3IgKGkgPSAwOyBpIDwgc3RyZWFt X3N0YXR1cy0+c3VyZmFjZV9jb3VudDsgaSsrKQpAQCAtMTA1MiwxMSArMTA0Miw2IEBAIGJvb2wg cmVzb3VyY2VfYXR0YWNoX3N1cmZhY2VzX3RvX2NvbnRleHQoCiAJZm9yIChpID0gc3VyZmFjZV9j b3VudDsgaSA8IHN0cmVhbV9zdGF0dXMtPnN1cmZhY2VfY291bnQ7IGkrKykKIAkJc3RyZWFtX3N0 YXR1cy0+c3VyZmFjZXNbaV0gPSBOVUxMOwogCi0Jc3RyZWFtX3N0YXR1cy0+c3VyZmFjZV9jb3Vu dCA9IDA7Ci0KLQlpZiAoc3VyZmFjZV9jb3VudCA9PSAwKQotCQlyZXR1cm4gdHJ1ZTsKLQogCXRh aWxfcGlwZSA9IE5VTEw7CiAJZm9yIChpID0gMDsgaSA8IHN1cmZhY2VfY291bnQ7IGkrKykgewog CQlzdHJ1Y3QgY29yZV9zdXJmYWNlICpzdXJmYWNlID0gRENfU1VSRkFDRV9UT19DT1JFKHN1cmZh Y2VzW2ldKTsKLS0gCjIuMTEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9hbWQt Z2Z4Cg==