From: Harry Wentland Subject: [PATCH 14/31] drm/amd/display: revert dc_get_validate_context re-entrancy fix Date: Tue, 23 May 2017 10:08:52 -0400 Message-ID: <20170523140909.9924-15-harry.wentland@amd.com> References: <20170523140909.9924-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: <20170523140909.9924-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 RnJvbTogRG15dHJvIExha3R5dXNoa2luIDxEbXl0cm8uTGFrdHl1c2hraW5AYW1kLmNvbT4KCkFw cGx5IGRjX2dldF92YWxpZGF0ZV9jb250ZXh0IHJlLWVudHJhbmN5IGZpeCB0byBkY192YWxpZGF0 ZV9yZXNvdXJjZXMgaW5zdGVhZAoKQ2hhbmdlLUlkOiBJODUwMjAxMGZmMjRmNmIzYjRlYTkzMmUx MDQyZmRjYTFhMDJhNWEwYwpTaWduZWQtb2ZmLWJ5OiBEbXl0cm8gTGFrdHl1c2hraW4gPERteXRy by5MYWt0eXVzaGtpbkBhbWQuY29tPgpSZXZpZXdlZC1ieTogRG15dHJvIExha3R5dXNoa2luIDxE bXl0cm8uTGFrdHl1c2hraW5AYW1kLmNvbT4KQWNrZWQtYnk6IEhhcnJ5IFdlbnRsYW5kIDxIYXJy eS5XZW50bGFuZEBhbWQuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9j b3JlL2RjLmMgfCA3MSArKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLQogMSBmaWxlIGNo YW5nZWQsIDYyIGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9h bWQvZGlzcGxheS9kYy9jb3JlL2RjLmMKaW5kZXggMGFhZmNjMDg4Mjg0Li43NzNmMGVmYzQ0OWIg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGMuYwpAQCAtNjUzLDYgKzY1 Myw0MCBAQCB2b2lkIGRjX2Rlc3Ryb3koc3RydWN0IGRjICoqZGMpCiAJKmRjID0gTlVMTDsKIH0K IAorc3RhdGljIGJvb2wgaXNfdmFsaWRhdGlvbl9yZXF1aXJlZCgKKwkJY29uc3Qgc3RydWN0IGNv cmVfZGMgKmRjLAorCQljb25zdCBzdHJ1Y3QgZGNfdmFsaWRhdGlvbl9zZXQgc2V0W10sCisJCWlu dCBzZXRfY291bnQpCit7CisJY29uc3Qgc3RydWN0IHZhbGlkYXRlX2NvbnRleHQgKmNvbnRleHQg PSBkYy0+Y3VycmVudF9jb250ZXh0OworCWludCBpLCBqOworCisJaWYgKGNvbnRleHQtPnN0cmVh bV9jb3VudCAhPSBzZXRfY291bnQpCisJCXJldHVybiB0cnVlOworCisJZm9yIChpID0gMDsgaSA8 IHNldF9jb3VudDsgaSsrKSB7CisKKwkJaWYgKHNldFtpXS5zdXJmYWNlX2NvdW50ICE9IGNvbnRl eHQtPnN0cmVhbV9zdGF0dXNbaV0uc3VyZmFjZV9jb3VudCkKKwkJCXJldHVybiB0cnVlOworCQlp ZiAoIWlzX3N0cmVhbV91bmNoYW5nZWQoRENfU1RSRUFNX1RPX0NPUkUoc2V0W2ldLnN0cmVhbSks IGNvbnRleHQtPnN0cmVhbXNbaV0pKQorCQkJcmV0dXJuIHRydWU7CisKKwkJZm9yIChqID0gMDsg aiA8IHNldFtpXS5zdXJmYWNlX2NvdW50OyBqKyspIHsKKwkJCXN0cnVjdCBkY19zdXJmYWNlIHRl bXBfc3VyZiA9IHsgMCB9OworCisJCQl0ZW1wX3N1cmYgPSAqY29udGV4dC0+c3RyZWFtX3N0YXR1 c1tpXS5zdXJmYWNlc1tqXTsKKwkJCXRlbXBfc3VyZi5jbGlwX3JlY3QgPSBzZXRbaV0uc3VyZmFj ZXNbal0tPmNsaXBfcmVjdDsKKwkJCXRlbXBfc3VyZi5kc3RfcmVjdC54ID0gc2V0W2ldLnN1cmZh Y2VzW2pdLT5kc3RfcmVjdC54OworCQkJdGVtcF9zdXJmLmRzdF9yZWN0LnkgPSBzZXRbaV0uc3Vy ZmFjZXNbal0tPmRzdF9yZWN0Lnk7CisKKwkJCWlmIChtZW1jbXAoJnRlbXBfc3VyZiwgc2V0W2ld LnN1cmZhY2VzW2pdLCBzaXplb2YodGVtcF9zdXJmKSkgIT0gMCkKKwkJCQlyZXR1cm4gdHJ1ZTsK KwkJfQorCX0KKworCXJldHVybiBmYWxzZTsKK30KKwogc3RydWN0IHZhbGlkYXRlX2NvbnRleHQg KmRjX2dldF92YWxpZGF0ZV9jb250ZXh0KAogCQljb25zdCBzdHJ1Y3QgZGMgKmRjLAogCQljb25z dCBzdHJ1Y3QgZGNfdmFsaWRhdGlvbl9zZXQgc2V0W10sCkBAIC02NjMsMTEgKzY5NywxNiBAQCBz dHJ1Y3QgdmFsaWRhdGVfY29udGV4dCAqZGNfZ2V0X3ZhbGlkYXRlX2NvbnRleHQoCiAJc3RydWN0 IHZhbGlkYXRlX2NvbnRleHQgKmNvbnRleHQ7CiAKIAljb250ZXh0ID0gZG1fYWxsb2Moc2l6ZW9m KHN0cnVjdCB2YWxpZGF0ZV9jb250ZXh0KSk7Ci0JaWYoY29udGV4dCA9PSBOVUxMKQorCWlmIChj b250ZXh0ID09IE5VTEwpCiAJCWdvdG8gY29udGV4dF9hbGxvY19mYWlsOwogCisJaWYgKCFpc192 YWxpZGF0aW9uX3JlcXVpcmVkKGNvcmVfZGMsIHNldCwgc2V0X2NvdW50KSkgeworCQlkY19yZXNv dXJjZV92YWxpZGF0ZV9jdHhfY29weV9jb25zdHJ1Y3QoY29yZV9kYy0+Y3VycmVudF9jb250ZXh0 LCBjb250ZXh0KTsKKwkJcmV0dXJuIGNvbnRleHQ7CisJfQorCiAJcmVzdWx0ID0gY29yZV9kYy0+ cmVzX3Bvb2wtPmZ1bmNzLT52YWxpZGF0ZV93aXRoX2NvbnRleHQoCi0JCQkJY29yZV9kYywgc2V0 LCBzZXRfY291bnQsIGNvbnRleHQsIE5VTEwpOworCQkJY29yZV9kYywgc2V0LCBzZXRfY291bnQs IGNvbnRleHQsIGNvcmVfZGMtPmN1cnJlbnRfY29udGV4dCk7CiAKIGNvbnRleHRfYWxsb2NfZmFp bDoKIAlpZiAocmVzdWx0ICE9IERDX09LKSB7CkBAIC02OTAsMTYgKzcyOSwzMCBAQCBib29sIGRj X3ZhbGlkYXRlX3Jlc291cmNlcygKIAkJY29uc3Qgc3RydWN0IGRjX3ZhbGlkYXRpb25fc2V0IHNl dFtdLAogCQl1aW50OF90IHNldF9jb3VudCkKIHsKLQlzdHJ1Y3QgdmFsaWRhdGVfY29udGV4dCAq Y3R4OworCXN0cnVjdCBjb3JlX2RjICpjb3JlX2RjID0gRENfVE9fQ09SRShkYyk7CisJZW51bSBk Y19zdGF0dXMgcmVzdWx0ID0gRENfRVJST1JfVU5FWFBFQ1RFRDsKKwlzdHJ1Y3QgdmFsaWRhdGVf Y29udGV4dCAqY29udGV4dDsKIAotCWN0eCA9IGRjX2dldF92YWxpZGF0ZV9jb250ZXh0KGRjLCBz ZXQsIHNldF9jb3VudCk7Ci0JaWYgKGN0eCkgewotCQlkY19yZXNvdXJjZV92YWxpZGF0ZV9jdHhf ZGVzdHJ1Y3QoY3R4KTsKLQkJZG1fZnJlZShjdHgpOwotCQlyZXR1cm4gdHJ1ZTsKKwljb250ZXh0 ID0gZG1fYWxsb2Moc2l6ZW9mKHN0cnVjdCB2YWxpZGF0ZV9jb250ZXh0KSk7CisJaWYgKGNvbnRl eHQgPT0gTlVMTCkKKwkJZ290byBjb250ZXh0X2FsbG9jX2ZhaWw7CisKKwlyZXN1bHQgPSBjb3Jl X2RjLT5yZXNfcG9vbC0+ZnVuY3MtPnZhbGlkYXRlX3dpdGhfY29udGV4dCgKKwkJCQljb3JlX2Rj LCBzZXQsIHNldF9jb3VudCwgY29udGV4dCwgTlVMTCk7CisKK2NvbnRleHRfYWxsb2NfZmFpbDoK KwlpZiAocmVzdWx0ICE9IERDX09LKSB7CisJCWRtX2xvZ2dlcl93cml0ZShjb3JlX2RjLT5jdHgt PmxvZ2dlciwgTE9HX1dBUk5JTkcsCisJCQkJIiVzOnJlc291cmNlIHZhbGlkYXRpb24gZmFpbGVk LCBkY19zdGF0dXM6JWRcbiIsCisJCQkJX19mdW5jX18sCisJCQkJcmVzdWx0KTsKIAl9CiAKLQly ZXR1cm4gZmFsc2U7CisJZGNfcmVzb3VyY2VfdmFsaWRhdGVfY3R4X2Rlc3RydWN0KGNvbnRleHQp OworCWRtX2ZyZWUoY29udGV4dCk7CisJY29udGV4dCA9IE5VTEw7CisKKwlyZXR1cm4gcmVzdWx0 ID09IERDX09LOwogfQogCiBib29sIGRjX3ZhbGlkYXRlX2d1YXJhbnRlZWQoCi0tIAoyLjExLjAK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZngg bWFpbGluZyBsaXN0CmFtZC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=