From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Subject: [PATCH xf86-video-amdgpu] Pass pitch from drmmode_crtc_scanout_allocate to drmmode_create_bo_pixmap Date: Sat, 7 Jan 2017 15:36:59 +0900 Message-ID: <20170107063659.2005-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+CgpNb3N0bHkgdG8g YWxpZ24gd2l0aCByYWRlb24gY29tbWl0CmVhMzBkODU2YmE1ZTcyNzRjOGVhNDk5MjkzYjhiMGU3 MjFiOGUwODIsIGJ1dCBhbHNvIGdldHMgcmlkIG9mIGEKZ2JtX2JvX2dldF9zdHJpZGUgY2FsbC4K ClNpZ25lZC1vZmYtYnk6IE1pY2hlbCBEw6RuemVyIDxtaWNoZWwuZGFlbnplckBhbWQuY29tPgot LS0KIHNyYy9kcm1tb2RlX2Rpc3BsYXkuYyB8IDIyICsrKysrKysrKystLS0tLS0tLS0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9zcmMvZHJtbW9kZV9kaXNwbGF5LmMgYi9zcmMvZHJtbW9kZV9kaXNwbGF5LmMKaW5kZXgg NjNiM2IwNzYuLjRjMzU2NTdiIDEwMDY0NAotLS0gYS9zcmMvZHJtbW9kZV9kaXNwbGF5LmMKKysr IGIvc3JjL2RybW1vZGVfZGlzcGxheS5jCkBAIC00OTcsMTQgKzQ5NywxMyBAQCBkcm1tb2RlX3Nj YW5vdXRfZnJlZShTY3JuSW5mb1B0ciBzY3JuKQogc3RhdGljIHZvaWQgKgogZHJtbW9kZV9jcnRj X3NjYW5vdXRfYWxsb2NhdGUoeGY4NkNydGNQdHIgY3J0YywKIAkJCSAgICAgIHN0cnVjdCBkcm1t b2RlX3NjYW5vdXQgKnNjYW5vdXQsCi0JCQkgICAgICBpbnQgd2lkdGgsIGludCBoZWlnaHQpCisJ CQkgICAgICBpbnQgd2lkdGgsIGludCBoZWlnaHQsIGludCAqcGl0Y2gpCiB7CiAJU2NybkluZm9Q dHIgcFNjcm4gPSBjcnRjLT5zY3JuOwogCUFNREdQVUVudFB0ciBwQU1ER1BVRW50ID0gQU1ER1BV RW50UHJpdihwU2Nybik7CiAJZHJtbW9kZV9jcnRjX3ByaXZhdGVfcHRyIGRybW1vZGVfY3J0YyA9 IGNydGMtPmRyaXZlcl9wcml2YXRlOwogCWRybW1vZGVfcHRyIGRybW1vZGUgPSBkcm1tb2RlX2Ny dGMtPmRybW1vZGU7CiAJaW50IHJldDsKLQlpbnQgcGl0Y2g7CiAJdW5pb24gZ2JtX2JvX2hhbmRs ZSBib19oYW5kbGU7CiAKIAlpZiAoc2Nhbm91dC0+Ym8pIHsKQEAgLTUxNSw4ICs1MTQsOCBAQCBk cm1tb2RlX2NydGNfc2Nhbm91dF9hbGxvY2F0ZSh4Zjg2Q3J0Y1B0ciBjcnRjLAogCX0KIAogCXNj YW5vdXQtPmJvID0gYW1kZ3B1X2FsbG9jX3BpeG1hcF9ibyhwU2Nybiwgd2lkdGgsIGhlaWdodCwK LQkJCQkJICAgICAgIHBTY3JuLT5kZXB0aCwgMCwKLQkJCQkJICAgICAgIHBTY3JuLT5iaXRzUGVy UGl4ZWwsICZwaXRjaCk7CisJCQkJCSAgICAgcFNjcm4tPmRlcHRoLCAwLAorCQkJCQkgICAgIHBT Y3JuLT5iaXRzUGVyUGl4ZWwsIHBpdGNoKTsKIAlpZiAoIXNjYW5vdXQtPmJvKSB7CiAJCXhmODZE cnZNc2cocFNjcm4tPnNjcm5JbmRleCwgWF9FUlJPUiwKIAkJCSAgICJGYWlsZWQgdG8gYWxsb2Nh dGUgcm90YXRpb24gYnVmZmVyIG1lbW9yeVxuIik7CkBAIC01MjUsNyArNTI0LDcgQEAgZHJtbW9k ZV9jcnRjX3NjYW5vdXRfYWxsb2NhdGUoeGY4NkNydGNQdHIgY3J0YywKIAogCWJvX2hhbmRsZSA9 IGdibV9ib19nZXRfaGFuZGxlKHNjYW5vdXQtPmJvLT5iby5nYm0pOwogCXJldCA9IGRybU1vZGVB ZGRGQihwQU1ER1BVRW50LT5mZCwgd2lkdGgsIGhlaWdodCwgcFNjcm4tPmRlcHRoLAotCQkJICAg cFNjcm4tPmJpdHNQZXJQaXhlbCwgcGl0Y2gsCisJCQkgICBwU2Nybi0+Yml0c1BlclBpeGVsLCAq cGl0Y2gsCiAJCQkgICBib19oYW5kbGUudTMyLCAmc2Nhbm91dC0+ZmJfaWQpOwogCWlmIChyZXQp IHsKIAkJRXJyb3JGKCJmYWlsZWQgdG8gYWRkIHJvdGF0ZSBmYlxuIik7CkBAIC01NDcsNyArNTQ2 LDcgQEAgZHJtbW9kZV9jcnRjX3NjYW5vdXRfY3JlYXRlKHhmODZDcnRjUHRyIGNydGMsCiAJU2Ny bkluZm9QdHIgcFNjcm4gPSBjcnRjLT5zY3JuOwogCWRybW1vZGVfY3J0Y19wcml2YXRlX3B0ciBk cm1tb2RlX2NydGMgPSBjcnRjLT5kcml2ZXJfcHJpdmF0ZTsKIAlkcm1tb2RlX3B0ciBkcm1tb2Rl ID0gZHJtbW9kZV9jcnRjLT5kcm1tb2RlOwotCXVuc2lnbmVkIGxvbmcgcm90YXRlX3BpdGNoOwor CWludCBwaXRjaDsKIAogCWlmIChzY2Fub3V0LT5waXhtYXApIHsKIAkJaWYgKHNjYW5vdXQtPndp ZHRoID09IHdpZHRoICYmIHNjYW5vdXQtPmhlaWdodCA9PSBoZWlnaHQpCkBAIC01NTcsMTggKzU1 NiwxNiBAQCBkcm1tb2RlX2NydGNfc2Nhbm91dF9jcmVhdGUoeGY4NkNydGNQdHIgY3J0YywKIAl9 CiAKIAlpZiAoIXNjYW5vdXQtPmJvKSB7Ci0JCWlmICghZHJtbW9kZV9jcnRjX3NjYW5vdXRfYWxs b2NhdGUoY3J0Yywgc2Nhbm91dCwgd2lkdGgsIGhlaWdodCkpCisJCWlmICghZHJtbW9kZV9jcnRj X3NjYW5vdXRfYWxsb2NhdGUoY3J0Yywgc2Nhbm91dCwgd2lkdGgsIGhlaWdodCwKKwkJCQkJCSAg ICZwaXRjaCkpCiAJCQlyZXR1cm4gTlVMTDsKIAl9CiAKLQlyb3RhdGVfcGl0Y2ggPSBnYm1fYm9f Z2V0X3N0cmlkZShzY2Fub3V0LT5iby0+Ym8uZ2JtKTsKLQogCXNjYW5vdXQtPnBpeG1hcCA9IGRy bW1vZGVfY3JlYXRlX2JvX3BpeG1hcChwU2NybiwKIAkJCQkJCSB3aWR0aCwgaGVpZ2h0LAogCQkJ CQkJIHBTY3JuLT5kZXB0aCwKIAkJCQkJCSBwU2Nybi0+Yml0c1BlclBpeGVsLAotCQkJCQkJIHJv dGF0ZV9waXRjaCwKLQkJCQkJCSBzY2Fub3V0LT5ibyk7CisJCQkJCQkgcGl0Y2gsIHNjYW5vdXQt PmJvKTsKIAlpZiAoc2Nhbm91dC0+cGl4bWFwID09IE5VTEwpIHsKIAkJeGY4NkRydk1zZyhwU2Ny bi0+c2NybkluZGV4LCBYX0VSUk9SLAogCQkJICAgIkNvdWxkbid0IGFsbG9jYXRlIHNoYWRvdyBw aXhtYXAgZm9yIHJvdGF0ZWQgQ1JUQ1xuIik7CkBAIC0xMDU0LDkgKzEwNTEsMTAgQEAgc3RhdGlj IHZvaWQgKmRybW1vZGVfY3J0Y19zaGFkb3dfYWxsb2NhdGUoeGY4NkNydGNQdHIgY3J0YywgaW50 IHdpZHRoLAogCQkJCQkgIGludCBoZWlnaHQpCiB7CiAJZHJtbW9kZV9jcnRjX3ByaXZhdGVfcHRy IGRybW1vZGVfY3J0YyA9IGNydGMtPmRyaXZlcl9wcml2YXRlOworCWludCBwaXRjaDsKIAogCXJl dHVybiBkcm1tb2RlX2NydGNfc2Nhbm91dF9hbGxvY2F0ZShjcnRjLCAmZHJtbW9kZV9jcnRjLT5y b3RhdGUsCi0JCQkJCSAgICAgd2lkdGgsIGhlaWdodCk7CisJCQkJCSAgICAgd2lkdGgsIGhlaWdo dCwgJnBpdGNoKTsKIH0KIAogc3RhdGljIFBpeG1hcFB0cgotLSAKMi4xMS4wCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlz dAphbWQtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2FtZC1nZngK