From: Harry Wentland Subject: [PATCH 068/103] drm/amd/display: Fixed extend to second screen mode hang Date: Tue, 10 Oct 2017 18:40:37 -0400 Message-ID: <20171010224112.3023-69-harry.wentland@amd.com> References: <20171010224112.3023-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: <20171010224112.3023-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: Yongqiang Sun RnJvbTogWW9uZ3FpYW5nIFN1biA8eW9uZ3FpYW5nLnN1bkBhbWQuY29tPgoKCTEuIEZpeGVkIGFj cXVpcmUgZnJlZSBzcGxpdCBwaXBlIGJ1Zy4KCTIuIENoYW5nZSByZXR1cm4gdmFsdWUgZm9yIGRj X2FkZF9zdHJlYW1fdG9fY3R4CgkgICBmcm9tIGJvb2wgdG8gZW51bS4KCTQuIFJlbW92ZSByZWR1 bmRhbnQgYXBwbHlfY3R4X2Zvcl9zdXJmYWNlIGNhbGxpbmcKCTUuIFVubG9jayBwaXBlIGFmdGVy IGJhY2sgZW5kIHByb2dyYW1taW5nLgoKU2lnbmVkLW9mZi1ieTogWW9uZ3FpYW5nIFN1biA8eW9u Z3FpYW5nLnN1bkBhbWQuY29tPgpSZXZpZXdlZC1ieTogVG9ueSBDaGVuZyA8VG9ueS5DaGVuZ0Bh bWQuY29tPgpBY2tlZC1ieTogSGFycnkgV2VudGxhbmQgPEhhcnJ5LldlbnRsYW5kQGFtZC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2FtZGdwdV9kbS9hbWRncHVfZG0uYyB8 ICA0ICstCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kYy5jICAgICAgICAg IHwgNDggKysrKysrKysrKysrLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxh eS9kYy9jb3JlL2RjX3Jlc291cmNlLmMgfCAgOSArKy0tLQogZHJpdmVycy9ncHUvZHJtL2FtZC9k aXNwbGF5L2RjL2RjLmggICAgICAgICAgICAgICB8ICAyICstCiA0IGZpbGVzIGNoYW5nZWQsIDMy IGluc2VydGlvbnMoKyksIDMxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9hbWQvZGlzcGxheS9hbWRncHVfZG0vYW1kZ3B1X2RtLmMgYi9kcml2ZXJzL2dwdS9kcm0v YW1kL2Rpc3BsYXkvYW1kZ3B1X2RtL2FtZGdwdV9kbS5jCmluZGV4IDhmOWRjYzY5N2FhZC4uMWRj MTEwMDQyOTU2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvYW1kZ3B1 X2RtL2FtZGdwdV9kbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9hbWRncHVf ZG0vYW1kZ3B1X2RtLmMKQEAgLTQ2NjEsMTAgKzQ2NjEsMTAgQEAgc3RhdGljIGludCBkbV91cGRh dGVfY3J0Y3Nfc3RhdGUoCiAJCQkJRFJNX0RFQlVHX0RSSVZFUigiRW5hYmxpbmcgRFJNIGNydGM6 ICVkXG4iLAogCQkJCQkJCWNydGMtPmJhc2UuaWQpOwogCi0JCQkJaWYgKCFkY19hZGRfc3RyZWFt X3RvX2N0eCgKKwkJCQlpZiAoZGNfYWRkX3N0cmVhbV90b19jdHgoCiAJCQkJCQlkYywKIAkJCQkJ CWRtX3N0YXRlLT5jb250ZXh0LAotCQkJCQkJbmV3X2FjcnRjX3N0YXRlLT5zdHJlYW0pKSB7CisJ CQkJCQluZXdfYWNydGNfc3RhdGUtPnN0cmVhbSkgIT0gRENfT0spIHsKIAkJCQkJcmV0ID0gLUVJ TlZBTDsKIAkJCQkJZ290byBmYWlsOwogCQkJCX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjLmMgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkv ZGMvY29yZS9kYy5jCmluZGV4IGY5YmFjMTFkMzk1MC4uMzNhNjNjN2Q3YThlIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kYy5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvZGlzcGxheS9kYy9jb3JlL2RjLmMKQEAgLTc2NiwzNCArNzY2LDI3IEBAIHN0 YXRpYyBib29sIGRjX2NvbW1pdF9zdGF0ZV9ub19jaGVjayhzdHJ1Y3QgZGMgKmRjLCBzdHJ1Y3Qg ZGNfc3RhdGUgKmNvbnRleHQpCiAJZm9yIChpID0gMDsgaSA8IGNvbnRleHQtPnN0cmVhbV9jb3Vu dDsgaSsrKSB7CiAJCWNvbnN0IHN0cnVjdCBkY19zaW5rICpzaW5rID0gY29udGV4dC0+c3RyZWFt c1tpXS0+c2luazsKIAotCQlmb3IgKGogPSAwOyBqIDwgY29udGV4dC0+c3RyZWFtX3N0YXR1c1tp XS5wbGFuZV9jb3VudDsgaisrKSB7Ci0JCQlkYy0+aHdzcy5hcHBseV9jdHhfZm9yX3N1cmZhY2Uo Ci0JCQkJCWRjLCBjb250ZXh0LT5zdHJlYW1zW2ldLAotCQkJCQljb250ZXh0LT5zdHJlYW1fc3Rh dHVzW2ldLnBsYW5lX2NvdW50LAotCQkJCQljb250ZXh0KTsKKwkJZGMtPmh3c3MuYXBwbHlfY3R4 X2Zvcl9zdXJmYWNlKAorCQkJCWRjLCBjb250ZXh0LT5zdHJlYW1zW2ldLAorCQkJCWNvbnRleHQt PnN0cmVhbV9zdGF0dXNbaV0ucGxhbmVfY291bnQsCisJCQkJY29udGV4dCk7CiAKLQkJCS8qCi0J CQkgKiBlbmFibGUgc3RlcmVvCi0JCQkgKiBUT0RPIHJld29yayBkY19lbmFibGVfc3RlcmVvIGNh bGwgdG8gd29yayB3aXRoIHZhbGlkYXRpb24gc2V0cz8KLQkJCSAqLwotCQkJZm9yIChrID0gMDsg ayA8IE1BWF9QSVBFUzsgaysrKSB7Ci0JCQkJcGlwZSA9ICZjb250ZXh0LT5yZXNfY3R4LnBpcGVf Y3R4W2tdOwotCi0JCQkJZm9yIChsID0gMCA7IHBpcGUgJiYgbCA8IGNvbnRleHQtPnN0cmVhbV9j b3VudDsgbCsrKSAgewotCQkJCQlpZiAoY29udGV4dC0+c3RyZWFtc1tsXSAmJgotCQkJCQkgICAg Y29udGV4dC0+c3RyZWFtc1tsXSA9PSBwaXBlLT5zdHJlYW0gJiYKLQkJCQkJICAgIGRjLT5od3Nz LnNldHVwX3N0ZXJlbykKLQkJCQkJCWRjLT5od3NzLnNldHVwX3N0ZXJlbyhwaXBlLCBkYyk7Ci0J CQkJfQorCQkvKgorCQkgKiBlbmFibGUgc3RlcmVvCisJCSAqIFRPRE8gcmV3b3JrIGRjX2VuYWJs ZV9zdGVyZW8gY2FsbCB0byB3b3JrIHdpdGggdmFsaWRhdGlvbiBzZXRzPworCQkgKi8KKwkJZm9y IChrID0gMDsgayA8IE1BWF9QSVBFUzsgaysrKSB7CisJCQlwaXBlID0gJmNvbnRleHQtPnJlc19j dHgucGlwZV9jdHhba107CisKKwkJCWZvciAobCA9IDAgOyBwaXBlICYmIGwgPCBjb250ZXh0LT5z dHJlYW1fY291bnQ7IGwrKykgIHsKKwkJCQlpZiAoY29udGV4dC0+c3RyZWFtc1tsXSAmJgorCQkJ CQljb250ZXh0LT5zdHJlYW1zW2xdID09IHBpcGUtPnN0cmVhbSAmJgorCQkJCQlkYy0+aHdzcy5z ZXR1cF9zdGVyZW8pCisJCQkJCWRjLT5od3NzLnNldHVwX3N0ZXJlbyhwaXBlLCBkYyk7CiAJCQl9 CiAJCX0KIAotCQlmb3IgKGogPSAwOyBqIDwgTUFYX1BJUEVTOyBqKyspIHsKLQkJCXBpcGUgPSAm Y29udGV4dC0+cmVzX2N0eC5waXBlX2N0eFtqXTsKIAotCQkJaWYgKCFwaXBlLT50b3BfcGlwZSAm JiBwaXBlLT5zdHJlYW0gPT0gY29udGV4dC0+c3RyZWFtc1tpXSkKLQkJCQlkYy0+aHdzcy5waXBl X2NvbnRyb2xfbG9jayhkYywgcGlwZSwgZmFsc2UpOwotCQl9CiAKIAkJQ09OTl9NU0dfTU9ERShz aW5rLT5saW5rLCAieyVkeCVkLCAlZHglZEAlZEtoen0iLAogCQkJCWNvbnRleHQtPnN0cmVhbXNb aV0tPnRpbWluZy5oX2FkZHJlc3NhYmxlLApAQCAtODE1LDYgKzgwOCwxNSBAQCBzdGF0aWMgYm9v bCBkY19jb21taXRfc3RhdGVfbm9fY2hlY2soc3RydWN0IGRjICpkYywgc3RydWN0IGRjX3N0YXRl ICpjb250ZXh0KQogCiAJZGNfZW5hYmxlX3N0ZXJlbyhkYywgY29udGV4dCwgZGNfc3RyZWFtcywg Y29udGV4dC0+c3RyZWFtX2NvdW50KTsKIAorCWZvciAoaSA9IDA7IGkgPCBjb250ZXh0LT5zdHJl YW1fY291bnQ7IGkrKykgeworCQlmb3IgKGogPSAwOyBqIDwgTUFYX1BJUEVTOyBqKyspIHsKKwkJ CXBpcGUgPSAmY29udGV4dC0+cmVzX2N0eC5waXBlX2N0eFtqXTsKKworCQkJaWYgKCFwaXBlLT50 b3BfcGlwZSAmJiBwaXBlLT5zdHJlYW0gPT0gY29udGV4dC0+c3RyZWFtc1tpXSkKKwkJCQlkYy0+ aHdzcy5waXBlX2NvbnRyb2xfbG9jayhkYywgcGlwZSwgZmFsc2UpOworCQl9CisJfQorCiAJZGNf cmVsZWFzZV9zdGF0ZShkYy0+Y3VycmVudF9zdGF0ZSk7CiAKIAlkYy0+Y3VycmVudF9zdGF0ZSA9 IGNvbnRleHQ7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29y ZS9kY19yZXNvdXJjZS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNf cmVzb3VyY2UuYwppbmRleCBjMzFkY2NkYzNkMmUuLmM2MGY1MzA2OTcwOCAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2NvcmUvZGNfcmVzb3VyY2UuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vYW1kL2Rpc3BsYXkvZGMvY29yZS9kY19yZXNvdXJjZS5jCkBAIC0xNDQ2 LDcgKzE0NDYsNyBAQCBib29sIHJlc291cmNlX2lzX3N0cmVhbV91bmNoYW5nZWQoCiAJcmV0dXJu IGZhbHNlOwogfQogCi1ib29sIGRjX2FkZF9zdHJlYW1fdG9fY3R4KAorZW51bSBkY19zdGF0dXMg ZGNfYWRkX3N0cmVhbV90b19jdHgoCiAJCXN0cnVjdCBkYyAqZGMsCiAJCXN0cnVjdCBkY19zdGF0 ZSAqbmV3X2N0eCwKIAkJc3RydWN0IGRjX3N0cmVhbV9zdGF0ZSAqc3RyZWFtKQpAQCAtMTQ2Nyw3 ICsxNDY3LDcgQEAgYm9vbCBkY19hZGRfc3RyZWFtX3RvX2N0eCgKIAlpZiAocmVzICE9IERDX09L KQogCQlEQ19FUlJPUigiQWRkaW5nIHN0cmVhbSAlcCB0byBjb250ZXh0IGZhaWxlZCB3aXRoIGVy ciAlZCFcbiIsIHN0cmVhbSwgcmVzKTsKIAotCXJldHVybiByZXMgPT0gRENfT0s7CisJcmV0dXJu IHJlczsKIH0KIAogYm9vbCBkY19yZW1vdmVfc3RyZWFtX2Zyb21fY3R4KApAQCAtMTY0MCwxMCAr MTY0MCw5IEBAIGVudW0gZGNfc3RhdHVzIHJlc291cmNlX21hcF9wb29sX3Jlc291cmNlcygKIAkv KiBhY3F1aXJlIG5ldyByZXNvdXJjZXMgKi8KIAlwaXBlX2lkeCA9IGFjcXVpcmVfZmlyc3RfZnJl ZV9waXBlKCZjb250ZXh0LT5yZXNfY3R4LCBwb29sLCBzdHJlYW0pOwogCi0jaWYgZGVmaW5lZChD T05GSUdfRFJNX0FNRF9EQ19EQ04xXzApCiAJaWYgKHBpcGVfaWR4IDwgMCkKLQkJYWNxdWlyZV9m aXJzdF9zcGxpdF9waXBlKCZjb250ZXh0LT5yZXNfY3R4LCBwb29sLCBzdHJlYW0pOwotI2VuZGlm CisJCXBpcGVfaWR4ID0gYWNxdWlyZV9maXJzdF9zcGxpdF9waXBlKCZjb250ZXh0LT5yZXNfY3R4 LCBwb29sLCBzdHJlYW0pOworCiAJaWYgKHBpcGVfaWR4IDwgMCkKIAkJcmV0dXJuIERDX05PX0NP TlRST0xMRVJfUkVTT1VSQ0U7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlz cGxheS9kYy9kYy5oIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9kaXNwbGF5L2RjL2RjLmgKaW5kZXgg MTcyMDUwYWQ4NDVkLi5lZWI4ZWU1YWNkYzEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvZGlzcGxheS9kYy9kYy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvZGlzcGxheS9kYy9k Yy5oCkBAIC02MzEsNyArNjMxLDcgQEAgYm9vbCBkY19zdHJlYW1fZ2V0X3NjYW5vdXRwb3MoY29u c3Qgc3RydWN0IGRjX3N0cmVhbV9zdGF0ZSAqc3RyZWFtLAogCQkJCSAgdWludDMyX3QgKmhfcG9z aXRpb24sCiAJCQkJICB1aW50MzJfdCAqdl9wb3NpdGlvbik7CiAKLWJvb2wgZGNfYWRkX3N0cmVh bV90b19jdHgoCitlbnVtIGRjX3N0YXR1cyBkY19hZGRfc3RyZWFtX3RvX2N0eCgKIAkJCXN0cnVj dCBkYyAqZGMsCiAJCXN0cnVjdCBkY19zdGF0ZSAqbmV3X2N0eCwKIAkJc3RydWN0IGRjX3N0cmVh bV9zdGF0ZSAqc3RyZWFtKTsKLS0gCjIuMTQuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KYW1kLWdmeCBtYWlsaW5nIGxpc3QKYW1kLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9hbWQtZ2Z4Cg==