From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by gabe.freedesktop.org (Postfix) with ESMTPS id D9827894C9 for ; Fri, 22 Feb 2019 11:26:16 +0000 (UTC) From: Paul Kocialkowski Date: Fri, 22 Feb 2019 12:25:33 +0100 Message-Id: <20190222112543.6885-13-paul.kocialkowski@bootlin.com> In-Reply-To: <20190222112543.6885-1-paul.kocialkowski@bootlin.com> References: <20190222112543.6885-1-paul.kocialkowski@bootlin.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH RESEND i-g-t v6 12/22] lib/igt_fb: Pass the modifier to igt_fb_convert helpers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org List-ID: VGhlIG1vZGlmaWVyIGlzIHBhcnQgb2YgaG93IGEgZnJhbWUgaXMgcmVwcmVzZW50ZWQsIHNvIGFk ZCBpdCBhcyBhbgpleHRyYSBhcmd1bWVudCBzbyB0aGF0IGl0IGNhbiBiZSBzcGVjaWZpZWQgd2hl biBjb252ZXJ0aW5nIGZyYW1lYnVmZmVycy4KCkZvciBub3csIG9ubHkgYSBsaW5lYXIgbW9kaWZp ZXIgaXMgc3VwcG9ydGVkLgoKU2lnbmVkLW9mZi1ieTogUGF1bCBLb2NpYWxrb3dza2kgPHBhdWwu a29jaWFsa293c2tpQGJvb3RsaW4uY29tPgpSZXZpZXdlZC1ieTogTWF4aW1lIFJpcGFyZCA8bWF4 aW1lLnJpcGFyZEBib290bGluLmNvbT4KUmV2aWV3ZWQtYnk6IEx5dWRlIFBhdWwgPGx5dWRlQHJl ZGhhdC5jb20+Ci0tLQogbGliL2lndF9mYi5jICAgICAgICAgIHwgMTQgKysrKysrKysrKy0tLS0K IGxpYi9pZ3RfZmIuaCAgICAgICAgICB8ICAzICsrLQogdGVzdHMva21zX2NoYW1lbGl1bS5jIHwg IDMgKystCiAzIGZpbGVzIGNoYW5nZWQsIDE0IGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvbGliL2lndF9mYi5jIGIvbGliL2lndF9mYi5jCmluZGV4IDBiNTlmZjQ3 NzFhYS4uMjVhMDdiMGRmYTM5IDEwMDY0NAotLS0gYS9saWIvaWd0X2ZiLmMKKysrIGIvbGliL2ln dF9mYi5jCkBAIC0yNTU3LDYgKzI1NTcsNyBAQCB2b2lkIGlndF9yZW1vdmVfZmIoaW50IGZkLCBz dHJ1Y3QgaWd0X2ZiICpmYikKICAqIEBkc3Q6IHBvaW50ZXIgdG8gdGhlICNpZ3RfZmIgc3RydWN0 dXJlIHRoYXQgd2lsbCBzdG9yZSB0aGUgY29udmVyc2lvbiByZXN1bHQKICAqIEBzcmM6IHBvaW50 ZXIgdG8gdGhlICNpZ3RfZmIgc3RydWN0dXJlIHRoYXQgc3RvcmVzIHRoZSBmcmFtZSB3ZSBjb252 ZXJ0CiAgKiBAZHN0X2ZvdXJjYzogRFJNIGZvcm1hdCBzcGVjaWZpZXIgdG8gY29udmVydCB0bwor ICogQGRzdF9tb2RpZmllcjogRFJNIGZvcm1hdCBtb2RpZmllciB0byBjb252ZXJ0IHRvCiAgKiBA ZHN0X3N0cmlkZTogU3RyaWRlIGZvciB0aGUgcmVzdWx0aW5nIGZyYW1lYnVmZmVyICgwIGZvciBh dXRvbWF0aWMgc3RyaWRlKQogICoKICAqIFRoaXMgd2lsbCBjb252ZXJ0IGEgZ2l2ZW4gQHNyYyBj b250ZW50IHRvIHRoZSBAZHN0X2ZvdXJjYyBmb3JtYXQsCkBAIC0yNTcxLDYgKzI1NzIsNyBAQCB2 b2lkIGlndF9yZW1vdmVfZmIoaW50IGZkLCBzdHJ1Y3QgaWd0X2ZiICpmYikKICAqLwogdW5zaWdu ZWQgaW50IGlndF9mYl9jb252ZXJ0X3dpdGhfc3RyaWRlKHN0cnVjdCBpZ3RfZmIgKmRzdCwgc3Ry dWN0IGlndF9mYiAqc3JjLAogCQkJCQl1aW50MzJfdCBkc3RfZm91cmNjLAorCQkJCQl1aW50NjRf dCBkc3RfbW9kaWZpZXIsCiAJCQkJCXVuc2lnbmVkIGludCBkc3Rfc3RyaWRlKQogewogCXN0cnVj dCBmYl9jb252ZXJ0IGN2dCA9IHsgfTsKQEAgLTI1NzksOCArMjU4MSw4IEBAIHVuc2lnbmVkIGlu dCBpZ3RfZmJfY29udmVydF93aXRoX3N0cmlkZShzdHJ1Y3QgaWd0X2ZiICpkc3QsIHN0cnVjdCBp Z3RfZmIgKnNyYywKIAogCWZiX2lkID0gaWd0X2NyZWF0ZV9mYl93aXRoX2JvX3NpemUoc3JjLT5m ZCwgc3JjLT53aWR0aCwgc3JjLT5oZWlnaHQsCiAJCQkJCSAgIGRzdF9mb3VyY2MsCi0JCQkJCSAg IExPQ0FMX0RSTV9GT1JNQVRfTU9EX05PTkUsCi0JCQkJCSAgIGRzdCwgMCwgZHN0X3N0cmlkZSk7 CisJCQkJCSAgIExPQ0FMX0RSTV9GT1JNQVRfTU9EX05PTkUsIGRzdCwgMCwKKwkJCQkJICAgZHN0 X3N0cmlkZSk7CiAJaWd0X2Fzc2VydChmYl9pZCA+IDApOwogCiAJc3JjX3B0ciA9IGlndF9mYl9t YXBfYnVmZmVyKHNyYy0+ZmQsIHNyYyk7CkBAIC0yNTk4LDYgKzI2MDAsOCBAQCB1bnNpZ25lZCBp bnQgaWd0X2ZiX2NvbnZlcnRfd2l0aF9zdHJpZGUoc3RydWN0IGlndF9mYiAqZHN0LCBzdHJ1Y3Qg aWd0X2ZiICpzcmMsCiAJaWd0X2ZiX3VubWFwX2J1ZmZlcihkc3QsIGRzdF9wdHIpOwogCWlndF9m Yl91bm1hcF9idWZmZXIoc3JjLCBzcmNfcHRyKTsKIAorCWlndF9hc3NlcnQoZHN0X21vZGlmaWVy ID09IExPQ0FMX0RSTV9GT1JNQVRfTU9EX05PTkUpOworCiAJcmV0dXJuIGZiX2lkOwogfQogCkBA IC0yNjA2LDYgKzI2MTAsNyBAQCB1bnNpZ25lZCBpbnQgaWd0X2ZiX2NvbnZlcnRfd2l0aF9zdHJp ZGUoc3RydWN0IGlndF9mYiAqZHN0LCBzdHJ1Y3QgaWd0X2ZiICpzcmMsCiAgKiBAZHN0OiBwb2lu dGVyIHRvIHRoZSAjaWd0X2ZiIHN0cnVjdHVyZSB0aGF0IHdpbGwgc3RvcmUgdGhlIGNvbnZlcnNp b24gcmVzdWx0CiAgKiBAc3JjOiBwb2ludGVyIHRvIHRoZSAjaWd0X2ZiIHN0cnVjdHVyZSB0aGF0 IHN0b3JlcyB0aGUgZnJhbWUgd2UgY29udmVydAogICogQGRzdF9mb3VyY2M6IERSTSBmb3JtYXQg c3BlY2lmaWVyIHRvIGNvbnZlcnQgdG8KKyAqIEBkc3RfbW9kaWZpZXI6IERSTSBmb3JtYXQgbW9k aWZpZXIgdG8gY29udmVydCB0bwogICoKICAqIFRoaXMgd2lsbCBjb252ZXJ0IGEgZ2l2ZW4gQHNy YyBjb250ZW50IHRvIHRoZSBAZHN0X2ZvdXJjYyBmb3JtYXQsCiAgKiBzdG9yaW5nIHRoZSByZXN1 bHQgaW4gdGhlIEBkc3QgZmIsIGFsbG9jYXRpbmcgdGhlIEBkc3QgZmIKQEAgLTI2MTgsOSArMjYy MywxMCBAQCB1bnNpZ25lZCBpbnQgaWd0X2ZiX2NvbnZlcnRfd2l0aF9zdHJpZGUoc3RydWN0IGln dF9mYiAqZHN0LCBzdHJ1Y3QgaWd0X2ZiICpzcmMsCiAgKiBUaGUga21zIGlkIG9mIHRoZSBjcmVh dGVkIGZyYW1lYnVmZmVyLgogICovCiB1bnNpZ25lZCBpbnQgaWd0X2ZiX2NvbnZlcnQoc3RydWN0 IGlndF9mYiAqZHN0LCBzdHJ1Y3QgaWd0X2ZiICpzcmMsCi0JCQkgICAgdWludDMyX3QgZHN0X2Zv dXJjYykKKwkJCSAgICB1aW50MzJfdCBkc3RfZm91cmNjLCB1aW50NjRfdCBkc3RfbW9kaWZpZXIp CiB7Ci0JcmV0dXJuIGlndF9mYl9jb252ZXJ0X3dpdGhfc3RyaWRlKGRzdCwgc3JjLCBkc3RfZm91 cmNjLCAwKTsKKwlyZXR1cm4gaWd0X2ZiX2NvbnZlcnRfd2l0aF9zdHJpZGUoZHN0LCBzcmMsIGRz dF9mb3VyY2MsIGRzdF9tb2RpZmllciwKKwkJCQkJICAwKTsKIH0KIAogLyoqCmRpZmYgLS1naXQg YS9saWIvaWd0X2ZiLmggYi9saWIvaWd0X2ZiLmgKaW5kZXggMmMwYTI0ZDIxMjlmLi5lMWQ4ODVl MmM1YmMgMTAwNjQ0Ci0tLSBhL2xpYi9pZ3RfZmIuaAorKysgYi9saWIvaWd0X2ZiLmgKQEAgLTEz OCw5ICsxMzgsMTAgQEAgdW5zaWduZWQgaW50IGlndF9jcmVhdGVfc3RlcmVvX2ZiKGludCBkcm1f ZmQsIGRybU1vZGVNb2RlSW5mbyAqbW9kZSwKIAkJCQkgIHVpbnQzMl90IGZvcm1hdCwgdWludDY0 X3QgdGlsaW5nKTsKIHVuc2lnbmVkIGludCBpZ3RfZmJfY29udmVydF93aXRoX3N0cmlkZShzdHJ1 Y3QgaWd0X2ZiICpkc3QsIHN0cnVjdCBpZ3RfZmIgKnNyYywKIAkJCQkJdWludDMyX3QgZHN0X2Zv dXJjYywKKwkJCQkJdWludDY0X3QgZHN0X21vZGlmaWVyLAogCQkJCQl1bnNpZ25lZCBpbnQgc3Ry aWRlKTsKIHVuc2lnbmVkIGludCBpZ3RfZmJfY29udmVydChzdHJ1Y3QgaWd0X2ZiICpkc3QsIHN0 cnVjdCBpZ3RfZmIgKnNyYywKLQkJCSAgICB1aW50MzJfdCBkc3RfZm91cmNjKTsKKwkJCSAgICB1 aW50MzJfdCBkc3RfZm91cmNjLCB1aW50NjRfdCBkc3RfbW9kaWZpZXIpOwogdm9pZCBpZ3RfcmVt b3ZlX2ZiKGludCBmZCwgc3RydWN0IGlndF9mYiAqZmIpOwogaW50IGlndF9kaXJ0eV9mYihpbnQg ZmQsIHN0cnVjdCBpZ3RfZmIgKmZiKTsKIHZvaWQgKmlndF9mYl9tYXBfYnVmZmVyKGludCBmZCwg c3RydWN0IGlndF9mYiAqZmIpOwpkaWZmIC0tZ2l0IGEvdGVzdHMva21zX2NoYW1lbGl1bS5jIGIv dGVzdHMva21zX2NoYW1lbGl1bS5jCmluZGV4IDY0Zjg3ZDNhZTQ3NC4uZmU1OGFlYTk4ZTg2IDEw MDY0NAotLS0gYS90ZXN0cy9rbXNfY2hhbWVsaXVtLmMKKysrIGIvdGVzdHMva21zX2NoYW1lbGl1 bS5jCkBAIC01NDYsNyArNTQ2LDggQEAgc3RhdGljIHZvaWQgZG9fdGVzdF9kaXNwbGF5KGRhdGFf dCAqZGF0YSwgc3RydWN0IGNoYW1lbGl1bV9wb3J0ICpwb3J0LAogCQkJCQkgRFJNX0ZPUk1BVF9Y UkdCODg4OCwgNjQsICZmYik7CiAJaWd0X2Fzc2VydChmYl9pZCA+IDApOwogCi0JZnJhbWVfaWQg PSBpZ3RfZmJfY29udmVydCgmZnJhbWVfZmIsICZmYiwgZm91cmNjKTsKKwlmcmFtZV9pZCA9IGln dF9mYl9jb252ZXJ0KCZmcmFtZV9mYiwgJmZiLCBmb3VyY2MsCisJCQkJICBMT0NBTF9EUk1fRk9S TUFUX01PRF9OT05FKTsKIAlpZ3RfYXNzZXJ0KGZyYW1lX2lkID4gMCk7CiAKIAlpZiAoY2hlY2sg PT0gQ0hBTUVMSVVNX0NIRUNLX0NSQykKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KaWd0LWRldiBtYWlsaW5nIGxpc3QKaWd0LWRldkBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pZ3QtZGV2