From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH xf86-video-ati] Pass pitch from drmmode_crtc_scanout_allocate to drmmode_create_bo_pixmap Date: Fri, 6 Jan 2017 17:37:25 +0900 Message-ID: <20170106083725.12622-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+CgpyYWRlb25fYm9f Z2V0X3RpbGluZyBjYW4gZmFpbCwgZS5nLiBmb3IgbGluZWFyIEJPcy4KCkZpeGVzIFRlYXJGcmVl IG5vdCB3b3JraW5nIGluIHRob3NlIGNhc2VzLgoKQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVl ZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTk3ODczClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBE w6RuemVyIDxtaWNoZWwuZGFlbnplckBhbWQuY29tPgotLS0KIHNyYy9kcm1tb2RlX2Rpc3BsYXku YyB8IDI0ICsrKysrKysrKy0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDkgaW5zZXJ0 aW9ucygrKSwgMTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL2RybW1vZGVfZGlzcGxh eS5jIGIvc3JjL2RybW1vZGVfZGlzcGxheS5jCmluZGV4IGNlODA2NDY0NC4uMGZiMGQ3NzAwIDEw MDY0NAotLS0gYS9zcmMvZHJtbW9kZV9kaXNwbGF5LmMKKysrIGIvc3JjL2RybW1vZGVfZGlzcGxh eS5jCkBAIC0xMTYsMTQgKzExNiw2IEBAIHN0YXRpYyBQaXhtYXBQdHIgZHJtbW9kZV9jcmVhdGVf Ym9fcGl4bWFwKFNjcm5JbmZvUHRyIHBTY3JuLAogCWlmICghcGl4bWFwKQogCQlyZXR1cm4gTlVM TDsKIAotCWlmIChwaXRjaCA8PSAwICYmCi0JICAgIChyYWRlb25fYm9fZ2V0X3RpbGluZyhibywg JnRpbGluZywgKHVpbnQzMl90KikmcGl0Y2gpICE9IDAgfHwKLQkgICAgIHBpdGNoIDw9IDApKSB7 Ci0JCUVycm9yRigicmFkZW9uX2JvX2dldF90aWxpbmcgZmFpbGVkIHRvIGRldGVybWluZSBwaXRj aFxuIik7Ci0JCXBTY3JlZW4tPkRlc3Ryb3lQaXhtYXAocGl4bWFwKTsKLQkJcmV0dXJuIE5VTEw7 Ci0JfQotCiAJaWYgKCEoKnBTY3JlZW4tPk1vZGlmeVBpeG1hcEhlYWRlcikocGl4bWFwLCB3aWR0 aCwgaGVpZ2h0LAogCQkJCQkgICAgZGVwdGgsIGJwcCwgcGl0Y2gsIE5VTEwpKSB7CiAJCWdvdG8g ZmFpbDsKQEAgLTU2MSw3ICs1NTMsNyBAQCBkcm1tb2RlX3NjYW5vdXRfZnJlZShTY3JuSW5mb1B0 ciBzY3JuKQogc3RhdGljIHZvaWQgKgogZHJtbW9kZV9jcnRjX3NjYW5vdXRfYWxsb2NhdGUoeGY4 NkNydGNQdHIgY3J0YywKIAkJCSAgICAgIHN0cnVjdCBkcm1tb2RlX3NjYW5vdXQgKnNjYW5vdXQs Ci0JCQkgICAgICBpbnQgd2lkdGgsIGludCBoZWlnaHQpCisJCQkgICAgICBpbnQgd2lkdGgsIGlu dCBoZWlnaHQsIGludCAqcGl0Y2gpCiB7CiAJU2NybkluZm9QdHIgcFNjcm4gPSBjcnRjLT5zY3Ju OwogCVJBREVPTkluZm9QdHIgaW5mbyA9IFJBREVPTlBUUihwU2Nybik7CkBAIC01NzAsNyArNTYy LDYgQEAgZHJtbW9kZV9jcnRjX3NjYW5vdXRfYWxsb2NhdGUoeGY4NkNydGNQdHIgY3J0YywKIAlz dHJ1Y3QgcmFkZW9uX3N1cmZhY2Ugc3VyZmFjZTsKIAl1aW50MzJfdCB0aWxpbmcgPSBSQURFT05f Q1JFQVRFX1BJWE1BUF9USUxJTkdfTUFDUk87CiAJaW50IHJldDsKLQlpbnQgcGl0Y2g7CiAKIAlp ZiAoc2Nhbm91dC0+Ym8pIHsKIAkJaWYgKHNjYW5vdXQtPndpZHRoID09IHdpZHRoICYmIHNjYW5v dXQtPmhlaWdodCA9PSBoZWlnaHQpCkBAIC01ODMsMTQgKzU3NCwxNCBAQCBkcm1tb2RlX2NydGNf c2Nhbm91dF9hbGxvY2F0ZSh4Zjg2Q3J0Y1B0ciBjcnRjLAogCQl0aWxpbmcgfD0gUkFERU9OX0NS RUFURV9QSVhNQVBfVElMSU5HX01JQ1JPOwogCXNjYW5vdXQtPmJvID0gcmFkZW9uX2FsbG9jX3Bp eG1hcF9ibyhwU2Nybiwgd2lkdGgsIGhlaWdodCwgcFNjcm4tPmRlcHRoLAogCQkJCQkgICAgIHRp bGluZywgcFNjcm4tPmJpdHNQZXJQaXhlbCwKLQkJCQkJICAgICAmcGl0Y2gsICZzdXJmYWNlLCAm dGlsaW5nKTsKKwkJCQkJICAgICBwaXRjaCwgJnN1cmZhY2UsICZ0aWxpbmcpOwogCWlmIChzY2Fu b3V0LT5ibyA9PSBOVUxMKQogCQlyZXR1cm4gTlVMTDsKIAogCXJhZGVvbl9ib19tYXAoc2Nhbm91 dC0+Ym8sIDEpOwogCiAJcmV0ID0gZHJtTW9kZUFkZEZCKGRybW1vZGUtPmZkLCB3aWR0aCwgaGVp Z2h0LCBwU2Nybi0+ZGVwdGgsCi0JCQkgICBwU2Nybi0+Yml0c1BlclBpeGVsLCBwaXRjaCwKKwkJ CSAgIHBTY3JuLT5iaXRzUGVyUGl4ZWwsICpwaXRjaCwKIAkJCSAgIHNjYW5vdXQtPmJvLT5oYW5k bGUsCiAJCQkgICAmc2Nhbm91dC0+ZmJfaWQpOwogCWlmIChyZXQpIHsKQEAgLTYxMiw2ICs2MDMs NyBAQCBkcm1tb2RlX2NydGNfc2Nhbm91dF9jcmVhdGUoeGY4NkNydGNQdHIgY3J0Yywgc3RydWN0 IGRybW1vZGVfc2Nhbm91dCAqc2Nhbm91dCwKIAlTY3JuSW5mb1B0ciBwU2NybiA9IGNydGMtPnNj cm47CiAJZHJtbW9kZV9jcnRjX3ByaXZhdGVfcHRyIGRybW1vZGVfY3J0YyA9IGNydGMtPmRyaXZl cl9wcml2YXRlOwogCWRybW1vZGVfcHRyIGRybW1vZGUgPSBkcm1tb2RlX2NydGMtPmRybW1vZGU7 CisJaW50IHBpdGNoOwogCiAJaWYgKHNjYW5vdXQtPnBpeG1hcCkgewogCQlpZiAoc2Nhbm91dC0+ d2lkdGggPT0gd2lkdGggJiYgc2Nhbm91dC0+aGVpZ2h0ID09IGhlaWdodCkKQEAgLTYyMSw3ICs2 MTMsOCBAQCBkcm1tb2RlX2NydGNfc2Nhbm91dF9jcmVhdGUoeGY4NkNydGNQdHIgY3J0Yywgc3Ry dWN0IGRybW1vZGVfc2Nhbm91dCAqc2Nhbm91dCwKIAl9CiAKIAlpZiAoIXNjYW5vdXQtPmJvKSB7 Ci0JCWlmICghZHJtbW9kZV9jcnRjX3NjYW5vdXRfYWxsb2NhdGUoY3J0Yywgc2Nhbm91dCwgd2lk dGgsIGhlaWdodCkpCisJCWlmICghZHJtbW9kZV9jcnRjX3NjYW5vdXRfYWxsb2NhdGUoY3J0Yywg c2Nhbm91dCwgd2lkdGgsIGhlaWdodCwKKwkJCQkJCSAgICZwaXRjaCkpCiAJCQlyZXR1cm4gTlVM TDsKIAl9CiAKQEAgLTYyOSw3ICs2MjIsNyBAQCBkcm1tb2RlX2NydGNfc2Nhbm91dF9jcmVhdGUo eGY4NkNydGNQdHIgY3J0Yywgc3RydWN0IGRybW1vZGVfc2Nhbm91dCAqc2Nhbm91dCwKIAkJCQkJ CSB3aWR0aCwgaGVpZ2h0LAogCQkJCQkJIHBTY3JuLT5kZXB0aCwKIAkJCQkJCSBwU2Nybi0+Yml0 c1BlclBpeGVsLAotCQkJCQkJIC0xLCBzY2Fub3V0LT5ibywgTlVMTCk7CisJCQkJCQkgcGl0Y2gs IHNjYW5vdXQtPmJvLCBOVUxMKTsKIAlpZiAoc2Nhbm91dC0+cGl4bWFwID09IE5VTEwpCiAJCXhm ODZEcnZNc2cocFNjcm4tPnNjcm5JbmRleCwgWF9FUlJPUiwKIAkJCSAgICJDb3VsZG4ndCBhbGxv Y2F0ZSBzY2Fub3V0IHBpeG1hcCBmb3IgQ1JUQ1xuIik7CkBAIC0xMDkyLDkgKzEwODUsMTAgQEAg c3RhdGljIHZvaWQgKgogZHJtbW9kZV9jcnRjX3NoYWRvd19hbGxvY2F0ZSh4Zjg2Q3J0Y1B0ciBj cnRjLCBpbnQgd2lkdGgsIGludCBoZWlnaHQpCiB7CiAJZHJtbW9kZV9jcnRjX3ByaXZhdGVfcHRy IGRybW1vZGVfY3J0YyA9IGNydGMtPmRyaXZlcl9wcml2YXRlOworCWludCBwaXRjaDsKIAogCXJl dHVybiBkcm1tb2RlX2NydGNfc2Nhbm91dF9hbGxvY2F0ZShjcnRjLCAmZHJtbW9kZV9jcnRjLT5y b3RhdGUsCi0JCQkJCSAgICAgd2lkdGgsIGhlaWdodCk7CisJCQkJCSAgICAgd2lkdGgsIGhlaWdo dCwgJnBpdGNoKTsKIH0KIAogc3RhdGljIFBpeG1hcFB0cgotLSAKMi4xMS4wCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlz dAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK