From: Eric Anholt Subject: [PATCH 07/10] drm/vc4: Fix which value is being used for source image size. Date: Thu, 4 Feb 2016 12:26:37 -0800 Message-ID: <1454617600-12099-8-git-send-email-eric@anholt.net> References: <1454617600-12099-1-git-send-email-eric@anholt.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1454617600-12099-1-git-send-email-eric@anholt.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org VGhpcyBkb2Vzbid0IG1hdHRlciB5ZXQgc2luY2Ugd2Ugb25seSBhbGxvdyAxOjEgc2NhbGluZywg YnV0IHRoZQpjb21tZW50IGNsZWFybHkgc2F5cyB3ZSBzaG91bGQgYmUgdXNpbmcgdGhlIHNvdXJj ZSBzaXplLgoKU2lnbmVkLW9mZi1ieTogRXJpYyBBbmhvbHQgPGVyaWNAYW5ob2x0Lm5ldD4KLS0t CiBkcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9wbGFuZS5jIHwgMjMgKysrKysrKysrKysrKystLS0t LS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS92YzQvdmM0X3BsYW5lLmMgYi9kcml2ZXJzL2dw dS9kcm0vdmM0L3ZjNF9wbGFuZS5jCmluZGV4IDllZjM1NjkuLjRlNGMzZWEgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS92YzQvdmM0X3BsYW5lLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3Zj NC92YzRfcGxhbmUuYwpAQCAtNDcsNiArNDcsOCBAQCBzdHJ1Y3QgdmM0X3BsYW5lX3N0YXRlIHsK IAogCS8qIENsaXBwZWQgY29vcmRpbmF0ZXMgb2YgdGhlIHBsYW5lIG9uIHRoZSBkaXNwbGF5LiAq LwogCWludCBjcnRjX3gsIGNydGNfeSwgY3J0Y193LCBjcnRjX2g7CisJLyogQ2xpcHBlZCBzaXpl IG9mIHRoZSBhcmVhIHNjYW5uZWQgZnJvbSBpbiB0aGUgRkIuICovCisJdTMyIHNyY193LCBzcmNf aDsKIAogCS8qIE9mZnNldCB0byBzdGFydCBzY2FubmluZyBvdXQgZnJvbSB0aGUgc3RhcnQgb2Yg dGhlIHBsYW5lJ3MKIAkgKiBCTy4KQEAgLTE3MCwxMSArMTcyLDYgQEAgc3RhdGljIGludCB2YzRf cGxhbmVfc2V0dXBfY2xpcHBpbmdfYW5kX3NjYWxpbmcoc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAq c3RhdGUpCiAKIAl2YzRfc3RhdGUtPm9mZnNldCA9IGZiLT5vZmZzZXRzWzBdOwogCi0JdmM0X3N0 YXRlLT5jcnRjX3ggPSBzdGF0ZS0+Y3J0Y194OwotCXZjNF9zdGF0ZS0+Y3J0Y195ID0gc3RhdGUt PmNydGNfeTsKLQl2YzRfc3RhdGUtPmNydGNfdyA9IHN0YXRlLT5jcnRjX3c7Ci0JdmM0X3N0YXRl LT5jcnRjX2ggPSBzdGF0ZS0+Y3J0Y19oOwotCiAJaWYgKHN0YXRlLT5jcnRjX3cgPDwgMTYgIT0g c3RhdGUtPnNyY193IHx8CiAJICAgIHN0YXRlLT5jcnRjX2ggPDwgMTYgIT0gc3RhdGUtPnNyY19o KSB7CiAJCS8qIFdlIGRvbid0IHN1cHBvcnQgc2NhbGluZyB5ZXQsIHdoaWNoIGludm9sdmVzCkBA IC0xODUsMTcgKzE4MiwyNSBAQCBzdGF0aWMgaW50IHZjNF9wbGFuZV9zZXR1cF9jbGlwcGluZ19h bmRfc2NhbGluZyhzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpzdGF0ZSkKIAkJcmV0dXJuIC1FSU5W QUw7CiAJfQogCisJdmM0X3N0YXRlLT5zcmNfdyA9IHN0YXRlLT5zcmNfdyA+PiAxNjsKKwl2YzRf c3RhdGUtPnNyY19oID0gc3RhdGUtPnNyY19oID4+IDE2OworCisJdmM0X3N0YXRlLT5jcnRjX3gg PSBzdGF0ZS0+Y3J0Y194OworCXZjNF9zdGF0ZS0+Y3J0Y195ID0gc3RhdGUtPmNydGNfeTsKKwl2 YzRfc3RhdGUtPmNydGNfdyA9IHN0YXRlLT5jcnRjX3c7CisJdmM0X3N0YXRlLT5jcnRjX2ggPSBz dGF0ZS0+Y3J0Y19oOworCiAJaWYgKHZjNF9zdGF0ZS0+Y3J0Y194IDwgMCkgewogCQl2YzRfc3Rh dGUtPm9mZnNldCArPSAoZHJtX2Zvcm1hdF9wbGFuZV9jcHAoZmItPnBpeGVsX2Zvcm1hdCwKIAkJ CQkJCQkgICAwKSAqCiAJCQkJICAgICAgLXZjNF9zdGF0ZS0+Y3J0Y194KTsKLQkJdmM0X3N0YXRl LT5jcnRjX3cgKz0gdmM0X3N0YXRlLT5jcnRjX3g7CisJCXZjNF9zdGF0ZS0+c3JjX3cgKz0gdmM0 X3N0YXRlLT5jcnRjX3g7CiAJCXZjNF9zdGF0ZS0+Y3J0Y194ID0gMDsKIAl9CiAKIAlpZiAodmM0 X3N0YXRlLT5jcnRjX3kgPCAwKSB7CiAJCXZjNF9zdGF0ZS0+b2Zmc2V0ICs9IGZiLT5waXRjaGVz WzBdICogLXZjNF9zdGF0ZS0+Y3J0Y195OwotCQl2YzRfc3RhdGUtPmNydGNfaCArPSB2YzRfc3Rh dGUtPmNydGNfeTsKKwkJdmM0X3N0YXRlLT5zcmNfaCArPSB2YzRfc3RhdGUtPmNydGNfeTsKIAkJ dmM0X3N0YXRlLT5jcnRjX3kgPSAwOwogCX0KIApAQCAtMjQ0LDggKzI0OSw4IEBAIHN0YXRpYyBp bnQgdmM0X3BsYW5lX21vZGVfc2V0KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJCSAgICAg IFNDQUxFUl9QT1MyX0FMUEhBX01PREVfUElQRUxJTkUgOgogCQkJCSAgICAgIFNDQUxFUl9QT1My X0FMUEhBX01PREVfRklYRUQsCiAJCQkJICAgICAgU0NBTEVSX1BPUzJfQUxQSEFfTU9ERSkgfAot CQkJVkM0X1NFVF9GSUVMRCh2YzRfc3RhdGUtPmNydGNfdywgU0NBTEVSX1BPUzJfV0lEVEgpIHwK LQkJCVZDNF9TRVRfRklFTEQodmM0X3N0YXRlLT5jcnRjX2gsIFNDQUxFUl9QT1MyX0hFSUdIVCkp OworCQkJVkM0X1NFVF9GSUVMRCh2YzRfc3RhdGUtPnNyY193LCBTQ0FMRVJfUE9TMl9XSURUSCkg fAorCQkJVkM0X1NFVF9GSUVMRCh2YzRfc3RhdGUtPnNyY19oLCBTQ0FMRVJfUE9TMl9IRUlHSFQp KTsKIAogCS8qIFBvc2l0aW9uIFdvcmQgMzogQ29udGV4dC4gIFdyaXR0ZW4gYnkgdGhlIEhWUy4g Ki8KIAl2YzRfZGxpc3Rfd3JpdGUodmM0X3N0YXRlLCAweGMwYzBjMGMwKTsKLS0gCjIuNy4wCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwg bWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=