From: Eric Anholt Subject: [PATCH 03/10] drm/vc4: Move the plane clipping/scaling setup to a separate function. Date: Thu, 4 Feb 2016 12:26:33 -0800 Message-ID: <1454617600-12099-4-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 QXMgd2UgYWRkIGFjdHVhbCBzY2FsaW5nLCB0aGlzIGlzIGdvaW5nIHRvIGdldCB3YXkgbW9yZSBj b21wbGljYXRlZC4KClNpZ25lZC1vZmYtYnk6IEVyaWMgQW5ob2x0IDxlcmljQGFuaG9sdC5uZXQ+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfcGxhbmUuYyB8IDc4ICsrKysrKysrKysrKysr KysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNTIgaW5zZXJ0aW9u cygrKSwgMjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3ZjNC92 YzRfcGxhbmUuYyBiL2RyaXZlcnMvZ3B1L2RybS92YzQvdmM0X3BsYW5lLmMKaW5kZXggZWQwN2Vl NS4uNTU0ZWQ1NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfcGxhbmUuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9wbGFuZS5jCkBAIC00MCw2ICs0MCwxNCBAQCBz dHJ1Y3QgdmM0X3BsYW5lX3N0YXRlIHsKIAkgKiBoYXJkd2FyZSBhdCB2YzRfY3J0Y19hdG9taWNf Zmx1c2goKSB0aW1lLgogCSAqLwogCXUzMiBfX2lvbWVtICpod19kbGlzdDsKKworCS8qIENsaXBw ZWQgY29vcmRpbmF0ZXMgb2YgdGhlIHBsYW5lIG9uIHRoZSBkaXNwbGF5LiAqLworCWludCBjcnRj X3gsIGNydGNfeSwgY3J0Y193LCBjcnRjX2g7CisKKwkvKiBPZmZzZXQgdG8gc3RhcnQgc2Nhbm5p bmcgb3V0IGZyb20gdGhlIHN0YXJ0IG9mIHRoZSBwbGFuZSdzCisJICogQk8uCisJICovCisJdTMy IG9mZnNldDsKIH07CiAKIHN0YXRpYyBpbmxpbmUgc3RydWN0IHZjNF9wbGFuZV9zdGF0ZSAqCkBA IC0xNTEsMjIgKzE1OSwxNyBAQCBzdGF0aWMgdm9pZCB2YzRfZGxpc3Rfd3JpdGUoc3RydWN0IHZj NF9wbGFuZV9zdGF0ZSAqdmM0X3N0YXRlLCB1MzIgdmFsKQogCXZjNF9zdGF0ZS0+ZGxpc3RbdmM0 X3N0YXRlLT5kbGlzdF9jb3VudCsrXSA9IHZhbDsKIH0KIAotLyogV3JpdGVzIG91dCBhIGZ1bGwg ZGlzcGxheSBsaXN0IGZvciBhbiBhY3RpdmUgcGxhbmUgdG8gdGhlIHBsYW5lJ3MKLSAqIHByaXZh dGUgZGxpc3Qgc3RhdGUuCi0gKi8KLXN0YXRpYyBpbnQgdmM0X3BsYW5lX21vZGVfc2V0KHN0cnVj dCBkcm1fcGxhbmUgKnBsYW5lLAotCQkJICAgICAgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqc3Rh dGUpCitzdGF0aWMgaW50IHZjNF9wbGFuZV9zZXR1cF9jbGlwcGluZ19hbmRfc2NhbGluZyhzdHJ1 Y3QgZHJtX3BsYW5lX3N0YXRlICpzdGF0ZSkKIHsKIAlzdHJ1Y3QgdmM0X3BsYW5lX3N0YXRlICp2 YzRfc3RhdGUgPSB0b192YzRfcGxhbmVfc3RhdGUoc3RhdGUpOwogCXN0cnVjdCBkcm1fZnJhbWVi dWZmZXIgKmZiID0gc3RhdGUtPmZiOwotCXN0cnVjdCBkcm1fZ2VtX2NtYV9vYmplY3QgKmJvID0g ZHJtX2ZiX2NtYV9nZXRfZ2VtX29iaihmYiwgMCk7Ci0JdTMyIGN0bDBfb2Zmc2V0ID0gdmM0X3N0 YXRlLT5kbGlzdF9jb3VudDsKLQljb25zdCBzdHJ1Y3QgaHZzX2Zvcm1hdCAqZm9ybWF0ID0gdmM0 X2dldF9odnNfZm9ybWF0KGZiLT5waXhlbF9mb3JtYXQpOwotCXVpbnQzMl90IG9mZnNldCA9IGZi LT5vZmZzZXRzWzBdOwotCWludCBjcnRjX3ggPSBzdGF0ZS0+Y3J0Y194OwotCWludCBjcnRjX3kg PSBzdGF0ZS0+Y3J0Y195OwotCWludCBjcnRjX3cgPSBzdGF0ZS0+Y3J0Y193OwotCWludCBjcnRj X2ggPSBzdGF0ZS0+Y3J0Y19oOworCisJdmM0X3N0YXRlLT5vZmZzZXQgPSBmYi0+b2Zmc2V0c1sw XTsKKworCXZjNF9zdGF0ZS0+Y3J0Y194ID0gc3RhdGUtPmNydGNfeDsKKwl2YzRfc3RhdGUtPmNy dGNfeSA9IHN0YXRlLT5jcnRjX3k7CisJdmM0X3N0YXRlLT5jcnRjX3cgPSBzdGF0ZS0+Y3J0Y193 OworCXZjNF9zdGF0ZS0+Y3J0Y19oID0gc3RhdGUtPmNydGNfaDsKIAogCWlmIChzdGF0ZS0+Y3J0 Y193IDw8IDE2ICE9IHN0YXRlLT5zcmNfdyB8fAogCSAgICBzdGF0ZS0+Y3J0Y19oIDw8IDE2ICE9 IHN0YXRlLT5zcmNfaCkgewpAQCAtMTc4LDE4ICsxODEsNDEgQEAgc3RhdGljIGludCB2YzRfcGxh bmVfbW9kZV9zZXQoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCXJldHVybiAtRUlOVkFMOwog CX0KIAotCWlmIChjcnRjX3ggPCAwKSB7Ci0JCW9mZnNldCArPSBkcm1fZm9ybWF0X3BsYW5lX2Nw cChmYi0+cGl4ZWxfZm9ybWF0LCAwKSAqIC1jcnRjX3g7Ci0JCWNydGNfdyArPSBjcnRjX3g7Ci0J CWNydGNfeCA9IDA7CisJaWYgKHZjNF9zdGF0ZS0+Y3J0Y194IDwgMCkgeworCQl2YzRfc3RhdGUt Pm9mZnNldCArPSAoZHJtX2Zvcm1hdF9wbGFuZV9jcHAoZmItPnBpeGVsX2Zvcm1hdCwKKwkJCQkJ CQkgICAwKSAqCisJCQkJICAgICAgLXZjNF9zdGF0ZS0+Y3J0Y194KTsKKwkJdmM0X3N0YXRlLT5j cnRjX3cgKz0gdmM0X3N0YXRlLT5jcnRjX3g7CisJCXZjNF9zdGF0ZS0+Y3J0Y194ID0gMDsKIAl9 CiAKLQlpZiAoY3J0Y195IDwgMCkgewotCQlvZmZzZXQgKz0gZmItPnBpdGNoZXNbMF0gKiAtY3J0 Y195OwotCQljcnRjX2ggKz0gY3J0Y195OwotCQljcnRjX3kgPSAwOworCWlmICh2YzRfc3RhdGUt PmNydGNfeSA8IDApIHsKKwkJdmM0X3N0YXRlLT5vZmZzZXQgKz0gZmItPnBpdGNoZXNbMF0gKiAt dmM0X3N0YXRlLT5jcnRjX3k7CisJCXZjNF9zdGF0ZS0+Y3J0Y19oICs9IHZjNF9zdGF0ZS0+Y3J0 Y195OworCQl2YzRfc3RhdGUtPmNydGNfeSA9IDA7CiAJfQogCisJcmV0dXJuIDA7Cit9CisKKwor LyogV3JpdGVzIG91dCBhIGZ1bGwgZGlzcGxheSBsaXN0IGZvciBhbiBhY3RpdmUgcGxhbmUgdG8g dGhlIHBsYW5lJ3MKKyAqIHByaXZhdGUgZGxpc3Qgc3RhdGUuCisgKi8KK3N0YXRpYyBpbnQgdmM0 X3BsYW5lX21vZGVfc2V0KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAorCQkJICAgICAgc3RydWN0 IGRybV9wbGFuZV9zdGF0ZSAqc3RhdGUpCit7CisJc3RydWN0IHZjNF9wbGFuZV9zdGF0ZSAqdmM0 X3N0YXRlID0gdG9fdmM0X3BsYW5lX3N0YXRlKHN0YXRlKTsKKwlzdHJ1Y3QgZHJtX2ZyYW1lYnVm ZmVyICpmYiA9IHN0YXRlLT5mYjsKKwlzdHJ1Y3QgZHJtX2dlbV9jbWFfb2JqZWN0ICpibyA9IGRy bV9mYl9jbWFfZ2V0X2dlbV9vYmooZmIsIDApOworCXUzMiBjdGwwX29mZnNldCA9IHZjNF9zdGF0 ZS0+ZGxpc3RfY291bnQ7CisJY29uc3Qgc3RydWN0IGh2c19mb3JtYXQgKmZvcm1hdCA9IHZjNF9n ZXRfaHZzX2Zvcm1hdChmYi0+cGl4ZWxfZm9ybWF0KTsKKwlpbnQgcmV0OworCisJcmV0ID0gdmM0 X3BsYW5lX3NldHVwX2NsaXBwaW5nX2FuZF9zY2FsaW5nKHN0YXRlKTsKKwlpZiAocmV0KQorCQly ZXR1cm4gcmV0OworCiAJdmM0X2RsaXN0X3dyaXRlKHZjNF9zdGF0ZSwKIAkJCVNDQUxFUl9DVEww X1ZBTElEIHwKIAkJCShmb3JtYXQtPnBpeGVsX29yZGVyIDw8IFNDQUxFUl9DVEwwX09SREVSX1NI SUZUKSB8CkBAIC0xOTksOCArMjI1LDggQEAgc3RhdGljIGludCB2YzRfcGxhbmVfbW9kZV9zZXQo c3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJLyogUG9zaXRpb24gV29yZCAwOiBJbWFnZSBQb3Np dGlvbnMgYW5kIEFscGhhIFZhbHVlICovCiAJdmM0X2RsaXN0X3dyaXRlKHZjNF9zdGF0ZSwKIAkJ CVZDNF9TRVRfRklFTEQoMHhmZiwgU0NBTEVSX1BPUzBfRklYRURfQUxQSEEpIHwKLQkJCVZDNF9T RVRfRklFTEQoY3J0Y194LCBTQ0FMRVJfUE9TMF9TVEFSVF9YKSB8Ci0JCQlWQzRfU0VUX0ZJRUxE KGNydGNfeSwgU0NBTEVSX1BPUzBfU1RBUlRfWSkpOworCQkJVkM0X1NFVF9GSUVMRCh2YzRfc3Rh dGUtPmNydGNfeCwgU0NBTEVSX1BPUzBfU1RBUlRfWCkgfAorCQkJVkM0X1NFVF9GSUVMRCh2YzRf c3RhdGUtPmNydGNfeSwgU0NBTEVSX1BPUzBfU1RBUlRfWSkpOwogCiAJLyogUG9zaXRpb24gV29y ZCAxOiBTY2FsZWQgSW1hZ2UgRGltZW5zaW9ucy4KIAkgKiBTa2lwcGVkIGR1ZSB0byBTQ0FMRVJf Q1RMMF9VTklUWSBzY2FsaW5nLgpAQCAtMjEyLDggKzIzOCw4IEBAIHN0YXRpYyBpbnQgdmM0X3Bs YW5lX21vZGVfc2V0KHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJCSAgICAgIFNDQUxFUl9Q T1MyX0FMUEhBX01PREVfUElQRUxJTkUgOgogCQkJCSAgICAgIFNDQUxFUl9QT1MyX0FMUEhBX01P REVfRklYRUQsCiAJCQkJICAgICAgU0NBTEVSX1BPUzJfQUxQSEFfTU9ERSkgfAotCQkJVkM0X1NF VF9GSUVMRChjcnRjX3csIFNDQUxFUl9QT1MyX1dJRFRIKSB8Ci0JCQlWQzRfU0VUX0ZJRUxEKGNy dGNfaCwgU0NBTEVSX1BPUzJfSEVJR0hUKSk7CisJCQlWQzRfU0VUX0ZJRUxEKHZjNF9zdGF0ZS0+ Y3J0Y193LCBTQ0FMRVJfUE9TMl9XSURUSCkgfAorCQkJVkM0X1NFVF9GSUVMRCh2YzRfc3RhdGUt PmNydGNfaCwgU0NBTEVSX1BPUzJfSEVJR0hUKSk7CiAKIAkvKiBQb3NpdGlvbiBXb3JkIDM6IENv bnRleHQuICBXcml0dGVuIGJ5IHRoZSBIVlMuICovCiAJdmM0X2RsaXN0X3dyaXRlKHZjNF9zdGF0 ZSwgMHhjMGMwYzBjMCk7CkBAIC0yMjEsNyArMjQ3LDcgQEAgc3RhdGljIGludCB2YzRfcGxhbmVf bW9kZV9zZXQoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJdmM0X3N0YXRlLT5wdzBfb2Zmc2V0 ID0gdmM0X3N0YXRlLT5kbGlzdF9jb3VudDsKIAogCS8qIFBvaW50ZXIgV29yZCAwOiBSR0IgLyBZ IFBvaW50ZXIgKi8KLQl2YzRfZGxpc3Rfd3JpdGUodmM0X3N0YXRlLCBiby0+cGFkZHIgKyBvZmZz ZXQpOworCXZjNF9kbGlzdF93cml0ZSh2YzRfc3RhdGUsIGJvLT5wYWRkciArIHZjNF9zdGF0ZS0+ b2Zmc2V0KTsKIAogCS8qIFBvaW50ZXIgQ29udGV4dCBXb3JkIDA6IFdyaXR0ZW4gYnkgdGhlIEhW UyAqLwogCXZjNF9kbGlzdF93cml0ZSh2YzRfc3RhdGUsIDB4YzBjMGMwYzApOwotLSAKMi43LjAK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZl bCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==