From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH xf86-video-ati] Fix VT switching with ShadowFB Date: Tue, 3 Oct 2017 12:54:56 +0200 Message-ID: <20171003105456.5971-1-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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 RnJvbTogTWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVuemVyQGFtZC5jb20+CgpXZSB3ZXJlIHRy eWluZyB0byBjYWxsIGFjY2VsZXJhdGlvbiBzcGVjaWZpYyBmdW5jdGlvbnMgZnJvbSBMZWF2ZVZU LgpJbnN0ZWFkLCBtZW1zZXQgdGhlIHNjYW5vdXQgYnVmZmVyIHRvIGFsbCAwIGluIExlYXZlVlQg YW5kIGFsbG9jYXRlIGEKbmV3IG9uZSBpbiBFbnRlclZULgoKQnVnemlsbGE6IGh0dHBzOi8vYnVn cy5mcmVlZGVza3RvcC5vcmcvMTAyOTQ4CkZpeGVzOiAwNmE0NjU0ODQxMDEgKCJNYWtlIGFsbCBh Y3RpdmUgQ1JUQ3Mgc2NhbiBvdXQgYW4gYWxsLWJsYWNrCiAgICAgICAgICAgICAgICAgICAgICBm cmFtZWJ1ZmZlciBpbiBMZWF2ZVZUIikKU2lnbmVkLW9mZi1ieTogTWljaGVsIETDpG56ZXIgPG1p Y2hlbC5kYWVuemVyQGFtZC5jb20+Ci0tLQogc3JjL3JhZGVvbl9rbXMuYyB8IDE1NyArKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgOTQgaW5zZXJ0aW9ucygrKSwgNjMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv c3JjL3JhZGVvbl9rbXMuYyBiL3NyYy9yYWRlb25fa21zLmMKaW5kZXggMzUxYWY5OTUuLmI5ODJl NDI1IDEwMDY0NAotLS0gYS9zcmMvcmFkZW9uX2ttcy5jCisrKyBiL3NyYy9yYWRlb25fa21zLmMK QEAgLTI0MjMsNiArMjQyMywzMSBAQCBCb29sIFJBREVPTkVudGVyVlRfS01TKFNjcm5JbmZvUHRy IHBTY3JuKQogCiAgICAgcmFkZW9uX3NldF9kcm1fbWFzdGVyKHBTY3JuKTsKIAorICAgIGlmIChp bmZvLT5yNjAwX3NoYWRvd19mYikgeworCWludCBiYXNlX2FsaWduID0gZHJtbW9kZV9nZXRfYmFz ZV9hbGlnbihwU2NybiwgaW5mby0+cGl4ZWxfYnl0ZXMsIDApOworCXN0cnVjdCByYWRlb25fYm8g KmZyb250X2JvID0gcmFkZW9uX2JvX29wZW4oaW5mby0+YnVmbWdyLCAwLAorCQkJCQkJICAgIGlu Zm8tPmZyb250X2JvLT5zaXplLAorCQkJCQkJICAgIGJhc2VfYWxpZ24sCisJCQkJCQkgICAgUkFE RU9OX0dFTV9ET01BSU5fVlJBTSwgMCk7CisKKwlpZiAoZnJvbnRfYm8pIHsKKwkgICAgaWYgKHJh ZGVvbl9ib19tYXAoZnJvbnRfYm8sIDEpID09IDApIHsKKwkJbWVtc2V0KGZyb250X2JvLT5wdHIs IDAsIGZyb250X2JvLT5zaXplKTsKKwkJcmFkZW9uX2JvX3VucmVmKGluZm8tPmZyb250X2JvKTsK KwkJaW5mby0+ZnJvbnRfYm8gPSBmcm9udF9ibzsKKwkgICAgfSBlbHNlIHsKKwkJcmFkZW9uX2Jv X3VucmVmKGZyb250X2JvKTsKKwkJZnJvbnRfYm8gPSBOVUxMOworCSAgICB9CisJfQorCisJaWYg KCFmcm9udF9ibykgeworCSAgICB4Zjg2RHJ2TXNnKHBTY3JuLT5zY3JuSW5kZXgsIFhfV0FSTklO RywKKwkJICAgICAgICJGYWlsZWQgdG8gYWxsb2NhdGUgbmV3IHNjYW5vdXQgQk8gYWZ0ZXIgVlQg c3dpdGNoLCAiCisJCSAgICAgICAib3RoZXIgRFJNIG1hc3RlcnMgbWF5IHNlZSBzY3JlZW4gY29u dGVudHNcbiIpOworCX0KKyAgICB9CisKICAgICBpbmZvLT5hY2NlbF9zdGF0ZS0+WEluaXRlZDNE ID0gRkFMU0U7CiAgICAgaW5mby0+YWNjZWxfc3RhdGUtPmVuZ2luZU1vZGUgPSBFWEFfRU5HSU5F TU9ERV9VTktOT1dOOwogCkBAIC0yNDczLDg1ICsyNDk4LDkxIEBAIHBpeG1hcF91bnJlZl9mYih2 b2lkICp2YWx1ZSwgWElEIGlkLCB2b2lkICpjZGF0YSkKIHZvaWQgUkFERU9OTGVhdmVWVF9LTVMo U2NybkluZm9QdHIgcFNjcm4pCiB7CiAgICAgUkFERU9OSW5mb1B0ciAgaW5mbyAgPSBSQURFT05Q VFIocFNjcm4pOwotICAgIFJBREVPTkVudFB0ciBwUkFERU9ORW50ID0gUkFERU9ORW50UHJpdihw U2Nybik7CiAgICAgU2NyZWVuUHRyIHBTY3JlZW4gPSBwU2Nybi0+cFNjcmVlbjsKLSAgICB4Zjg2 Q3J0Y0NvbmZpZ1B0ciB4Zjg2X2NvbmZpZyA9IFhGODZfQ1JUQ19DT05GSUdfUFRSKHBTY3JuKTsK LSAgICBzdHJ1Y3QgZHJtbW9kZV9zY2Fub3V0IGJsYWNrX3NjYW5vdXQgPSB7IC5waXhtYXAgPSBO VUxMLCAuYm8gPSBOVUxMIH07Ci0gICAgeGY4NkNydGNQdHIgY3J0YzsKLSAgICBkcm1tb2RlX2Ny dGNfcHJpdmF0ZV9wdHIgZHJtbW9kZV9jcnRjOwotICAgIHVuc2lnbmVkIHcgPSAwLCBoID0gMDsK LSAgICBpbnQgaTsKIAogICAgIHhmODZEcnZNc2dWZXJiKHBTY3JuLT5zY3JuSW5kZXgsIFhfSU5G TywgUkFERU9OX0xPR0xFVkVMX0RFQlVHLAogCQkgICAiUkFERU9OTGVhdmVWVF9LTVNcbiIpOwog Ci0gICAgLyogQ29tcHV0ZSBtYXhpbXVtIHNjYW5vdXQgZGltZW5zaW9ucyBvZiBhY3RpdmUgQ1JU Q3MgKi8KLSAgICBmb3IgKGkgPSAwOyBpIDwgeGY4Nl9jb25maWctPm51bV9jcnRjOyBpKyspIHsK LQljcnRjID0geGY4Nl9jb25maWctPmNydGNbaV07Ci0JZHJtbW9kZV9jcnRjID0gY3J0Yy0+ZHJp dmVyX3ByaXZhdGU7CisgICAgaWYgKCFpbmZvLT5yNjAwX3NoYWRvd19mYikgeworCVJBREVPTkVu dFB0ciBwUkFERU9ORW50ID0gUkFERU9ORW50UHJpdihwU2Nybik7CisJeGY4NkNydGNDb25maWdQ dHIgeGY4Nl9jb25maWcgPSBYRjg2X0NSVENfQ09ORklHX1BUUihwU2Nybik7CisJc3RydWN0IGRy bW1vZGVfc2Nhbm91dCBibGFja19zY2Fub3V0ID0geyAucGl4bWFwID0gTlVMTCwgLmJvID0gTlVM TCB9OworCXhmODZDcnRjUHRyIGNydGM7CisJZHJtbW9kZV9jcnRjX3ByaXZhdGVfcHRyIGRybW1v ZGVfY3J0YzsKKwl1bnNpZ25lZCB3ID0gMCwgaCA9IDA7CisJaW50IGk7CiAKLQlpZiAoIWRybW1v ZGVfY3J0Yy0+ZmIpCi0JICAgIGNvbnRpbnVlOworCS8qIENvbXB1dGUgbWF4aW11bSBzY2Fub3V0 IGRpbWVuc2lvbnMgb2YgYWN0aXZlIENSVENzICovCisJZm9yIChpID0gMDsgaSA8IHhmODZfY29u ZmlnLT5udW1fY3J0YzsgaSsrKSB7CisJICAgIGNydGMgPSB4Zjg2X2NvbmZpZy0+Y3J0Y1tpXTsK KwkgICAgZHJtbW9kZV9jcnRjID0gY3J0Yy0+ZHJpdmVyX3ByaXZhdGU7CiAKLQl3ID0gbWF4KHcs IGNydGMtPm1vZGUuSERpc3BsYXkpOwotCWggPSBtYXgoaCwgY3J0Yy0+bW9kZS5WRGlzcGxheSk7 Ci0gICAgfQotCi0gICAgLyogTWFrZSBhbGwgYWN0aXZlIENSVENzIHNjYW4gb3V0IGZyb20gYW4g YWxsLWJsYWNrIGZyYW1lYnVmZmVyICovCi0gICAgaWYgKHcgPiAwICYmIGggPiAwKSB7Ci0JaWYg KGRybW1vZGVfY3J0Y19zY2Fub3V0X2NyZWF0ZShjcnRjLCAmYmxhY2tfc2Nhbm91dCwgdywgaCkp IHsKLQkgICAgc3RydWN0IGRybW1vZGVfZmIgKmJsYWNrX2ZiID0KLQkJcmFkZW9uX3BpeG1hcF9n ZXRfZmIoYmxhY2tfc2Nhbm91dC5waXhtYXApOwotCi0JICAgIHJhZGVvbl9waXhtYXBfY2xlYXIo YmxhY2tfc2Nhbm91dC5waXhtYXApOwotCSAgICByYWRlb25fY3NfZmx1c2hfaW5kaXJlY3QocFNj cm4pOwotCSAgICByYWRlb25fYm9fd2FpdChibGFja19zY2Fub3V0LmJvKTsKLQotCSAgICBmb3Ig KGkgPSAwOyBpIDwgeGY4Nl9jb25maWctPm51bV9jcnRjOyBpKyspIHsKLQkJY3J0YyA9IHhmODZf Y29uZmlnLT5jcnRjW2ldOwotCQlkcm1tb2RlX2NydGMgPSBjcnRjLT5kcml2ZXJfcHJpdmF0ZTsK LQotCQlpZiAoZHJtbW9kZV9jcnRjLT5mYikgewotCQkgICAgaWYgKGJsYWNrX2ZiKSB7Ci0JCQlk cm1tb2RlX3NldF9tb2RlKGNydGMsIGJsYWNrX2ZiLCAmY3J0Yy0+bW9kZSwgMCwgMCk7Ci0JCSAg ICB9IGVsc2UgewotCQkJZHJtTW9kZVNldENydGMocFJBREVPTkVudC0+ZmQsCi0JCQkJICAgICAg IGRybW1vZGVfY3J0Yy0+bW9kZV9jcnRjLT5jcnRjX2lkLCAwLCAwLAotCQkJCSAgICAgICAwLCBO VUxMLCAwLCBOVUxMKTsKLQkJCWRybW1vZGVfZmJfcmVmZXJlbmNlKHBSQURFT05FbnQtPmZkLCAm ZHJtbW9kZV9jcnRjLT5mYiwKLQkJCQkJICAgICBOVUxMKTsKLQkJICAgIH0KKwkgICAgaWYgKCFk cm1tb2RlX2NydGMtPmZiKQorCQljb250aW51ZTsKKworCSAgICB3ID0gbWF4KHcsIGNydGMtPm1v ZGUuSERpc3BsYXkpOworCSAgICBoID0gbWF4KGgsIGNydGMtPm1vZGUuVkRpc3BsYXkpOworCX0K KworCS8qIE1ha2UgYWxsIGFjdGl2ZSBDUlRDcyBzY2FuIG91dCBmcm9tIGFuIGFsbC1ibGFjayBm cmFtZWJ1ZmZlciAqLworCWlmICh3ID4gMCAmJiBoID4gMCkgeworCSAgICBpZiAoZHJtbW9kZV9j cnRjX3NjYW5vdXRfY3JlYXRlKGNydGMsICZibGFja19zY2Fub3V0LCB3LCBoKSkgeworCQlzdHJ1 Y3QgZHJtbW9kZV9mYiAqYmxhY2tfZmIgPQorCQkgICAgcmFkZW9uX3BpeG1hcF9nZXRfZmIoYmxh Y2tfc2Nhbm91dC5waXhtYXApOworCisJCXJhZGVvbl9waXhtYXBfY2xlYXIoYmxhY2tfc2Nhbm91 dC5waXhtYXApOworCQlyYWRlb25fY3NfZmx1c2hfaW5kaXJlY3QocFNjcm4pOworCQlyYWRlb25f Ym9fd2FpdChibGFja19zY2Fub3V0LmJvKTsKKworCQlmb3IgKGkgPSAwOyBpIDwgeGY4Nl9jb25m aWctPm51bV9jcnRjOyBpKyspIHsKKwkJICAgIGNydGMgPSB4Zjg2X2NvbmZpZy0+Y3J0Y1tpXTsK KwkJICAgIGRybW1vZGVfY3J0YyA9IGNydGMtPmRyaXZlcl9wcml2YXRlOworCisJCSAgICBpZiAo ZHJtbW9kZV9jcnRjLT5mYikgeworCQkJaWYgKGJsYWNrX2ZiKSB7CisJCQkgICAgZHJtbW9kZV9z ZXRfbW9kZShjcnRjLCBibGFja19mYiwgJmNydGMtPm1vZGUsIDAsIDApOworCQkJfSBlbHNlIHsK KwkJCSAgICBkcm1Nb2RlU2V0Q3J0YyhwUkFERU9ORW50LT5mZCwKKwkJCQkJICAgZHJtbW9kZV9j cnRjLT5tb2RlX2NydGMtPmNydGNfaWQsIDAsCisJCQkJCSAgIDAsIDAsIE5VTEwsIDAsIE5VTEwp OworCQkJICAgIGRybW1vZGVfZmJfcmVmZXJlbmNlKHBSQURFT05FbnQtPmZkLAorCQkJCQkJICZk cm1tb2RlX2NydGMtPmZiLCBOVUxMKTsKKwkJCX0KIAotCQkgICAgaWYgKHBTY3JuLT5pc19ncHUp IHsKLQkJCWlmIChkcm1tb2RlX2NydGMtPnNjYW5vdXRbMF0ucGl4bWFwKQotCQkJICAgIHBpeG1h cF91bnJlZl9mYihkcm1tb2RlX2NydGMtPnNjYW5vdXRbMF0ucGl4bWFwLAotCQkJCQkgICAgTm9u ZSwgcFJBREVPTkVudCk7Ci0JCQlpZiAoZHJtbW9kZV9jcnRjLT5zY2Fub3V0WzFdLnBpeG1hcCkK LQkJCSAgICBwaXhtYXBfdW5yZWZfZmIoZHJtbW9kZV9jcnRjLT5zY2Fub3V0WzFdLnBpeG1hcCwK LQkJCQkJICAgIE5vbmUsIHBSQURFT05FbnQpOwotCQkgICAgfSBlbHNlIHsKLQkJCWRybW1vZGVf Y3J0Y19zY2Fub3V0X2ZyZWUoZHJtbW9kZV9jcnRjKTsKKwkJCWlmIChwU2Nybi0+aXNfZ3B1KSB7 CisJCQkgICAgaWYgKGRybW1vZGVfY3J0Yy0+c2Nhbm91dFswXS5waXhtYXApCisJCQkJcGl4bWFw X3VucmVmX2ZiKGRybW1vZGVfY3J0Yy0+c2Nhbm91dFswXS5waXhtYXAsCisJCQkJCQlOb25lLCBw UkFERU9ORW50KTsKKwkJCSAgICBpZiAoZHJtbW9kZV9jcnRjLT5zY2Fub3V0WzFdLnBpeG1hcCkK KwkJCQlwaXhtYXBfdW5yZWZfZmIoZHJtbW9kZV9jcnRjLT5zY2Fub3V0WzFdLnBpeG1hcCwKKwkJ CQkJCU5vbmUsIHBSQURFT05FbnQpOworCQkJfSBlbHNlIHsKKwkJCSAgICBkcm1tb2RlX2NydGNf c2Nhbm91dF9mcmVlKGRybW1vZGVfY3J0Yyk7CisJCQl9CiAJCSAgICB9CiAJCX0KIAkgICAgfQog CX0KLSAgICB9CiAKLSAgICB4Zjg2Um90YXRlRnJlZVNoYWRvdyhwU2Nybik7Ci0gICAgZHJtbW9k ZV9jcnRjX3NjYW5vdXRfZGVzdHJveSgmaW5mby0+ZHJtbW9kZSwgJmJsYWNrX3NjYW5vdXQpOwor CXhmODZSb3RhdGVGcmVlU2hhZG93KHBTY3JuKTsKKwlkcm1tb2RlX2NydGNfc2Nhbm91dF9kZXN0 cm95KCZpbmZvLT5kcm1tb2RlLCAmYmxhY2tfc2Nhbm91dCk7CiAKLSAgICAvKiBVbnJlZmVyZW5j ZSBGQnMgb2YgYWxsIHBpeG1hcHMuIEFmdGVyIHRoaXMsIHRoZSBvbmx5IEZCIHJlbWFpbmluZwot ICAgICAqIHNob3VsZCBiZSB0aGUgYWxsLWJsYWNrIG9uZSBiZWluZyBzY2FubmVkIG91dCBieSBh Y3RpdmUgQ1JUQ3MKLSAgICAgKi8KLSAgICBmb3IgKGkgPSAwOyBpIDwgY3VycmVudE1heENsaWVu dHM7IGkrKykgewotCWlmIChpID4gMCAmJgotCSAgICAoIWNsaWVudHNbaV0gfHwgY2xpZW50c1tp XS0+Y2xpZW50U3RhdGUgIT0gQ2xpZW50U3RhdGVSdW5uaW5nKSkKLSAgICAgICAgICAgIGNvbnRp bnVlOworCS8qIFVucmVmZXJlbmNlIEZCcyBvZiBhbGwgcGl4bWFwcy4gQWZ0ZXIgdGhpcywgdGhl IG9ubHkgRkIgcmVtYWluaW5nCisJICogc2hvdWxkIGJlIHRoZSBhbGwtYmxhY2sgb25lIGJlaW5n IHNjYW5uZWQgb3V0IGJ5IGFjdGl2ZSBDUlRDcworCSAqLworCWZvciAoaSA9IDA7IGkgPCBjdXJy ZW50TWF4Q2xpZW50czsgaSsrKSB7CisJICAgIGlmIChpID4gMCAmJgorCQkoIWNsaWVudHNbaV0g fHwgY2xpZW50c1tpXS0+Y2xpZW50U3RhdGUgIT0gQ2xpZW50U3RhdGVSdW5uaW5nKSkKKwkJY29u dGludWU7CisKKwkgICAgRmluZENsaWVudFJlc291cmNlc0J5VHlwZShjbGllbnRzW2ldLCBSVF9Q SVhNQVAsIHBpeG1hcF91bnJlZl9mYiwKKwkJCQkgICAgICBwUkFERU9ORW50KTsKKwl9CiAKLQlG aW5kQ2xpZW50UmVzb3VyY2VzQnlUeXBlKGNsaWVudHNbaV0sIFJUX1BJWE1BUCwgcGl4bWFwX3Vu cmVmX2ZiLAotCQkJCSAgcFJBREVPTkVudCk7CisJcGl4bWFwX3VucmVmX2ZiKHBTY3JlZW4tPkdl dFNjcmVlblBpeG1hcChwU2NyZWVuKSwgTm9uZSwgcFJBREVPTkVudCk7CisgICAgfSBlbHNlIHsK KwltZW1zZXQoaW5mby0+ZnJvbnRfYm8tPnB0ciwgMCwgaW5mby0+ZnJvbnRfYm8tPnNpemUpOwog ICAgIH0KLSAgICBwaXhtYXBfdW5yZWZfZmIocFNjcmVlbi0+R2V0U2NyZWVuUGl4bWFwKHBTY3Jl ZW4pLCBOb25lLCBwUkFERU9ORW50KTsKIAogICAgIFRpbWVyU2V0KE5VTEwsIDAsIDEwMDAsIGNs ZWFudXBfYmxhY2tfZmIsIHBTY3JlZW4pOwogCi0tIAoyLjE0LjIKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vYW1kLWdmeAo=