From: Hai Li Subject: [PATCH 2/2] drm/msm/mdp5: Wait for PP_DONE irq for command mode CRTC atomic commit Date: Fri, 24 Apr 2015 11:57:10 -0400 Message-ID: <1429891030-29721-3-git-send-email-hali@codeaurora.org> References: <1429891030-29721-1-git-send-email-hali@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1429891030-29721-1-git-send-email-hali@codeaurora.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-arm-msm@vger.kernel.org Q1JUQ3MgaW4gRFNJIGNvbW1hbmQgbW9kZSBkYXRhIHBhdGggc2hvdWxkIHdhaXQgZm9yIHBpbmdw b25nIGRvbmUsCmluc3RlYWQgb2YgdmJsYW5rLCB0byBmaW5pc2ggYXRvbWljIGNvbW1pdC4KClRo aXMgY2hhbmdlIGlzIHRvIGVuYWJsZSBQUF9ET05FIGlycSBvbiBjb21tYW5kIG1vZGUgQ1JUQ3Mg YW5kIHdhaXQgZm9yCnRoaXMgaXJxIGhhcHBlbnMgYmVmb3JlIGF0b21pYyBjb21taXQgY29tcGxl dGlvbi4KClNpZ25lZC1vZmYtYnk6IEhhaSBMaSA8aGFsaUBjb2RlYXVyb3JhLm9yZz4KLS0tCiBk cml2ZXJzL2dwdS9kcm0vbXNtL21kcC9tZHA1L21kcDVfY21kX2VuY29kZXIuYyB8ICA0IC0tCiBk cml2ZXJzL2dwdS9kcm0vbXNtL21kcC9tZHA1L21kcDVfY3J0Yy5jICAgICAgICB8IDcxICsrKysr KysrKysrKysrKysrKysrLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgNTggaW5zZXJ0aW9ucygrKSwg MTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21zbS9tZHAvbWRw NS9tZHA1X2NtZF9lbmNvZGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL21kcC9tZHA1L21kcDVf Y21kX2VuY29kZXIuYwppbmRleCBlNGU4OTU2Li41Zjg3MzU3IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vbXNtL21kcC9tZHA1L21kcDVfY21kX2VuY29kZXIuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vbXNtL21kcC9tZHA1L21kcDVfY21kX2VuY29kZXIuYwpAQCAtMjE2LDE2ICsyMTYsMTIg QEAgc3RhdGljIHZvaWQgbWRwNV9jbWRfZW5jb2Rlcl9tb2RlX3NldChzdHJ1Y3QgZHJtX2VuY29k ZXIgKmVuY29kZXIsCiBzdGF0aWMgdm9pZCBtZHA1X2NtZF9lbmNvZGVyX2Rpc2FibGUoc3RydWN0 IGRybV9lbmNvZGVyICplbmNvZGVyKQogewogCXN0cnVjdCBtZHA1X2NtZF9lbmNvZGVyICptZHA1 X2NtZF9lbmMgPSB0b19tZHA1X2NtZF9lbmNvZGVyKGVuY29kZXIpOwotCXN0cnVjdCBtZHA1X2tt cyAqbWRwNV9rbXMgPSBnZXRfa21zKGVuY29kZXIpOwogCXN0cnVjdCBtZHA1X2N0bCAqY3RsID0g bWRwNV9jcnRjX2dldF9jdGwoZW5jb2Rlci0+Y3J0Yyk7CiAJc3RydWN0IG1kcDVfaW50ZXJmYWNl ICppbnRmID0gJm1kcDVfY21kX2VuYy0+aW50ZjsKLQlpbnQgbG0gPSBtZHA1X2NydGNfZ2V0X2xt KGVuY29kZXItPmNydGMpOwogCiAJaWYgKFdBUk5fT04oIW1kcDVfY21kX2VuYy0+ZW5hYmxlZCkp CiAJCXJldHVybjsKIAotCS8qIFdhaXQgZm9yIHRoZSBsYXN0IGZyYW1lIGRvbmUgKi8KLQltZHBf aXJxX3dhaXQoJm1kcDVfa21zLT5iYXNlLCBsbTJwcGRvbmUobG0pKTsKIAlwaW5ncG9uZ190ZWFy Y2hlY2tfZGlzYWJsZShlbmNvZGVyKTsKIAogCW1kcDVfY3RsX3NldF9lbmNvZGVyX3N0YXRlKGN0 bCwgZmFsc2UpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21zbS9tZHAvbWRwNS9tZHA1 X2NydGMuYyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vbWRwL21kcDUvbWRwNV9jcnRjLmMKaW5kZXgg MDM0YjFiOS4uYTM4YzI3YiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21zbS9tZHAvbWRw NS9tZHA1X2NydGMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL21kcC9tZHA1L21kcDVfY3J0 Yy5jCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoYykgMjAxNCBUaGUgTGludXgg Rm91bmRhdGlvbi4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoYykgMjAxNC0y MDE1IFRoZSBMaW51eCBGb3VuZGF0aW9uLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJp Z2h0IChDKSAyMDEzIFJlZCBIYXQKICAqIEF1dGhvcjogUm9iIENsYXJrIDxyb2JkY2xhcmtAZ21h aWwuY29tPgogICoKQEAgLTYwLDYgKzYwLDkgQEAgc3RydWN0IG1kcDVfY3J0YyB7CiAKIAlzdHJ1 Y3QgbWRwX2lycSB2Ymxhbms7CiAJc3RydWN0IG1kcF9pcnEgZXJyOworCXN0cnVjdCBtZHBfaXJx IHBwX2RvbmU7CisKKwlzdHJ1Y3QgY29tcGxldGlvbiBwcF9jb21wbGV0aW9uOwogCiAJdm9pZCAo KndhaXRfZm9yX2NvbW1pdF9kb25lKShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpOwogCkBAIC04OSw2 ICs5MiwxMiBAQCBzdGF0aWMgdm9pZCByZXF1ZXN0X3BlbmRpbmcoc3RydWN0IGRybV9jcnRjICpj cnRjLCB1aW50MzJfdCBwZW5kaW5nKQogCW1kcF9pcnFfcmVnaXN0ZXIoJmdldF9rbXMoY3J0Yykt PmJhc2UsICZtZHA1X2NydGMtPnZibGFuayk7CiB9CiAKK3N0YXRpYyB2b2lkIHJlcXVlc3RfcHBf ZG9uZV9wZW5kaW5nKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKK3sKKwlzdHJ1Y3QgbWRwNV9jcnRj ICptZHA1X2NydGMgPSB0b19tZHA1X2NydGMoY3J0Yyk7CisJcmVpbml0X2NvbXBsZXRpb24oJm1k cDVfY3J0Yy0+cHBfY29tcGxldGlvbik7Cit9CisKIHN0YXRpYyB1MzIgY3J0Y19mbHVzaChzdHJ1 Y3QgZHJtX2NydGMgKmNydGMsIHUzMiBmbHVzaF9tYXNrKQogewogCXN0cnVjdCBtZHA1X2NydGMg Km1kcDVfY3J0YyA9IHRvX21kcDVfY3J0YyhjcnRjKTsKQEAgLTI4NCw2ICsyOTMsOSBAQCBzdGF0 aWMgdm9pZCBtZHA1X2NydGNfZGlzYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJLyogc2V0 IFNUQUdFX1VOVVNFRCBmb3IgYWxsIGxheWVycyAqLwogCW1kcDVfY3RsX2JsZW5kKG1kcDVfY3J0 Yy0+Y3RsLCBtZHA1X2NydGMtPmxtLCAweDAwMDAwMDAwKTsKIAorCWlmIChtZHA1X2NydGMtPnBw X2RvbmUuaXJxKQorCQltZHBfaXJxX3VucmVnaXN0ZXIoJm1kcDVfa21zLT5iYXNlLCAmbWRwNV9j cnRjLT5wcF9kb25lKTsKKwogCW1kcF9pcnFfdW5yZWdpc3RlcigmbWRwNV9rbXMtPmJhc2UsICZt ZHA1X2NydGMtPmVycik7CiAJbWRwNV9kaXNhYmxlKG1kcDVfa21zKTsKIApAQCAtMzAzLDYgKzMx NSw5IEBAIHN0YXRpYyB2b2lkIG1kcDVfY3J0Y19lbmFibGUoc3RydWN0IGRybV9jcnRjICpjcnRj KQogCW1kcDVfZW5hYmxlKG1kcDVfa21zKTsKIAltZHBfaXJxX3JlZ2lzdGVyKCZtZHA1X2ttcy0+ YmFzZSwgJm1kcDVfY3J0Yy0+ZXJyKTsKIAorCWlmIChtZHA1X2NydGMtPnBwX2RvbmUuaXJxKQor CQltZHBfaXJxX3JlZ2lzdGVyKCZtZHA1X2ttcy0+YmFzZSwgJm1kcDVfY3J0Yy0+cHBfZG9uZSk7 CisKIAltZHA1X2NydGMtPmVuYWJsZWQgPSB0cnVlOwogfQogCkBAIC00MDQsNiArNDE5LDE1IEBA IHN0YXRpYyB2b2lkIG1kcDVfY3J0Y19hdG9taWNfZmx1c2goc3RydWN0IGRybV9jcnRjICpjcnRj KQogCiAJYmxlbmRfc2V0dXAoY3J0Yyk7CiAKKwkvKiBQUF9ET05FIGlycSBpcyBvbmx5IHVzZWQg YnkgY29tbWFuZCBtb2RlIGZvciBub3cuCisJICogSXQgaXMgYmV0dGVyIHRvIHJlcXVlc3QgcGVu ZGluZyBiZWZvcmUgRkxVU0ggYW5kIFNUQVJUIHRyaWdnZXIKKwkgKiB0byBtYWtlIHN1cmUgbm8g cHBfZG9uZSBpcnEgbWlzc2VkLgorCSAqIFRoaXMgaXMgc2FmZSBiZWNhdXNlIG5vIHBwX2RvbmUg d2lsbCBoYXBwZW4gYmVmb3JlIFNXIHRyaWdnZXIKKwkgKiBpbiBjb21tYW5kIG1vZGUuCisJICov CisJaWYgKG1kcDVfY3J0Yy0+cHBfZG9uZS5pcnEpCisJCXJlcXVlc3RfcHBfZG9uZV9wZW5kaW5n KGNydGMpOworCiAJbWRwNV9jcnRjLT5mbHVzaGVkX21hc2sgPSBjcnRjX2ZsdXNoX2FsbChjcnRj KTsKIAogCXJlcXVlc3RfcGVuZGluZyhjcnRjLCBQRU5ESU5HX0ZMSVApOwpAQCAtNjE0LDYgKzYz OCwyNiBAQCBzdGF0aWMgdm9pZCBtZHA1X2NydGNfZXJyX2lycShzdHJ1Y3QgbWRwX2lycSAqaXJx LCB1aW50MzJfdCBpcnFzdGF0dXMpCiAJREJHKCIlczogZXJyb3I6ICUwOHgiLCBtZHA1X2NydGMt Pm5hbWUsIGlycXN0YXR1cyk7CiB9CiAKK3N0YXRpYyB2b2lkIG1kcDVfY3J0Y19wcF9kb25lX2ly cShzdHJ1Y3QgbWRwX2lycSAqaXJxLCB1aW50MzJfdCBpcnFzdGF0dXMpCit7CisJc3RydWN0IG1k cDVfY3J0YyAqbWRwNV9jcnRjID0gY29udGFpbmVyX29mKGlycSwgc3RydWN0IG1kcDVfY3J0YywK KwkJCQkJCQkJcHBfZG9uZSk7CisKKwljb21wbGV0ZSgmbWRwNV9jcnRjLT5wcF9jb21wbGV0aW9u KTsKK30KKworc3RhdGljIHZvaWQgbWRwNV9jcnRjX3dhaXRfZm9yX3BwX2RvbmUoc3RydWN0IGRy bV9jcnRjICpjcnRjKQoreworCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CisJ c3RydWN0IG1kcDVfY3J0YyAqbWRwNV9jcnRjID0gdG9fbWRwNV9jcnRjKGNydGMpOworCWludCBy ZXQ7CisKKwlyZXQgPSB3YWl0X2Zvcl9jb21wbGV0aW9uX3RpbWVvdXQoJm1kcDVfY3J0Yy0+cHBf Y29tcGxldGlvbiwKKwkJCQkJCW1zZWNzX3RvX2ppZmZpZXMoNTApKTsKKwlpZiAocmV0ID09IDAp CisJCWRldl93YXJuKGRldi0+ZGV2LCAicHAgZG9uZSB0aW1lIG91dCwgbG09JWRcbiIsIG1kcDVf Y3J0Yy0+bG0pOworfQorCiBzdGF0aWMgdm9pZCBtZHA1X2NydGNfd2FpdF9mb3JfZmx1c2hfZG9u ZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNy dGMtPmRldjsKQEAgLTY2MSwxOCArNzA1LDE4IEBAIHZvaWQgbWRwNV9jcnRjX3NldF9pbnRmKHN0 cnVjdCBkcm1fY3J0YyAqY3J0Yywgc3RydWN0IG1kcDVfaW50ZXJmYWNlICppbnRmKQogCiAJLyog bm93IHRoYXQgd2Uga25vdyB3aGF0IGlycSdzIHdlIHdhbnQ6ICovCiAJbWRwNV9jcnRjLT5lcnIu aXJxbWFzayA9IGludGYyZXJyKGludGYtPm51bSk7Ci0KLQkvKiBSZWdpc3RlciBjb21tYW5kIG1v ZGUgUGluZ3BvbmcgZG9uZSBhcyB2YmxhbmsgZm9yIG5vdywKLQkgKiBzbyB0aGF0IGF0b21pYyBj b21taXQgc2hvdWxkIHdhaXQgZm9yIGl0IHRvIGZpbmlzaC4KLQkgKiBJZGVhbGx5LCBpbiB0aGUg ZnV0dXJlLCB3ZSBzaG91bGQgdGFrZSByZF9wdHIgZG9uZSBhcyB2YmxhbmssCi0JICogYW5kIGxl dCBhdG9taWMgY29tbWl0IHdhaXQgZm9yIHBpbmdwb25nIGRvbmUgZm9yIGNvbW1vbmQgbW9kZS4K LQkgKi8KLQlpZiAoaW50Zi0+bW9kZSA9PSBNRFA1X0lOVEZfRFNJX01PREVfQ09NTUFORCkKLQkJ bWRwNV9jcnRjLT52YmxhbmsuaXJxbWFzayA9IGxtMnBwZG9uZShsbSk7Ci0JZWxzZQotCQltZHA1 X2NydGMtPnZibGFuay5pcnFtYXNrID0gaW50ZjJ2YmxhbmsobG0sIGludGYpOwotCi0JbWRwNV9j cnRjLT53YWl0X2Zvcl9jb21taXRfZG9uZSA9IG1kcDVfY3J0Y193YWl0X2Zvcl9mbHVzaF9kb25l OworCW1kcDVfY3J0Yy0+dmJsYW5rLmlycW1hc2sgPSBpbnRmMnZibGFuayhsbSwgaW50Zik7CisK KwlpZiAoKGludGYtPnR5cGUgPT0gSU5URl9EU0kpICYmCisJCShpbnRmLT5tb2RlID09IE1EUDVf SU5URl9EU0lfTU9ERV9DT01NQU5EKSkgeworCQltZHA1X2NydGMtPnBwX2RvbmUuaXJxbWFzayA9 IGxtMnBwZG9uZShsbSk7CisJCW1kcDVfY3J0Yy0+cHBfZG9uZS5pcnEgPSBtZHA1X2NydGNfcHBf ZG9uZV9pcnE7CisJCW1kcDVfY3J0Yy0+d2FpdF9mb3JfY29tbWl0X2RvbmUgPSBtZHA1X2NydGNf d2FpdF9mb3JfcHBfZG9uZTsKKwl9IGVsc2UgeworCQltZHA1X2NydGMtPnBwX2RvbmUuaXJxbWFz ayA9IDA7CisJCW1kcDVfY3J0Yy0+cHBfZG9uZS5pcnEgPSBOVUxMOworCQltZHA1X2NydGMtPndh aXRfZm9yX2NvbW1pdF9kb25lID0gbWRwNV9jcnRjX3dhaXRfZm9yX2ZsdXNoX2RvbmU7CisJfQog CiAJbWRwX2lycV91cGRhdGUoJm1kcDVfa21zLT5iYXNlKTsKIApAQCAtNzIxLDYgKzc2NSw3IEBA IHN0cnVjdCBkcm1fY3J0YyAqbWRwNV9jcnRjX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwK IAogCXNwaW5fbG9ja19pbml0KCZtZHA1X2NydGMtPmxtX2xvY2spOwogCXNwaW5fbG9ja19pbml0 KCZtZHA1X2NydGMtPmN1cnNvci5sb2NrKTsKKwlpbml0X2NvbXBsZXRpb24oJm1kcDVfY3J0Yy0+ cHBfY29tcGxldGlvbik7CiAKIAltZHA1X2NydGMtPnZibGFuay5pcnEgPSBtZHA1X2NydGNfdmJs YW5rX2lycTsKIAltZHA1X2NydGMtPmVyci5pcnEgPSBtZHA1X2NydGNfZXJyX2lycTsKLS0gClRo ZSBRdWFsY29tbSBJbm5vdmF0aW9uIENlbnRlciwgSW5jLiBpcyBhIG1lbWJlciBvZiB0aGUgQ29k ZSBBdXJvcmEgRm9ydW0sCmhvc3RlZCBieSBUaGUgTGludXggRm91bmRhdGlvbgoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcg bGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK