From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH xf86-video-amdgpu 3/3] Make amdgpu_scanout_do_update take a PixmapPtr instead of a DrawablePtr Date: Fri, 18 Aug 2017 17:55:03 +0900 Message-ID: <20170818085503.3908-3-michel@daenzer.net> References: <20170818085503.3908-1-michel@daenzer.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170818085503.3908-1-michel-otUistvHUpPR7s880joybQ@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 RnJvbTogTWljaGVsIETDpG56ZXIgPG1pY2hlbC5kYWVuemVyQGFtZC5jb20+CgpBbGwgY2FsbGVy cyB3ZXJlIGFscmVhZHkgcGFzc2luZyBpbiBhIHBpeG1hcC4KClRoaXMgYWxsb3dzIHNpbXBsaWZ5 aW5nIHRoZSByb3RhdGVkIHNjYW5vdXQgY2FzZSBzbGlnaHRseS4KCihQb3J0ZWQgZnJvbSByYWRl b24gY29tbWl0IGQ4MjJhMGY0NzA3MDM3NGFkMGMxYTk3YjU1OWJhZTI3NzI0ZGM1MmEpCgpTaWdu ZWQtb2ZmLWJ5OiBNaWNoZWwgRMOkbnplciA8bWljaGVsLmRhZW56ZXJAYW1kLmNvbT4KLS0tCiBz cmMvYW1kZ3B1X2Rydi5oICAgICAgfCAgMiArLQogc3JjL2FtZGdwdV9rbXMuYyAgICAgIHwgMTMg KysrKysrLS0tLS0tLQogc3JjL2RybW1vZGVfZGlzcGxheS5jIHwgIDYgKysrLS0tCiAzIGZpbGVz IGNoYW5nZWQsIDEwIGluc2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L3NyYy9hbWRncHVfZHJ2LmggYi9zcmMvYW1kZ3B1X2Rydi5oCmluZGV4IDEzMjM3NDcwYS4uNzVj MmEyNjUzIDEwMDY0NAotLS0gYS9zcmMvYW1kZ3B1X2Rydi5oCisrKyBiL3NyYy9hbWRncHVfZHJ2 LmgKQEAgLTM0MSw3ICszNDEsNyBAQCBCb29sIGFtZGdwdV9kcmkzX3NjcmVlbl9pbml0KFNjcmVl blB0ciBzY3JlZW4pOwogCiAvKiBhbWRncHVfa21zLmMgKi8KIEJvb2wgYW1kZ3B1X3NjYW5vdXRf ZG9fdXBkYXRlKHhmODZDcnRjUHRyIHhmODZfY3J0YywgaW50IHNjYW5vdXRfaWQsCi0JCQkgICAg ICAgRHJhd2FibGVQdHIgc3JjX2RyYXcsIEJveFB0ciBleHRlbnRzKTsKKwkJCSAgICAgIFBpeG1h cFB0ciBzcmNfcGl4LCBCb3hQdHIgZXh0ZW50cyk7CiB2b2lkIEFNREdQVVdpbmRvd0V4cG9zdXJl c19vbmVzaG90KFdpbmRvd1B0ciBwV2luLCBSZWdpb25QdHIgcFJlZ2lvbgogI2lmIFhPUkdfVkVS U0lPTl9DVVJSRU5UIDwgWE9SR19WRVJTSU9OX05VTUVSSUMoMSwxNiw5OSw5MDEsMCkKIAkJCQkg ICAsIFJlZ2lvblB0ciBwQlNSZWdpb24KZGlmZiAtLWdpdCBhL3NyYy9hbWRncHVfa21zLmMgYi9z cmMvYW1kZ3B1X2ttcy5jCmluZGV4IGY2NjVhMDFjZC4uZTBiNzM1ODE5IDEwMDY0NAotLS0gYS9z cmMvYW1kZ3B1X2ttcy5jCisrKyBiL3NyYy9hbWRncHVfa21zLmMKQEAgLTgwNiw3ICs4MDYsNyBA QCBhbWRncHVfZGlydHlfdXBkYXRlKFNjcm5JbmZvUHRyIHNjcm4pCiAKIEJvb2wKIGFtZGdwdV9z Y2Fub3V0X2RvX3VwZGF0ZSh4Zjg2Q3J0Y1B0ciB4Zjg2X2NydGMsIGludCBzY2Fub3V0X2lkLAot CQkJIERyYXdhYmxlUHRyIHNyY19kcmF3LCBCb3hQdHIgZXh0ZW50cykKKwkJCSBQaXhtYXBQdHIg c3JjX3BpeCwgQm94UHRyIGV4dGVudHMpCiB7CiAJZHJtbW9kZV9jcnRjX3ByaXZhdGVfcHRyIGRy bW1vZGVfY3J0YyA9IHhmODZfY3J0Yy0+ZHJpdmVyX3ByaXZhdGU7CiAJUmVnaW9uUmVjIHJlZ2lv biA9IHsgLmV4dGVudHMgPSAqZXh0ZW50cywgLmRhdGEgPSBOVUxMIH07CkBAIC04MzQsMTAgKzgz NCw5IEBAIGFtZGdwdV9zY2Fub3V0X2RvX3VwZGF0ZSh4Zjg2Q3J0Y1B0ciB4Zjg2X2NydGMsIGlu dCBzY2Fub3V0X2lkLAogCQlQaWN0Rm9ybWF0UHRyIGZvcm1hdCA9IFBpY3R1cmVXaW5kb3dGb3Jt YXQocFNjcmVlbi0+cm9vdCk7CiAJCWludCBlcnJvcjsKIAkJUGljdHVyZVB0ciBzcmMsIGRzdDsK LQkJWElEIGluY2x1ZGVfaW5mZXJpb3JzID0gSW5jbHVkZUluZmVyaW9yczsKIAotCQlzcmMgPSBD cmVhdGVQaWN0dXJlKE5vbmUsIHNyY19kcmF3LCBmb3JtYXQsIENQU3Vid2luZG93TW9kZSwKLQkJ CQkgICAgJmluY2x1ZGVfaW5mZXJpb3JzLCBzZXJ2ZXJDbGllbnQsICZlcnJvcik7CisJCXNyYyA9 IENyZWF0ZVBpY3R1cmUoTm9uZSwgJnNyY19waXgtPmRyYXdhYmxlLCBmb3JtYXQsIDBMLCBOVUxM LAorCQkJCSAgICBzZXJ2ZXJDbGllbnQsICZlcnJvcik7CiAJCWlmICghc3JjKSB7CiAJCQlFcnJv ckYoIkZhaWxlZCB0byBjcmVhdGUgc291cmNlIHBpY3R1cmUgZm9yIHRyYW5zZm9ybWVkIHNjYW5v dXQgIgogCQkJICAgICAgICJ1cGRhdGVcbiIpOwpAQCAtODgwLDcgKzg3OSw3IEBAIGFtZGdwdV9z Y2Fub3V0X2RvX3VwZGF0ZSh4Zjg2Q3J0Y1B0ciB4Zjg2X2NydGMsIGludCBzY2Fub3V0X2lkLAog CQlHQ1B0ciBnYyA9IEdldFNjcmF0Y2hHQyhwRHJhdy0+ZGVwdGgsIHBTY3JlZW4pOwogCiAJCVZh bGlkYXRlR0MocERyYXcsIGdjKTsKLQkJKCpnYy0+b3BzLT5Db3B5QXJlYSkoc3JjX2RyYXcsIHBE cmF3LCBnYywKKwkJKCpnYy0+b3BzLT5Db3B5QXJlYSkoJnNyY19waXgtPmRyYXdhYmxlLCBwRHJh dywgZ2MsCiAJCQkJICAgICB4Zjg2X2NydGMtPnggKyBleHRlbnRzLT54MSwgeGY4Nl9jcnRjLT55 ICsgZXh0ZW50cy0+eTEsCiAJCQkJICAgICBleHRlbnRzLT54MiAtIGV4dGVudHMtPngxLCBleHRl bnRzLT55MiAtIGV4dGVudHMtPnkxLAogCQkJCSAgICAgZXh0ZW50cy0+eDEsIGV4dGVudHMtPnkx KTsKQEAgLTkxMiw3ICs5MTEsNyBAQCBhbWRncHVfc2Nhbm91dF91cGRhdGVfaGFuZGxlcih4Zjg2 Q3J0Y1B0ciBjcnRjLCB1aW50MzJfdCBmcmFtZSwgdWludDY0X3QgdXNlYywKIAkgICAgIWRybW1v ZGVfY3J0Yy0+ZmxpcF9wZW5kaW5nICYmCiAJICAgIGRybW1vZGVfY3J0Yy0+ZHBtc19tb2RlID09 IERQTVNNb2RlT24pIHsKIAkJaWYgKGFtZGdwdV9zY2Fub3V0X2RvX3VwZGF0ZShjcnRjLCBkcm1t b2RlX2NydGMtPnNjYW5vdXRfaWQsCi0JCQkJCSAgICAgJnNjcmVlbi0+R2V0V2luZG93UGl4bWFw KHNjcmVlbi0+cm9vdCktPmRyYXdhYmxlLAorCQkJCQkgICAgIHNjcmVlbi0+R2V0V2luZG93UGl4 bWFwKHNjcmVlbi0+cm9vdCksCiAJCQkJCSAgICAgJnJlZ2lvbi0+ZXh0ZW50cykpCiAJCQlSZWdp b25FbXB0eShyZWdpb24pOwogCX0KQEAgLTk5Myw3ICs5OTIsNyBAQCBhbWRncHVfc2Nhbm91dF9m bGlwKFNjcmVlblB0ciBwU2NyZWVuLCBBTURHUFVJbmZvUHRyIGluZm8sCiAKIAlzY2Fub3V0X2lk ID0gZHJtbW9kZV9jcnRjLT5zY2Fub3V0X2lkIF4gMTsKIAlpZiAoIWFtZGdwdV9zY2Fub3V0X2Rv X3VwZGF0ZSh4Zjg2X2NydGMsIHNjYW5vdXRfaWQsCi0JCQkJICAgICAgJnBTY3JlZW4tPkdldFdp bmRvd1BpeG1hcChwU2NyZWVuLT5yb290KS0+ZHJhd2FibGUsCisJCQkJICAgICAgcFNjcmVlbi0+ R2V0V2luZG93UGl4bWFwKHBTY3JlZW4tPnJvb3QpLAogCQkJCSAgICAgICZyZWdpb24tPmV4dGVu dHMpKQogCQlyZXR1cm47CiAJUmVnaW9uRW1wdHkocmVnaW9uKTsKZGlmZiAtLWdpdCBhL3NyYy9k cm1tb2RlX2Rpc3BsYXkuYyBiL3NyYy9kcm1tb2RlX2Rpc3BsYXkuYwppbmRleCBlZGQ5NTVlY2Uu LmFkMzMyNWJlNiAxMDA2NDQKLS0tIGEvc3JjL2RybW1vZGVfZGlzcGxheS5jCisrKyBiL3NyYy9k cm1tb2RlX2Rpc3BsYXkuYwpAQCAtNzc5LDcgKzc3OSw3IEBAIGRybW1vZGVfY3J0Y19zY2Fub3V0 X3VwZGF0ZSh4Zjg2Q3J0Y1B0ciBjcnRjLCBEaXNwbGF5TW9kZVB0ciBtb2RlLAogCQkqeCA9ICp5 ID0gMDsKIAogCQlhbWRncHVfc2Nhbm91dF9kb191cGRhdGUoY3J0Yywgc2Nhbm91dF9pZCwKLQkJ CQkJICZzY3JlZW4tPkdldFdpbmRvd1BpeG1hcChzY3JlZW4tPnJvb3QpLT5kcmF3YWJsZSwKKwkJ CQkJIHNjcmVlbi0+R2V0V2luZG93UGl4bWFwKHNjcmVlbi0+cm9vdCksCiAJCQkJCSBib3gpOwog CQlhbWRncHVfZ2xhbW9yX2ZpbmlzaChzY3JuKTsKIAl9CkBAIC0yODUwLDggKzI4NTAsOCBAQCBC b29sIGFtZGdwdV9kb19wYWdlZmxpcChTY3JuSW5mb1B0ciBzY3JuLCBDbGllbnRQdHIgY2xpZW50 LAogCQkJCWdvdG8gZXJyb3I7CiAJCQl9CiAKLQkJCWFtZGdwdV9zY2Fub3V0X2RvX3VwZGF0ZShj cnRjLCBzY2Fub3V0X2lkLAotCQkJCQkJICZuZXdfZnJvbnQtPmRyYXdhYmxlLCAmZXh0ZW50cyk7 CisJCQlhbWRncHVfc2Nhbm91dF9kb191cGRhdGUoY3J0Yywgc2Nhbm91dF9pZCwgbmV3X2Zyb250 LAorCQkJCQkJICZleHRlbnRzKTsKIAogCQkJZHJtbW9kZV9jcnRjX3dhaXRfcGVuZGluZ19ldmVu dChkcm1tb2RlX2NydGMsIHBBTURHUFVFbnQtPmZkLAogCQkJCQkJCWRybW1vZGVfY3J0Yy0+c2Nh bm91dF91cGRhdGVfcGVuZGluZyk7Ci0tIAoyLjE0LjEKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmFtZC1nZnggbWFpbGluZyBsaXN0CmFtZC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vYW1kLWdmeAo=