From: Maarten Lankhorst Subject: [PATCH 2/5] drm/rect: Handle rounding errors in drm_rect_clip_scaled, v3. Date: Thu, 3 May 2018 13:22:14 +0200 Message-ID: <20180503112217.37292-3-maarten.lankhorst@linux.intel.com> References: <20180503112217.37292-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180503112217.37292-1-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org SW5zdGVhZCBvZiByZWx5aW5nIG9uIGEgc2NhbGUgd2hpY2ggbWF5IGluY3JlYXNlIHJvdW5kaW5n IGVycm9ycywKY2xpcCBzcmMgYnkgZG9pbmc6IHNyYyAqIChkc3QgLSBjbGlwKSAvIGRzdCBhbmQg cm91bmRpbmcgdGhlIHJlc3VsdAphd2F5IGZyb20gMSwgc28gdGhlIG5ldyBjb29yZGluYXRlcyBn ZXQgY2xvc2VyIHRvIDEuIFdlIHdvbid0IG5lZWQKdG8gZml4IHVwIHdpdGggYSBtYWdpYyBtYWNy byBhZnRlcndhcmRzLCBiZWNhdXNlIG91ciBzY2FsaW5nIGZhY3Rvcgp3aWxsIG5ldmVyIGdvIHRv IHRoZSBvdGhlciBzaWRlIG9mIDEuCgpDaGFuZ2VzIHNpbmNlIHYxOgotIEFkanVzdCBkc3QgaW1t ZWRpYXRlbHksIGVsc2UgZHJtX3JlY3Rfd2lkdGgvaGVpZ2h0IG9uIGRzdCBnaXZlcyBib2d1cwog IHJlc3VsdHMuCkNoYW5nZSBzaW5jZSB2MjoKLSBHZXQgcmlkIG9mIG1hY3JvcyBhbmQgdXNlIDY0 LWJpdHMgbWF0aC4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxh bmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNf aGVscGVyLmMgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2RybV9yZWN0LmMgICAgICAgICAgfCA0 NSArKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfc3ByaXRlLmMgfCAgMiArLQogaW5jbHVkZS9kcm0vZHJtX3JlY3QuaCAgICAgICAgICAgICAg fCAgMyArLQogNCBmaWxlcyBjaGFuZ2VkLCAzNSBpbnNlcnRpb25zKCspLCAxNyBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYyBiL2Ry aXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCmluZGV4IDljYjIyMDlmNmZjOC4uMTMw ZGE1MTk1ZjNiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwpAQCAtNzY2LDcgKzc2 Niw3IEBAIGludCBkcm1fYXRvbWljX2hlbHBlcl9jaGVja19wbGFuZV9zdGF0ZShzdHJ1Y3QgZHJt X3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSwKIAlpZiAoY3J0Y19zdGF0ZS0+ZW5hYmxlKQogCQlk cm1fbW9kZV9nZXRfaHZfdGltaW5nKCZjcnRjX3N0YXRlLT5tb2RlLCAmY2xpcC54MiwgJmNsaXAu eTIpOwogCi0JcGxhbmVfc3RhdGUtPnZpc2libGUgPSBkcm1fcmVjdF9jbGlwX3NjYWxlZChzcmMs IGRzdCwgJmNsaXAsIGhzY2FsZSwgdnNjYWxlKTsKKwlwbGFuZV9zdGF0ZS0+dmlzaWJsZSA9IGRy bV9yZWN0X2NsaXBfc2NhbGVkKHNyYywgZHN0LCAmY2xpcCk7CiAKIAlkcm1fcmVjdF9yb3RhdGVf aW52KHNyYywgZmItPndpZHRoIDw8IDE2LCBmYi0+aGVpZ2h0IDw8IDE2LCByb3RhdGlvbik7CiAK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fcmVjdC5jIGIvZHJpdmVycy9ncHUvZHJt L2RybV9yZWN0LmMKaW5kZXggNDczNTUyNjI5N2FhLi5mNDc3MDYzZjE4ZWEgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9kcm1fcmVjdC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fcmVj dC5jCkBAIC01MCwxMyArNTAsMjEgQEAgYm9vbCBkcm1fcmVjdF9pbnRlcnNlY3Qoc3RydWN0IGRy bV9yZWN0ICpyMSwgY29uc3Qgc3RydWN0IGRybV9yZWN0ICpyMikKIH0KIEVYUE9SVF9TWU1CT0wo ZHJtX3JlY3RfaW50ZXJzZWN0KTsKIAorc3RhdGljIHUzMiBjbGlwX3NjYWxlZCh1MzIgc3JjLCB1 MzIgZHN0LCB1MzIgY2xpcCkKK3sKKwl1NjQgbmV3c3JjID0gbXVsX3UzMl91MzIoc3JjLCBkc3Qg LSBjbGlwKTsKKworCWlmIChzcmMgPCAoZHN0IDw8IDE2KSkKKwkJcmV0dXJuIERJVl9ST1VORF9V UF9VTEwobmV3c3JjLCBkc3QpOworCWVsc2UKKwkJcmV0dXJuIERJVl9ST1VORF9ET1dOX1VMTChu ZXdzcmMsIGRzdCk7Cit9CisKIC8qKgogICogZHJtX3JlY3RfY2xpcF9zY2FsZWQgLSBwZXJmb3Jt IGEgc2NhbGVkIGNsaXAgb3BlcmF0aW9uCiAgKiBAc3JjOiBzb3VyY2Ugd2luZG93IHJlY3Rhbmds ZQogICogQGRzdDogZGVzdGluYXRpb24gd2luZG93IHJlY3RhbmdsZQogICogQGNsaXA6IGNsaXAg cmVjdGFuZ2xlCi0gKiBAaHNjYWxlOiBob3Jpem9udGFsIHNjYWxpbmcgZmFjdG9yCi0gKiBAdnNj YWxlOiB2ZXJ0aWNhbCBzY2FsaW5nIGZhY3RvcgogICoKICAqIENsaXAgcmVjdGFuZ2xlIEBkc3Qg YnkgcmVjdGFuZ2xlIEBjbGlwLiBDbGlwIHJlY3RhbmdsZSBAc3JjIGJ5IHRoZQogICogc2FtZSBh bW91bnRzIG11bHRpcGxpZWQgYnkgQGhzY2FsZSBhbmQgQHZzY2FsZS4KQEAgLTY2LDMzICs3NCw0 NCBAQCBFWFBPUlRfU1lNQk9MKGRybV9yZWN0X2ludGVyc2VjdCk7CiAgKiAlZmFsc2Ugb3RoZXJ3 aXNlCiAgKi8KIGJvb2wgZHJtX3JlY3RfY2xpcF9zY2FsZWQoc3RydWN0IGRybV9yZWN0ICpzcmMs IHN0cnVjdCBkcm1fcmVjdCAqZHN0LAotCQkJICBjb25zdCBzdHJ1Y3QgZHJtX3JlY3QgKmNsaXAs Ci0JCQkgIGludCBoc2NhbGUsIGludCB2c2NhbGUpCisJCQkgIGNvbnN0IHN0cnVjdCBkcm1fcmVj dCAqY2xpcCkKIHsKIAlpbnQgZGlmZjsKIAogCWRpZmYgPSBjbGlwLT54MSAtIGRzdC0+eDE7CiAJ aWYgKGRpZmYgPiAwKSB7Ci0JCWludDY0X3QgdG1wID0gc3JjLT54MSArIChpbnQ2NF90KSBkaWZm ICogaHNjYWxlOwotCQlzcmMtPngxID0gY2xhbXBfdChpbnQ2NF90LCB0bXAsIElOVF9NSU4sIElO VF9NQVgpOworCQl1MzIgbmV3X3NyY193ID0gY2xpcF9zY2FsZWQoZHJtX3JlY3Rfd2lkdGgoc3Jj KSwKKwkJCQkJICAgIGRybV9yZWN0X3dpZHRoKGRzdCksIGRpZmYpOworCisJCXNyYy0+eDEgPSBj bGFtcF90KGludDY0X3QsIHNyYy0+eDIgLSBuZXdfc3JjX3csIElOVF9NSU4sIElOVF9NQVgpOwor CQlkc3QtPngxID0gY2xpcC0+eDE7CiAJfQogCWRpZmYgPSBjbGlwLT55MSAtIGRzdC0+eTE7CiAJ aWYgKGRpZmYgPiAwKSB7Ci0JCWludDY0X3QgdG1wID0gc3JjLT55MSArIChpbnQ2NF90KSBkaWZm ICogdnNjYWxlOwotCQlzcmMtPnkxID0gY2xhbXBfdChpbnQ2NF90LCB0bXAsIElOVF9NSU4sIElO VF9NQVgpOworCQl1MzIgbmV3X3NyY19oID0gY2xpcF9zY2FsZWQoZHJtX3JlY3RfaGVpZ2h0KHNy YyksCisJCQkJCSAgICBkcm1fcmVjdF9oZWlnaHQoZHN0KSwgZGlmZik7CisKKwkJc3JjLT55MSA9 IGNsYW1wX3QoaW50NjRfdCwgc3JjLT55MiAtIG5ld19zcmNfaCwgSU5UX01JTiwgSU5UX01BWCk7 CisJCWRzdC0+eTEgPSBjbGlwLT55MTsKIAl9CiAJZGlmZiA9IGRzdC0+eDIgLSBjbGlwLT54MjsK IAlpZiAoZGlmZiA+IDApIHsKLQkJaW50NjRfdCB0bXAgPSBzcmMtPngyIC0gKGludDY0X3QpIGRp ZmYgKiBoc2NhbGU7Ci0JCXNyYy0+eDIgPSBjbGFtcF90KGludDY0X3QsIHRtcCwgSU5UX01JTiwg SU5UX01BWCk7CisJCXUzMiBuZXdfc3JjX3cgPSBjbGlwX3NjYWxlZChkcm1fcmVjdF93aWR0aChz cmMpLAorCQkJCQkgICAgZHJtX3JlY3Rfd2lkdGgoZHN0KSwgZGlmZik7CisKKwkJc3JjLT54MiA9 IGNsYW1wX3QoaW50NjRfdCwgc3JjLT54MSArIG5ld19zcmNfdywgSU5UX01JTiwgSU5UX01BWCk7 CisJCWRzdC0+eDIgPSBjbGlwLT54MjsKIAl9CiAJZGlmZiA9IGRzdC0+eTIgLSBjbGlwLT55MjsK IAlpZiAoZGlmZiA+IDApIHsKLQkJaW50NjRfdCB0bXAgPSBzcmMtPnkyIC0gKGludDY0X3QpIGRp ZmYgKiB2c2NhbGU7Ci0JCXNyYy0+eTIgPSBjbGFtcF90KGludDY0X3QsIHRtcCwgSU5UX01JTiwg SU5UX01BWCk7CisJCXUzMiBuZXdfc3JjX2ggPSBjbGlwX3NjYWxlZChkcm1fcmVjdF9oZWlnaHQo c3JjKSwKKwkJCQkJICAgIGRybV9yZWN0X2hlaWdodChkc3QpLCBkaWZmKTsKKworCQlzcmMtPnky ID0gY2xhbXBfdChpbnQ2NF90LCBzcmMtPnkxICsgbmV3X3NyY19oLCBJTlRfTUlOLCBJTlRfTUFY KTsKKwkJZHN0LT55MiA9IGNsaXAtPnkyOwogCX0KIAotCXJldHVybiBkcm1fcmVjdF9pbnRlcnNl Y3QoZHN0LCBjbGlwKTsKKwlyZXR1cm4gZHJtX3JlY3RfdmlzaWJsZShkc3QpOwogfQogRVhQT1JU X1NZTUJPTChkcm1fcmVjdF9jbGlwX3NjYWxlZCk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3By aXRlLmMKaW5kZXggYWExZGZhYTY5MmI5Li40NGQ3YWNhMjIyYjAgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3Nwcml0ZS5jCkBAIC0xMDA4LDcgKzEwMDgsNyBAQCBpbnRlbF9jaGVja19zcHJpdGVf cGxhbmUoc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSwKIAkJZHJtX21vZGVfZ2V0X2h2X3RpbWlu ZygmY3J0Y19zdGF0ZS0+YmFzZS5tb2RlLAogCQkJCSAgICAgICAmY2xpcC54MiwgJmNsaXAueTIp OwogCi0Jc3RhdGUtPmJhc2UudmlzaWJsZSA9IGRybV9yZWN0X2NsaXBfc2NhbGVkKHNyYywgZHN0 LCAmY2xpcCwgaHNjYWxlLCB2c2NhbGUpOworCXN0YXRlLT5iYXNlLnZpc2libGUgPSBkcm1fcmVj dF9jbGlwX3NjYWxlZChzcmMsIGRzdCwgJmNsaXApOwogCiAJY3J0Y194ID0gZHN0LT54MTsKIAlj cnRjX3kgPSBkc3QtPnkxOwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vZHJtX3JlY3QuaCBiL2lu Y2x1ZGUvZHJtL2RybV9yZWN0LmgKaW5kZXggNDRiYzEyMmI5ZWUwLi42YzU0NTQ0YTRiZTcgMTAw NjQ0Ci0tLSBhL2luY2x1ZGUvZHJtL2RybV9yZWN0LmgKKysrIGIvaW5jbHVkZS9kcm0vZHJtX3Jl Y3QuaApAQCAtMTc1LDggKzE3NSw3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBkcm1fcmVjdF9lcXVh bHMoY29uc3Qgc3RydWN0IGRybV9yZWN0ICpyMSwKIAogYm9vbCBkcm1fcmVjdF9pbnRlcnNlY3Qo c3RydWN0IGRybV9yZWN0ICpyLCBjb25zdCBzdHJ1Y3QgZHJtX3JlY3QgKmNsaXApOwogYm9vbCBk cm1fcmVjdF9jbGlwX3NjYWxlZChzdHJ1Y3QgZHJtX3JlY3QgKnNyYywgc3RydWN0IGRybV9yZWN0 ICpkc3QsCi0JCQkgIGNvbnN0IHN0cnVjdCBkcm1fcmVjdCAqY2xpcCwKLQkJCSAgaW50IGhzY2Fs ZSwgaW50IHZzY2FsZSk7CisJCQkgIGNvbnN0IHN0cnVjdCBkcm1fcmVjdCAqY2xpcCk7CiBpbnQg ZHJtX3JlY3RfY2FsY19oc2NhbGUoY29uc3Qgc3RydWN0IGRybV9yZWN0ICpzcmMsCiAJCQkgY29u c3Qgc3RydWN0IGRybV9yZWN0ICpkc3QsCiAJCQkgaW50IG1pbl9oc2NhbGUsIGludCBtYXhfaHNj YWxlKTsKLS0gCjIuMTcuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==