From: Harry Wentland Subject: [PATCH 2/2] drm/amd/display: make dc_commit_surfaces_to_stream() re-entrant Date: Fri, 5 May 2017 09:19:41 -0400 Message-ID: <20170505131941.11567-3-harry.wentland@amd.com> References: <20170505131941.11567-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: <20170505131941.11567-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: Harry Wentland , Shirish S RnJvbTogU2hpcmlzaCBTIDxzaGlyaXNoLnNAYW1kLmNvbT4KCmRjX2NvbW1pdF9zdXJmYWNlc190 b19zdHJlYW0oKSBmdW5jdGlvbiBjdXJyZW50bHkKaXMgaGFuZGxlJ3Mgb25seSBvbmUgcGxhbmUg YXQgYSB0aW1lLgpUaGlzIHdpbGwgbm90IHdvcmsgaWYgbXVsdGlwbGUgcGxhbmVzIGhhdmUgdG8g YmUgc2V0IHRvIGEgY3J0Yy4KClRoZSBmdW5jdGlvbmFsaXR5IG9mIGRjX2NvbW1pdF9zdXJmYWNl c190b19zdHJlYW0oKSB3aXRoIHRoaXMgcGF0Y2gKaXMgc2xpdCBpbnRvCjEuIEFjY3VtdWxhdGUg YW5kIGluaXRpYWxpc2UgYWxsIHRoZSBzdXJmYWNlcyB0aGF0IG5lZWRzIHRvIGJlCiAgIHNldCB0 byBhIGNydGMuCjIuIFVwZGF0ZSB0aGUgaW50aWFsaXNlZCBzZXQgb2Ygc3VyZmFjZXMgdG8gdGhl IHN0ZWFtIGluIG9uZSBnby4KCkhlbmNlIGRjX2NvbW1pdF9zdXJmYWNlc190b19zdHJlYW0oKSBp cyByZW5hbWVkIHRvIGluaXRfc3VyZmFjZXMoKS4KT25jZSBhbGwgdGhlIHBsYW5lcyByZXF1ZXN0 ZWQgYnkgdXNlciBzcGFjZSBhcmUgaW5pdGlhbGlzZWQsCmRjX2NvbW1pdF9zdXJmYWNlc190b19z dHJlYW0oKSBzaGFsbCBzZXF1ZW50aWFsbHkgcG9wdWxhdGVzICp1cGRhdGVzLAogKmZsaXBfYWRk ciwgKnBsYW5lX2luZm8gYW5kICpzY2FsaW5nX2luZm8gZm9yIGFsbCBzdXJmYWNlcy4KCkJVRzog U1dERVYtMTE5NDIxClRFU1Q6IChPbiBDaHJvbWl1bSBPUyBmb3IgU3RvbmV5IE9ubHkpCiogQ2hy b21pdW0gVUkgY29tZXMgdXAsIG9uIGJvdGggZURQICYgRFAuCiogJ25ld19zdXJmYWNlX2NvdW50 JyBub3cgY2hhbmdlcyBhcyBwZXIgdXNlciBpbnB1dCBmb3IgZS5nIGZvcgogIGFsbCBiZWxvdyBy dW4gdGVzdHMgaXRzIDIsIHdpdGhvdXQgdGhpcyBwYXRjaCBmb3IgdGhlIGJlbG93CiAgdGVzdHMg aXQgdXNlZCB0byBiZSAxCiogRXhlY3V0ZWQgYmVsb3cgdGVzdHMgdG8gc2VlIFlVVih1bmRlcmxh eSkgJiBSR0IgcGxhbmVzIG9uIGVEUApwbGFuZV90ZXN0IC0tZm9ybWF0IFhSMjQgLS1zaXplIDUw MHgxMDAgLXAgLS1mb3JtYXQgWVYxMiAtLXNpemUgNTAweDUwMApwbGFuZV90ZXN0IC0tZm9ybWF0 IEFSMjQgLS1zaXplIDUwMHg1MCAtcCAtLWZvcm1hdCBZVjEyIC0tc2l6ZSAxNTB4MTUwCnBsYW5l X3Rlc3QgLS1mb3JtYXQgQVIyNCAtLXNpemUgNTAweDUwIC1wIC0tZm9ybWF0IFlWMTIgLS1zaXpl IDEzNjZ4NzY4CgpDaGFuZ2UtSWQ6IEk3YzhjYzgzMDJhOTcwZmJmN2I4ZGI1ZTZmNjZhZjFhYjcx MWI3ZjQ5ClNpZ25lZC1vZmYtYnk6IEhhcnJ5IFdlbnRsYW5kIDxIYXJyeS5XZW50bGFuZEBhbWQu Y29tPgpTaWduZWQtb2ZmLWJ5OiBTaGlyaXNoIFMgPHNoaXJpc2guc0BhbWQuY29tPgotLS0KIC4u Li9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbV90eXBlcy5jICAgIHwgNzEgKysr KysrKysrKysrKystLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQ0IGluc2VydGlvbnMoKyksIDI3 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9h bWRncHVfZG0vYW1kZ3B1X2RtX3R5cGVzLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkv YW1kZ3B1X2RtL2FtZGdwdV9kbV90eXBlcy5jCmluZGV4IDVhMjA2YmVlMTg5Yy4uYTgxOWU2YmE2 NTlmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2Ft ZGdwdV9kbV90eXBlcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVf ZG0vYW1kZ3B1X2RtX3R5cGVzLmMKQEAgLTcyOSwxOSArNzI5LDIwIEBAIHN0YXRpYyB2b2lkIHVw ZGF0ZV9zdHJlYW1fc2NhbGluZ19zZXR0aW5ncygKIAogfQogCi1zdGF0aWMgdm9pZCBkbV9kY19z dXJmYWNlX2NvbW1pdCgKLQkJc3RydWN0IGRjICpkYywKLQkJc3RydWN0IGRybV9jcnRjICpjcnRj KQorc3RhdGljIHZvaWQgYWRkX3N1cmZhY2Uoc3RydWN0IGRjICpkYywKKwkJCXN0cnVjdCBkcm1f Y3J0YyAqY3J0YywKKwkJCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAorCQkJY29uc3Qgc3RydWN0 IGRjX3N1cmZhY2UgKipkY19zdXJmYWNlcykKIHsKIAlzdHJ1Y3QgZGNfc3VyZmFjZSAqZGNfc3Vy ZmFjZTsKLQljb25zdCBzdHJ1Y3QgZGNfc3VyZmFjZSAqZGNfc3VyZmFjZXNbMV07CiAJc3RydWN0 IGFtZGdwdV9jcnRjICphY3J0YyA9IHRvX2FtZGdwdV9jcnRjKGNydGMpOwogCWNvbnN0IHN0cnVj dCBkY19zdHJlYW0gKmRjX3N0cmVhbSA9IGFjcnRjLT5zdHJlYW07CiAJdW5zaWduZWQgbG9uZyBm bGFnczsKIAogCXNwaW5fbG9ja19pcnFzYXZlKCZjcnRjLT5kZXYtPmV2ZW50X2xvY2ssIGZsYWdz KTsKIAlpZiAoYWNydGMtPnBmbGlwX3N0YXR1cyAhPSBBTURHUFVfRkxJUF9OT05FKSB7Ci0JCURS TV9FUlJPUigiZG1fZGNfc3VyZmFjZV9jb21taXQ6IGFjcnRjICVkLCBhbHJlYWR5IGJ1c3lcbiIs IGFjcnRjLT5jcnRjX2lkKTsKKwkJRFJNX0VSUk9SKCJhZGRfc3VyZmFjZTogYWNydGMgJWQsIGFs cmVhZHkgYnVzeVxuIiwKKwkJCSAgYWNydGMtPmNydGNfaWQpOwogCQlzcGluX3VubG9ja19pcnFy ZXN0b3JlKCZjcnRjLT5kZXYtPmV2ZW50X2xvY2ssIGZsYWdzKTsKIAkJLyogSW4gY29taXQgdGFp bCBmcmFtZXdvcmsgdGhpcyBjYW5ub3QgaGFwcGVuICovCiAJCUJVR19PTigwKTsKQEAgLTc2OSwy MiArNzcwLDExIEBAIHN0YXRpYyB2b2lkIGRtX2RjX3N1cmZhY2VfY29tbWl0KAogCWZpbGxfcGxh bmVfYXR0cmlidXRlcygKIAkJCWNydGMtPmRldi0+ZGV2X3ByaXZhdGUsCiAJCQlkY19zdXJmYWNl LAotCQkJY3J0Yy0+cHJpbWFyeS0+c3RhdGUsCisJCQlwbGFuZS0+c3RhdGUsCiAJCQl0cnVlKTsK IAotCWRjX3N1cmZhY2VzWzBdID0gZGNfc3VyZmFjZTsKLQotCWlmIChmYWxzZSA9PSBkY19jb21t aXRfc3VyZmFjZXNfdG9fc3RyZWFtKAotCQkJZGMsCi0JCQlkY19zdXJmYWNlcywKLQkJCTEsCi0J CQlkY19zdHJlYW0pKSB7Ci0JCWRtX2Vycm9yKAotCQkJIiVzOiBGYWlsZWQgdG8gYXR0YWNoIHN1 cmZhY2UhXG4iLAotCQkJX19mdW5jX18pOwotCX0KKwkqZGNfc3VyZmFjZXMgPSBkY19zdXJmYWNl OwogCi0JZGNfc3VyZmFjZV9yZWxlYXNlKGRjX3N1cmZhY2UpOwogZmFpbDoKIAlyZXR1cm47CiB9 CkBAIC0yNTY5LDExICsyNTU5LDE2IEBAIHN0YXRpYyB2b2lkIGFtZGdwdV9kbV9kb19mbGlwKAog fQogCiB2b2lkIGRjX2NvbW1pdF9zdXJmYWNlcyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3Rh dGUsCi0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGFtZGdwdV9kaXNwbGF5X21hbmFn ZXIgKmRtKQorCQkJc3RydWN0IGRybV9kZXZpY2UgKmRldiwKKwkJCXN0cnVjdCBhbWRncHVfZGlz cGxheV9tYW5hZ2VyICpkbSwKKwkJCXN0cnVjdCBkcm1fY3J0YyAqcGNydGMpCiB7CiAJdWludDMy X3QgaTsKIAlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZTsKIAlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRl ICpvbGRfcGxhbmVfc3RhdGU7CisJY29uc3Qgc3RydWN0IGRjX3N0cmVhbSAqZGNfc3RyZWFtX2F0 dGFjaDsKKwljb25zdCBzdHJ1Y3QgZGNfc3VyZmFjZSAqZGNfc3VyZmFjZXNfY29uc3RydWN0ZWRb TUFYX1NVUkZBQ0VTXTsKKwlpbnQgcGxhbmVzX2NvdW50ID0gMDsKIAogCS8qIHVwZGF0ZSBwbGFu ZXMgd2hlbiBuZWVkZWQgKi8KIAlmb3JfZWFjaF9wbGFuZV9pbl9zdGF0ZShzdGF0ZSwgcGxhbmUs IG9sZF9wbGFuZV9zdGF0ZSwgaSkgewpAQCAtMjU4Miw2ICsyNTc3LDcgQEAgdm9pZCBkY19jb21t aXRfc3VyZmFjZXMoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCQlzdHJ1Y3QgZHJt X2ZyYW1lYnVmZmVyICpmYiA9IHBsYW5lX3N0YXRlLT5mYjsKIAkJc3RydWN0IGRybV9jb25uZWN0 b3IgKmNvbm5lY3RvcjsKIAkJc3RydWN0IGRtX2Nvbm5lY3Rvcl9zdGF0ZSAqZG1fc3RhdGUgPSBO VUxMOworCQlzdHJ1Y3QgYW1kZ3B1X2NydGMgKmFjcnRjX2F0dGFjaDsKIAkJZW51bSBkbV9jb21t aXRfYWN0aW9uIGFjdGlvbjsKIAkJYm9vbCBwZmxpcF9uZWVkZWQ7CiAKQEAgLTI2MjMsOSArMjYx OSwyNiBAQCB2b2lkIGRjX2NvbW1pdF9zdXJmYWNlcyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAq c3RhdGUsCiAJCQkgKi8KIAkJCWlmICghZG1fc3RhdGUpCiAJCQkJY29udGludWU7CisJCQlpZiAo Y3J0YyA9PSBwY3J0YykgeworCQkJCWFkZF9zdXJmYWNlKGRtLT5kYywgY3J0YywgcGxhbmUsCisJ CQkJCSAgICAmZGNfc3VyZmFjZXNfY29uc3RydWN0ZWRbcGxhbmVzX2NvdW50XSk7CisJCQkJYWNy dGNfYXR0YWNoID0gdG9fYW1kZ3B1X2NydGMoY3J0Yyk7CisJCQkJZGNfc3RyZWFtX2F0dGFjaCA9 IGFjcnRjX2F0dGFjaC0+c3RyZWFtOworCQkJCXBsYW5lc19jb3VudCsrOworCQkJfQorCQl9CisJ fQogCi0JCQlkbV9kY19zdXJmYWNlX2NvbW1pdChkbS0+ZGMsIGNydGMpOworCWlmIChwbGFuZXNf Y291bnQpIHsKKwkJaWYgKGZhbHNlID09IGRjX2NvbW1pdF9zdXJmYWNlc190b19zdHJlYW0oZG0t PmRjLAorCQkJCQkJCSAgZGNfc3VyZmFjZXNfY29uc3RydWN0ZWQsCisJCQkJCQkJICBwbGFuZXNf Y291bnQsCisJCQkJCQkJICBkY19zdHJlYW1fYXR0YWNoKSkgeworCQkJZG1fZXJyb3IoIiVzOiBG YWlsZWQgdG8gYXR0YWNoIHN1cmZhY2UhXG4iLCBfX2Z1bmNfXyk7CisJCQlyZXR1cm47CiAJCX0K KwkJZm9yIChpID0gMDsgaSA8IHBsYW5lc19jb3VudDsgaSsrKQorCQkJZGNfc3VyZmFjZV9yZWxl YXNlKGRjX3N1cmZhY2VzX2NvbnN0cnVjdGVkW2ldKTsKIAl9CiB9CiAKQEAgLTI2MzcsMTAgKzI2 NTAsMTAgQEAgdm9pZCBhbWRncHVfZG1fYXRvbWljX2NvbW1pdF90YWlsKAogCXN0cnVjdCBhbWRn cHVfZGlzcGxheV9tYW5hZ2VyICpkbSA9ICZhZGV2LT5kbTsKIAlzdHJ1Y3QgZHJtX3BsYW5lICpw bGFuZTsKIAlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpvbGRfcGxhbmVfc3RhdGU7Ci0JdWludDMy X3QgaTsKKwl1aW50MzJfdCBpLCBqOwogCXVpbnQzMl90IGNvbW1pdF9zdHJlYW1zX2NvdW50ID0g MDsKIAl1aW50MzJfdCBuZXdfY3J0Y3NfY291bnQgPSAwOwotCXN0cnVjdCBkcm1fY3J0YyAqY3J0 YzsKKwlzdHJ1Y3QgZHJtX2NydGMgKmNydGMsICpwY3J0YzsKIAlzdHJ1Y3QgZHJtX2NydGNfc3Rh dGUgKm9sZF9jcnRjX3N0YXRlOwogCWNvbnN0IHN0cnVjdCBkY19zdHJlYW0gKmNvbW1pdF9zdHJl YW1zW01BWF9TVFJFQU1TXTsKIAlzdHJ1Y3QgYW1kZ3B1X2NydGMgKm5ld19jcnRjc1tNQVhfU1RS RUFNU107CkBAIC0yNzk5LDggKzI4MTIsOSBAQCB2b2lkIGFtZGdwdV9kbV9hdG9taWNfY29tbWl0 X3RhaWwoCiAJCQkJZGNfc3RyZWFtX2dldF9zdGF0dXMoYWNydGMtPnN0cmVhbSktPnByaW1hcnlf b3RnX2luc3Q7CiAJfQogCi0JLyogdXBkYXRlIHBsYW5lcyB3aGVuIG5lZWRlZCAqLwotCWRjX2Nv bW1pdF9zdXJmYWNlcyhzdGF0ZSwgZGV2LCBkbSk7CisJLyogdXBkYXRlIHBsYW5lcyB3aGVuIG5l ZWRlZCBwZXIgY3J0YyovCisJZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgcGNydGMsIG9s ZF9jcnRjX3N0YXRlLCBqKQorCQlkY19jb21taXRfc3VyZmFjZXMoc3RhdGUsIGRldiwgZG0sIHBj cnRjKTsKIAogCWZvciAoaSA9IDA7IGkgPCBuZXdfY3J0Y3NfY291bnQ7IGkrKykgewogCQkvKgpA QCAtMjk3NywxNSArMjk5MSwxOCBAQCBzdGF0aWMgdWludDMyX3QgYWRkX3ZhbF9zZXRzX3N1cmZh Y2UoCiAJY29uc3Qgc3RydWN0IGRjX3N0cmVhbSAqc3RyZWFtLAogCWNvbnN0IHN0cnVjdCBkY19z dXJmYWNlICpzdXJmYWNlKQogewotCXVpbnQzMl90IGkgPSAwOworCXVpbnQzMl90IGkgPSAwLCBq ID0gMDsKIAogCXdoaWxlIChpIDwgc2V0X2NvdW50KSB7Ci0JCWlmICh2YWxfc2V0c1tpXS5zdHJl YW0gPT0gc3RyZWFtKQorCQlpZiAodmFsX3NldHNbaV0uc3RyZWFtID09IHN0cmVhbSkgeworCQkJ d2hpbGUgKHZhbF9zZXRzW2ldLnN1cmZhY2VzW2pdKQorCQkJCWorKzsKIAkJCWJyZWFrOworCQl9 CiAJCSsraTsKIAl9CiAKLQl2YWxfc2V0c1tpXS5zdXJmYWNlc1t2YWxfc2V0c1tpXS5zdXJmYWNl X2NvdW50XSA9IHN1cmZhY2U7CisJdmFsX3NldHNbaV0uc3VyZmFjZXNbal0gPSBzdXJmYWNlOwog CXZhbF9zZXRzW2ldLnN1cmZhY2VfY291bnQrKzsKIAogCXJldHVybiB2YWxfc2V0c1tpXS5zdXJm YWNlX2NvdW50OwotLSAKMi4xMS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ft ZC1nZngK