From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH xf86-video-amdgpu 1/2] Fix VT switching with ShadowFB Date: Thu, 19 Oct 2017 18:03:28 +0200 Message-ID: <20171019160329.6165-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 cy5mcmVlZGVza3RvcC5vcmcvMTAyOTQ4CkZpeGVzOiBjMTZmZjQyZjkyN2QgKCJNYWtlIGFsbCBh Y3RpdmUgQ1JUQ3Mgc2NhbiBvdXQgYW4gYWxsLWJsYWNrCiAgICAgICAgICAgICAgICAgICAgICBm cmFtZWJ1ZmZlciBpbiBMZWF2ZVZUIikKKFBvcnRlZCBmcm9tIHJhZGVvbiBjb21taXQgMzRkYTA0 ZGFlYzgyMDc3NTcxNTU4YWMzZmUxZWMwYzEyMDNhMDFhZCkKClNpZ25lZC1vZmYtYnk6IE1pY2hl bCBEw6RuemVyIDxtaWNoZWwuZGFlbnplckBhbWQuY29tPgotLS0KIHNyYy9hbWRncHVfa21zLmMg fCAxNTQgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0t LS0tLQogMSBmaWxlIGNoYW5nZWQsIDk0IGluc2VydGlvbnMoKyksIDYwIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL3NyYy9hbWRncHVfa21zLmMgYi9zcmMvYW1kZ3B1X2ttcy5jCmluZGV4IDZm ZTQzMjY0Yy4uZTNkN2Q3MWNmIDEwMDY0NAotLS0gYS9zcmMvYW1kZ3B1X2ttcy5jCisrKyBiL3Ny Yy9hbWRncHVfa21zLmMKQEAgLTE5NDEsNiArMTk0MSwzMyBAQCBCb29sIEFNREdQVUVudGVyVlRf S01TKFNjcm5JbmZvUHRyIHBTY3JuKQogCiAJYW1kZ3B1X3NldF9kcm1fbWFzdGVyKHBTY3JuKTsK IAorCWlmIChpbmZvLT5zaGFkb3dfZmIpIHsKKwkJaW50IHBpdGNoOworCQlzdHJ1Y3QgYW1kZ3B1 X2J1ZmZlciAqZnJvbnRfYnVmZmVyID0KKwkJCWFtZGdwdV9hbGxvY19waXhtYXBfYm8ocFNjcm4s IHBTY3JuLT52aXJ0dWFsWCwKKwkJCQkJICAgICAgIHBTY3JuLT52aXJ0dWFsWSwgcFNjcm4tPmRl cHRoLAorCQkJCQkgICAgICAgQU1ER1BVX0NSRUFURV9QSVhNQVBfTElORUFSLAorCQkJCQkgICAg ICAgcFNjcm4tPmJpdHNQZXJQaXhlbCwKKwkJCQkJICAgICAgICZwaXRjaCk7CisKKwkJaWYgKGZy b250X2J1ZmZlcikgeworCQkJaWYgKGFtZGdwdV9ib19tYXAocFNjcm4sIGZyb250X2J1ZmZlcikg PT0gMCkgeworCQkJCW1lbXNldChmcm9udF9idWZmZXItPmNwdV9wdHIsIDAsIHBpdGNoICogcFNj cm4tPnZpcnR1YWxZKTsKKwkJCQlhbWRncHVfYm9fdW5yZWYoJmluZm8tPmZyb250X2J1ZmZlcik7 CisJCQkJaW5mby0+ZnJvbnRfYnVmZmVyID0gZnJvbnRfYnVmZmVyOworCQkJfSBlbHNlIHsKKwkJ CQlhbWRncHVfYm9fdW5yZWYoJmZyb250X2J1ZmZlcik7CisJCQkJZnJvbnRfYnVmZmVyID0gTlVM TDsKKwkJCX0KKwkJfQorCisJCWlmICghZnJvbnRfYnVmZmVyKSB7CisJCQl4Zjg2RHJ2TXNnKHBT Y3JuLT5zY3JuSW5kZXgsIFhfV0FSTklORywKKwkJCQkgICAiRmFpbGVkIHRvIGFsbG9jYXRlIG5l dyBzY2Fub3V0IEJPIGFmdGVyIFZUIHN3aXRjaCwgIgorCQkJCSAgICJvdGhlciBEUk0gbWFzdGVy cyBtYXkgc2VlIHNjcmVlbiBjb250ZW50c1xuIik7CisJCX0KKwl9CisKIAlwU2Nybi0+dnRTZW1h ID0gVFJVRTsKIAogCWlmICghZHJtbW9kZV9zZXRfZGVzaXJlZF9tb2RlcyhwU2NybiwgJmluZm8t PmRybW1vZGUsIFRSVUUpKQpAQCAtMTk2Myw4NCArMTk5MCw5MSBAQCBwaXhtYXBfdW5yZWZfZmIo dm9pZCAqdmFsdWUsIFhJRCBpZCwgdm9pZCAqY2RhdGEpCiB2b2lkIEFNREdQVUxlYXZlVlRfS01T KFNjcm5JbmZvUHRyIHBTY3JuKQogewogCUFNREdQVUluZm9QdHIgaW5mbyA9IEFNREdQVVBUUihw U2Nybik7Ci0JQU1ER1BVRW50UHRyIHBBTURHUFVFbnQgPSBBTURHUFVFbnRQcml2KHBTY3JuKTsK IAlTY3JlZW5QdHIgcFNjcmVlbiA9IHBTY3JuLT5wU2NyZWVuOwotCXhmODZDcnRjQ29uZmlnUHRy IHhmODZfY29uZmlnID0gWEY4Nl9DUlRDX0NPTkZJR19QVFIocFNjcm4pOwotCXN0cnVjdCBkcm1t b2RlX3NjYW5vdXQgYmxhY2tfc2Nhbm91dCA9IHsgLnBpeG1hcCA9IE5VTEwsIC5ibyA9IE5VTEwg fTsKLQl4Zjg2Q3J0Y1B0ciBjcnRjOwotCWRybW1vZGVfY3J0Y19wcml2YXRlX3B0ciBkcm1tb2Rl X2NydGM7Ci0JdW5zaWduZWQgdyA9IDAsIGggPSAwOwotCWludCBpOwogCiAJeGY4NkRydk1zZ1Zl cmIocFNjcm4tPnNjcm5JbmRleCwgWF9JTkZPLCBBTURHUFVfTE9HTEVWRUxfREVCVUcsCiAJCSAg ICAgICAiQU1ER1BVTGVhdmVWVF9LTVNcbiIpOwogCi0JLyogQ29tcHV0ZSBtYXhpbXVtIHNjYW5v dXQgZGltZW5zaW9ucyBvZiBhY3RpdmUgQ1JUQ3MgKi8KLQlmb3IgKGkgPSAwOyBpIDwgeGY4Nl9j b25maWctPm51bV9jcnRjOyBpKyspIHsKLQkJY3J0YyA9IHhmODZfY29uZmlnLT5jcnRjW2ldOwot CQlkcm1tb2RlX2NydGMgPSBjcnRjLT5kcml2ZXJfcHJpdmF0ZTsKLQotCQlpZiAoIWRybW1vZGVf Y3J0Yy0+ZmIpCi0JCQljb250aW51ZTsKLQotCQl3ID0gbWF4KHcsIGNydGMtPm1vZGUuSERpc3Bs YXkpOwotCQloID0gbWF4KGgsIGNydGMtPm1vZGUuVkRpc3BsYXkpOwotCX0KKwlpZiAoIWluZm8t PnNoYWRvd19mYikgeworCQlBTURHUFVFbnRQdHIgcEFNREdQVUVudCA9IEFNREdQVUVudFByaXYo cFNjcm4pOworCQl4Zjg2Q3J0Y0NvbmZpZ1B0ciB4Zjg2X2NvbmZpZyA9IFhGODZfQ1JUQ19DT05G SUdfUFRSKHBTY3JuKTsKKwkJc3RydWN0IGRybW1vZGVfc2Nhbm91dCBibGFja19zY2Fub3V0ID0g eyAucGl4bWFwID0gTlVMTCwgLmJvID0gTlVMTCB9OworCQl4Zjg2Q3J0Y1B0ciBjcnRjOworCQlk cm1tb2RlX2NydGNfcHJpdmF0ZV9wdHIgZHJtbW9kZV9jcnRjOworCQl1bnNpZ25lZCB3ID0gMCwg aCA9IDA7CisJCWludCBpOworCisJCS8qIENvbXB1dGUgbWF4aW11bSBzY2Fub3V0IGRpbWVuc2lv bnMgb2YgYWN0aXZlIENSVENzICovCisJCWZvciAoaSA9IDA7IGkgPCB4Zjg2X2NvbmZpZy0+bnVt X2NydGM7IGkrKykgeworCQkJY3J0YyA9IHhmODZfY29uZmlnLT5jcnRjW2ldOworCQkJZHJtbW9k ZV9jcnRjID0gY3J0Yy0+ZHJpdmVyX3ByaXZhdGU7CisKKwkJCWlmICghZHJtbW9kZV9jcnRjLT5m YikKKwkJCQljb250aW51ZTsKIAotCS8qIE1ha2UgYWxsIGFjdGl2ZSBDUlRDcyBzY2FuIG91dCBm cm9tIGFuIGFsbC1ibGFjayBmcmFtZWJ1ZmZlciAqLwotCWlmICh3ID4gMCAmJiBoID4gMCkgewot CQlpZiAoZHJtbW9kZV9jcnRjX3NjYW5vdXRfY3JlYXRlKGNydGMsICZibGFja19zY2Fub3V0LCB3 LCBoKSkgewotCQkJc3RydWN0IGRybW1vZGVfZmIgKmJsYWNrX2ZiID0KLQkJCQlhbWRncHVfcGl4 bWFwX2dldF9mYihibGFja19zY2Fub3V0LnBpeG1hcCk7CisJCQl3ID0gbWF4KHcsIGNydGMtPm1v ZGUuSERpc3BsYXkpOworCQkJaCA9IG1heChoLCBjcnRjLT5tb2RlLlZEaXNwbGF5KTsKKwkJfQog Ci0JCQlhbWRncHVfcGl4bWFwX2NsZWFyKGJsYWNrX3NjYW5vdXQucGl4bWFwKTsKLQkJCWFtZGdw dV9nbGFtb3JfZmluaXNoKHBTY3JuKTsKKwkJLyogTWFrZSBhbGwgYWN0aXZlIENSVENzIHNjYW4g b3V0IGZyb20gYW4gYWxsLWJsYWNrIGZyYW1lYnVmZmVyICovCisJCWlmICh3ID4gMCAmJiBoID4g MCkgeworCQkJaWYgKGRybW1vZGVfY3J0Y19zY2Fub3V0X2NyZWF0ZShjcnRjLCAmYmxhY2tfc2Nh bm91dCwgdywgaCkpIHsKKwkJCQlzdHJ1Y3QgZHJtbW9kZV9mYiAqYmxhY2tfZmIgPQorCQkJCQlh bWRncHVfcGl4bWFwX2dldF9mYihibGFja19zY2Fub3V0LnBpeG1hcCk7CiAKLQkJCWZvciAoaSA9 IDA7IGkgPCB4Zjg2X2NvbmZpZy0+bnVtX2NydGM7IGkrKykgewotCQkJCWNydGMgPSB4Zjg2X2Nv bmZpZy0+Y3J0Y1tpXTsKLQkJCQlkcm1tb2RlX2NydGMgPSBjcnRjLT5kcml2ZXJfcHJpdmF0ZTsK KwkJCQlhbWRncHVfcGl4bWFwX2NsZWFyKGJsYWNrX3NjYW5vdXQucGl4bWFwKTsKKwkJCQlhbWRn cHVfZ2xhbW9yX2ZpbmlzaChwU2Nybik7CiAKLQkJCQlpZiAoZHJtbW9kZV9jcnRjLT5mYikgewot CQkJCQlpZiAoYmxhY2tfZmIpIHsKLQkJCQkJCWRybW1vZGVfc2V0X21vZGUoY3J0YywgYmxhY2tf ZmIsICZjcnRjLT5tb2RlLCAwLCAwKTsKLQkJCQkJfSBlbHNlIHsKLQkJCQkJCWRybU1vZGVTZXRD cnRjKHBBTURHUFVFbnQtPmZkLAotCQkJCQkJCSAgICAgICBkcm1tb2RlX2NydGMtPm1vZGVfY3J0 Yy0+Y3J0Y19pZCwgMCwgMCwKLQkJCQkJCQkgICAgICAgMCwgTlVMTCwgMCwgTlVMTCk7Ci0JCQkJ CQlkcm1tb2RlX2ZiX3JlZmVyZW5jZShwQU1ER1BVRW50LT5mZCwgJmRybW1vZGVfY3J0Yy0+ZmIs Ci0JCQkJCQkJCSAgICAgTlVMTCk7Ci0JCQkJCX0KKwkJCQlmb3IgKGkgPSAwOyBpIDwgeGY4Nl9j b25maWctPm51bV9jcnRjOyBpKyspIHsKKwkJCQkJY3J0YyA9IHhmODZfY29uZmlnLT5jcnRjW2ld OworCQkJCQlkcm1tb2RlX2NydGMgPSBjcnRjLT5kcml2ZXJfcHJpdmF0ZTsKIAotCQkJCQlpZiAo cFNjcm4tPmlzX2dwdSkgewotCQkJCQkJaWYgKGRybW1vZGVfY3J0Yy0+c2Nhbm91dFswXS5waXht YXApCi0JCQkJCQkJcGl4bWFwX3VucmVmX2ZiKGRybW1vZGVfY3J0Yy0+c2Nhbm91dFswXS5waXht YXAsCi0JCQkJCQkJCQlOb25lLCBwQU1ER1BVRW50KTsKLQkJCQkJCWlmIChkcm1tb2RlX2NydGMt PnNjYW5vdXRbMV0ucGl4bWFwKQotCQkJCQkJCXBpeG1hcF91bnJlZl9mYihkcm1tb2RlX2NydGMt PnNjYW5vdXRbMV0ucGl4bWFwLAotCQkJCQkJCQkJTm9uZSwgcEFNREdQVUVudCk7Ci0JCQkJCX0g ZWxzZSB7Ci0JCQkJCQlkcm1tb2RlX2NydGNfc2Nhbm91dF9mcmVlKGRybW1vZGVfY3J0Yyk7CisJ CQkJCWlmIChkcm1tb2RlX2NydGMtPmZiKSB7CisJCQkJCQlpZiAoYmxhY2tfZmIpIHsKKwkJCQkJ CQlkcm1tb2RlX3NldF9tb2RlKGNydGMsIGJsYWNrX2ZiLCAmY3J0Yy0+bW9kZSwgMCwgMCk7CisJ CQkJCQl9IGVsc2UgeworCQkJCQkJCWRybU1vZGVTZXRDcnRjKHBBTURHUFVFbnQtPmZkLAorCQkJ CQkJCQkgICAgICAgZHJtbW9kZV9jcnRjLT5tb2RlX2NydGMtPmNydGNfaWQsIDAsCisJCQkJCQkJ CSAgICAgICAwLCAwLCBOVUxMLCAwLCBOVUxMKTsKKwkJCQkJCQlkcm1tb2RlX2ZiX3JlZmVyZW5j ZShwQU1ER1BVRW50LT5mZCwKKwkJCQkJCQkJCSAgICAgJmRybW1vZGVfY3J0Yy0+ZmIsIE5VTEwp OworCQkJCQkJfQorCisJCQkJCQlpZiAocFNjcm4tPmlzX2dwdSkgeworCQkJCQkJCWlmIChkcm1t b2RlX2NydGMtPnNjYW5vdXRbMF0ucGl4bWFwKQorCQkJCQkJCQlwaXhtYXBfdW5yZWZfZmIoZHJt bW9kZV9jcnRjLT5zY2Fub3V0WzBdLnBpeG1hcCwKKwkJCQkJCQkJCQlOb25lLCBwQU1ER1BVRW50 KTsKKwkJCQkJCQlpZiAoZHJtbW9kZV9jcnRjLT5zY2Fub3V0WzFdLnBpeG1hcCkKKwkJCQkJCQkJ cGl4bWFwX3VucmVmX2ZiKGRybW1vZGVfY3J0Yy0+c2Nhbm91dFsxXS5waXhtYXAsCisJCQkJCQkJ CQkJTm9uZSwgcEFNREdQVUVudCk7CisJCQkJCQl9IGVsc2UgeworCQkJCQkJCWRybW1vZGVfY3J0 Y19zY2Fub3V0X2ZyZWUoZHJtbW9kZV9jcnRjKTsKKwkJCQkJCX0KIAkJCQkJfQogCQkJCX0KIAkJ CX0KIAkJfQotCX0KIAotCXhmODZSb3RhdGVGcmVlU2hhZG93KHBTY3JuKTsKLQlkcm1tb2RlX2Ny dGNfc2Nhbm91dF9kZXN0cm95KCZpbmZvLT5kcm1tb2RlLCAmYmxhY2tfc2Nhbm91dCk7CisJCXhm ODZSb3RhdGVGcmVlU2hhZG93KHBTY3JuKTsKKwkJZHJtbW9kZV9jcnRjX3NjYW5vdXRfZGVzdHJv eSgmaW5mby0+ZHJtbW9kZSwgJmJsYWNrX3NjYW5vdXQpOwogCi0JLyogVW5yZWZlcmVuY2UgRkJz IG9mIGFsbCBwaXhtYXBzLiBBZnRlciB0aGlzLCB0aGUgb25seSBGQiByZW1haW5pbmcKLQkgKiBz aG91bGQgYmUgdGhlIGFsbC1ibGFjayBvbmUgYmVpbmcgc2Nhbm5lZCBvdXQgYnkgYWN0aXZlIENS VENzCi0JICovCi0JZm9yIChpID0gMDsgaSA8IGN1cnJlbnRNYXhDbGllbnRzOyBpKyspIHsKLQkJ aWYgKGkgPiAwICYmCi0JCSAgICAoIWNsaWVudHNbaV0gfHwgY2xpZW50c1tpXS0+Y2xpZW50U3Rh dGUgIT0gQ2xpZW50U3RhdGVSdW5uaW5nKSkKLQkJCWNvbnRpbnVlOworCQkvKiBVbnJlZmVyZW5j ZSBGQnMgb2YgYWxsIHBpeG1hcHMuIEFmdGVyIHRoaXMsIHRoZSBvbmx5IEZCIHJlbWFpbmluZwor CQkgKiBzaG91bGQgYmUgdGhlIGFsbC1ibGFjayBvbmUgYmVpbmcgc2Nhbm5lZCBvdXQgYnkgYWN0 aXZlIENSVENzCisJCSAqLworCQlmb3IgKGkgPSAwOyBpIDwgY3VycmVudE1heENsaWVudHM7IGkr KykgeworCQkJaWYgKGkgPiAwICYmCisJCQkgICAgKCFjbGllbnRzW2ldIHx8IGNsaWVudHNbaV0t PmNsaWVudFN0YXRlICE9IENsaWVudFN0YXRlUnVubmluZykpCisJCQkJY29udGludWU7CisKKwkJ CUZpbmRDbGllbnRSZXNvdXJjZXNCeVR5cGUoY2xpZW50c1tpXSwgUlRfUElYTUFQLCBwaXhtYXBf dW5yZWZfZmIsCisJCQkJCQkgIHBBTURHUFVFbnQpOworCQl9CiAKLQkJRmluZENsaWVudFJlc291 cmNlc0J5VHlwZShjbGllbnRzW2ldLCBSVF9QSVhNQVAsIHBpeG1hcF91bnJlZl9mYiwKLQkJCQkJ ICBwQU1ER1BVRW50KTsKKwkJcGl4bWFwX3VucmVmX2ZiKHBTY3JlZW4tPkdldFNjcmVlblBpeG1h cChwU2NyZWVuKSwgTm9uZSwgcEFNREdQVUVudCk7CisJfSBlbHNlIHsKKwkJbWVtc2V0KGluZm8t PmZyb250X2J1ZmZlci0+Y3B1X3B0ciwgMCwgcFNjcm4tPnZpcnR1YWxYICoKKwkJICAgICAgIGlu Zm8tPnBpeGVsX2J5dGVzICogcFNjcm4tPnZpcnR1YWxZKTsKIAl9Ci0JcGl4bWFwX3VucmVmX2Zi KHBTY3JlZW4tPkdldFNjcmVlblBpeG1hcChwU2NyZWVuKSwgTm9uZSwgcEFNREdQVUVudCk7CiAK IAlUaW1lclNldChOVUxMLCAwLCAxMDAwLCBjbGVhbnVwX2JsYWNrX2ZiLCBwU2NyZWVuKTsKIAot LSAKMi4xNC4yCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK