From mboxrd@z Thu Jan 1 00:00:00 1970 From: Subject: [PATCH 24/49] drm/amd/display: fix pipe selection logic in validate Date: Fri, 9 Aug 2019 17:37:17 -0400 Message-ID: <20190809213742.30301-25-sunpeng.li@amd.com> References: <20190809213742.30301-1-sunpeng.li@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190809213742.30301-1-sunpeng.li-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: Leo Li , Jun Lei , Eric Yang RnJvbTogSnVuIExlaSA8SnVuLkxlaUBhbWQuY29tPgoKW3doeV0KUmVzb3VyY2UgbWFwcGluZyBk b25lIGluIGRjbjIwX3ZhbGlkYXRlX2JhbmR3aWR0aCBoYXMgYSBmbGF3OiAgV2hlbiBhIGZ1bGwK dXBkYXRlIGlzIHBlcmZvcm1lZCwgdGhlIEhXU1Mgd2lsbCBvbmx5IHVwZGF0ZSB0aGUgTVBDQyB0 cmVlIGZvciB0aGUgc3RyZWFtCnRoYXQgaXMgdXBkYXRlZCBhcyBvcHBvc2VkIHRvIGFsbCBzdHJl YW1zLiAgVGhpcyBtZWFucyB0aGF0IHdoZW4gbWFwcGluZyBwaXBlcwppbiB2YWxpZGF0aW9uLCBj YXJlIG11c3QgYmUgdGFrZW4gdG8gbm90IGNoYW5nZSBhbnkgZXhpc3RpbmcgbWFwcGluZywgb3Ro ZXJ3aXNlIGl0CmxlYWRzIHRvIHBhcnRpYWwgaHcgcHJvZ3JhbW1pbmcKCltob3ddCml0J3Mgbm90 IHN0cmljdGx5IG5lY2Vzc2FyeSB0byB0cmFjayB3aGljaCBzdHJlYW0vbXBjYyB0cmVlIGlzIGJl aW5nIHVwZGF0ZWQsIGJ1dApyYXRoZXIgaXQncyBzdWZmaWNpZW50IHRvIGNvbXBhcmUgY3VycmVu dCBhbmQgbmV3IHN0YXRlIGFuZCBqdXN0IGtlZXAgcGlwZXMgdGhhdCB3ZXJlCnByZXZpb3VzbHkg YWxyZWFkeSBtYXBwZWQgdW5jaGFuZ2VkLgoKU2lnbmVkLW9mZi1ieTogSnVuIExlaSA8SnVuLkxl aUBhbWQuY29tPgpSZXZpZXdlZC1ieTogRXJpYyBZYW5nIDxlcmljLnlhbmcyQGFtZC5jb20+CkFj a2VkLWJ5OiBMZW8gTGkgPHN1bnBlbmcubGlAYW1kLmNvbT4KLS0tCiAuLi4vZHJtL2FtZC9kaXNw bGF5L2RjL2RjbjIwL2RjbjIwX3Jlc291cmNlLmMgfCA3MiArKysrKysrKysrKysrKysrKystCiAx IGZpbGUgY2hhbmdlZCwgNzAgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMjAvZGNuMjBfcmVzb3VyY2Uu YyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9kY24yMC9kY24yMF9yZXNvdXJjZS5j CmluZGV4IDAyYTc2MzMyMTI3MS4uYmJkMGM2YWMyZDhjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMjAvZGNuMjBfcmVzb3VyY2UuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvZGNuMjAvZGNuMjBfcmVzb3VyY2UuYwpAQCAtMjEyNiw2 ICsyMTI2LDc0IEBAIHN0YXRpYyBib29sIGRjbjIwX3ZhbGlkYXRlX2RzYyhzdHJ1Y3QgZGMgKmRj LCBzdHJ1Y3QgZGNfc3RhdGUgKm5ld19jdHgpCiB9CiAjZW5kaWYKIAorc3RhdGljIHN0cnVjdCBw aXBlX2N0eCAqZGNuMjBfZmluZF9zZWNvbmRhcnlfcGlwZShzdHJ1Y3QgZGMgKmRjLAorCQlzdHJ1 Y3QgcmVzb3VyY2VfY29udGV4dCAqcmVzX2N0eCwKKwkJY29uc3Qgc3RydWN0IHJlc291cmNlX3Bv b2wgKnBvb2wsCisJCWNvbnN0IHN0cnVjdCBwaXBlX2N0eCAqcHJpbWFyeV9waXBlKQoreworCXN0 cnVjdCBwaXBlX2N0eCAqc2Vjb25kYXJ5X3BpcGUgPSBOVUxMOworCisJaWYgKGRjICYmIHByaW1h cnlfcGlwZSkgeworCQlpbnQgajsKKwkJaW50IHByZWZlcnJlZF9waXBlX2lkeCA9IDA7CisKKwkJ LyogZmlyc3QgY2hlY2sgdGhlIHByZXYgZGMgc3RhdGU6CisJCSAqIGlmIHRoaXMgcHJpbWFyeSBw aXBlIGhhcyBhIGJvdHRvbSBwaXBlIGluIHByZXYuIHN0YXRlCisJCSAqIGFuZCBpZiB0aGUgYm90 dG9tIHBpcGUgaXMgc3RpbGwgYXZhaWxhYmxlICh3aGljaCBpdCBzaG91bGQgYmUpLAorCQkgKiBw aWNrIHRoYXQgcGlwZSBhcyBzZWNvbmRhcnkKKwkJICovCisJCWlmIChkYy0+Y3VycmVudF9zdGF0 ZS0+cmVzX2N0eC5waXBlX2N0eFtwcmltYXJ5X3BpcGUtPnBpcGVfaWR4XS5ib3R0b21fcGlwZSkg eworCQkJcHJlZmVycmVkX3BpcGVfaWR4ID0gZGMtPmN1cnJlbnRfc3RhdGUtPnJlc19jdHgucGlw ZV9jdHhbcHJpbWFyeV9waXBlLT5waXBlX2lkeF0uYm90dG9tX3BpcGUtPnBpcGVfaWR4OworCQkJ aWYgKHJlc19jdHgtPnBpcGVfY3R4W3ByZWZlcnJlZF9waXBlX2lkeF0uc3RyZWFtID09IE5VTEwp IHsKKwkJCQlzZWNvbmRhcnlfcGlwZSA9ICZyZXNfY3R4LT5waXBlX2N0eFtwcmVmZXJyZWRfcGlw ZV9pZHhdOworCQkJCXNlY29uZGFyeV9waXBlLT5waXBlX2lkeCA9IHByZWZlcnJlZF9waXBlX2lk eDsKKwkJCX0KKwkJfQorCisJCS8qCisJCSAqIGlmIHRoaXMgcHJpbWFyeSBwaXBlIGRvZXMgbm90 IGhhdmUgYSBib3R0b20gcGlwZSBpbiBwcmV2LiBzdGF0ZQorCQkgKiBzdGFydCBiYWNrd2FyZCBh bmQgZmluZCBhIHBpcGUgdGhhdCBkaWQgbm90IHVzZWQgdG8gYmUgYSBib3R0b20gcGlwZSBpbgor CQkgKiBwcmV2LiBkYyBzdGF0ZS4gVGhpcyB3YXkgd2UgbWFrZSBzdXJlIHdlIGtlZXAgdGhlIHNh bWUgYXNzaWdubWVudCBhcworCQkgKiBsYXN0IHN0YXRlIGFuZCB3aWxsIG5vdCBoYXZlIHRvIHJl cHJvZ3JhbSBldmVyeSBwaXBlCisJCSAqLworCQlpZiAoc2Vjb25kYXJ5X3BpcGUgPT0gTlVMTCkg eworCQkJZm9yIChqID0gZGMtPnJlc19wb29sLT5waXBlX2NvdW50IC0gMTsgaiA+PSAwOyBqLS0p IHsKKwkJCQlpZiAoZGMtPmN1cnJlbnRfc3RhdGUtPnJlc19jdHgucGlwZV9jdHhbal0udG9wX3Bp cGUgPT0gTlVMTCkgeworCQkJCQlwcmVmZXJyZWRfcGlwZV9pZHggPSBqOworCisJCQkJCWlmIChy ZXNfY3R4LT5waXBlX2N0eFtwcmVmZXJyZWRfcGlwZV9pZHhdLnN0cmVhbSA9PSBOVUxMKSB7CisJ CQkJCQlzZWNvbmRhcnlfcGlwZSA9ICZyZXNfY3R4LT5waXBlX2N0eFtwcmVmZXJyZWRfcGlwZV9p ZHhdOworCQkJCQkJc2Vjb25kYXJ5X3BpcGUtPnBpcGVfaWR4ID0gcHJlZmVycmVkX3BpcGVfaWR4 OworCQkJCQkJYnJlYWs7CisJCQkJCX0KKwkJCQl9CisJCQl9CisJCX0KKwkJLyoKKwkJICogV2Ug c2hvdWxkIG5ldmVyIGhpdCB0aGlzIGFzc2VydCB1bmxlc3MgYXNzaWdubWVudHMgYXJlIHNodWZm bGVkIGFyb3VuZAorCQkgKiBpZiB0aGlzIGhhcHBlbnMgd2Ugd2lsbCBwcm9iLiBoaXQgYSB2c3lu YyB0ZHIKKwkJICovCisJCUFTU0VSVChzZWNvbmRhcnlfcGlwZSk7CisJCS8qCisJCSAqIHNlYXJj aCBiYWNrd2FyZHMgZm9yIHRoZSBzZWNvbmQgcGlwZSB0byBrZWVwIHBpcGUKKwkJICogYXNzaWdu bWVudCBtb3JlIGNvbnNpc3RlbnQKKwkJICovCisJCWlmIChzZWNvbmRhcnlfcGlwZSA9PSBOVUxM KSB7CisJCQlmb3IgKGogPSBkYy0+cmVzX3Bvb2wtPnBpcGVfY291bnQgLSAxOyBqID49IDA7IGot LSkgeworCQkJCXByZWZlcnJlZF9waXBlX2lkeCA9IGo7CisKKwkJCQlpZiAocmVzX2N0eC0+cGlw ZV9jdHhbcHJlZmVycmVkX3BpcGVfaWR4XS5zdHJlYW0gPT0gTlVMTCkgeworCQkJCQlzZWNvbmRh cnlfcGlwZSA9ICZyZXNfY3R4LT5waXBlX2N0eFtwcmVmZXJyZWRfcGlwZV9pZHhdOworCQkJCQlz ZWNvbmRhcnlfcGlwZS0+cGlwZV9pZHggPSBwcmVmZXJyZWRfcGlwZV9pZHg7CisJCQkJCWJyZWFr OworCQkJCX0KKwkJCX0KKwkJfQorCX0KKworCXJldHVybiBzZWNvbmRhcnlfcGlwZTsKK30KKwog Ym9vbCBkY24yMF9mYXN0X3ZhbGlkYXRlX2J3KAogCQlzdHJ1Y3QgZGMgKmRjLAogCQlzdHJ1Y3Qg ZGNfc3RhdGUgKmNvbnRleHQsCkBAIC0yMjc5LDcgKzIzNDcsNyBAQCBib29sIGRjbjIwX2Zhc3Rf dmFsaWRhdGVfYncoCiAJCWlmIChmb3JjZV9zcGxpdCAmJiBjb250ZXh0LT5id19jdHguZG1sLnZi YS5Ob09mRFBQW3ZsZXZlbF1bY29udGV4dC0+YndfY3R4LmRtbC52YmEubWF4TXBjQ29tYl1bcGlw ZV9pZHhdID09IDEpCiAJCQljb250ZXh0LT5id19jdHguZG1sLnZiYS5SZXF1aXJlZERQUENMS1t2 bGV2ZWxdW2NvbnRleHQtPmJ3X2N0eC5kbWwudmJhLm1heE1wY0NvbWJdW3BpcGVfaWR4XSAvPSAy OwogCQlpZiAoIXBpcGUtPnRvcF9waXBlICYmICFwaXBlLT5wbGFuZV9zdGF0ZSAmJiBjb250ZXh0 LT5id19jdHguZG1sLnZiYS5PRE1Db21iaW5lRW5hYmxlZFtwaXBlX2lkeF0pIHsKLQkJCWhzcGxp dF9waXBlID0gZmluZF9pZGxlX3NlY29uZGFyeV9waXBlKCZjb250ZXh0LT5yZXNfY3R4LCBkYy0+ cmVzX3Bvb2wsIHBpcGUpOworCQkJaHNwbGl0X3BpcGUgPSBkY24yMF9maW5kX3NlY29uZGFyeV9w aXBlKGRjLCAmY29udGV4dC0+cmVzX2N0eCwgZGMtPnJlc19wb29sLCBwaXBlKTsKIAkJCUFTU0VS VChoc3BsaXRfcGlwZSk7CiAJCQlpZiAoIWRjbjIwX3NwbGl0X3N0cmVhbV9mb3JfY29tYmluZSgK IAkJCQkJJmNvbnRleHQtPnJlc19jdHgsIGRjLT5yZXNfcG9vbCwKQEAgLTIzMjAsNyArMjM4OCw3 IEBAIGJvb2wgZGNuMjBfZmFzdF92YWxpZGF0ZV9idygKIAkJaWYgKG5lZWRfc3BsaXQzZCB8fCBu ZWVkX3NwbGl0IHx8IGZvcmNlX3NwbGl0KSB7CiAJCQlpZiAoIWhzcGxpdF9waXBlIHx8IGhzcGxp dF9waXBlLT5wbGFuZV9zdGF0ZSAhPSBwaXBlLT5wbGFuZV9zdGF0ZSkgewogCQkJCS8qIHBpcGUg bm90IHNwbGl0IHByZXZpb3VzbHkgbmVlZHMgc3BsaXQgKi8KLQkJCQloc3BsaXRfcGlwZSA9IGZp bmRfaWRsZV9zZWNvbmRhcnlfcGlwZSgmY29udGV4dC0+cmVzX2N0eCwgZGMtPnJlc19wb29sLCBw aXBlKTsKKwkJCQloc3BsaXRfcGlwZSA9IGRjbjIwX2ZpbmRfc2Vjb25kYXJ5X3BpcGUoZGMsICZj b250ZXh0LT5yZXNfY3R4LCBkYy0+cmVzX3Bvb2wsIHBpcGUpOwogCQkJCUFTU0VSVChoc3BsaXRf cGlwZSB8fCBmb3JjZV9zcGxpdCk7CiAJCQkJaWYgKCFoc3BsaXRfcGlwZSkKIAkJCQkJY29udGlu dWU7Ci0tIAoyLjIyLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeA==