From: Maarten Lankhorst Subject: [PATCH 3/5] drm/i915: Do not adjust scale when out of bounds, v2. Date: Thu, 3 May 2018 13:22:15 +0200 Message-ID: <20180503112217.37292-4-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 V2l0aCB0aGUgcHJldmlvdXMgcGF0Y2ggZHJtX2F0b21pY19oZWxwZXJfY2hlY2tfcGxhbmVfc3Rh dGUgY29ycmVjdGx5CmNhbGN1bGF0ZXMgY2xpcHBpbmcgYW5kIHRoZSB4Zjg2LXZpZGVvLWludGVs IGRkeCBpcyBmaXhlZCB0byBmYWxsIGJhY2sKdG8gR1BVIGNvcnJlY3RseSB3aGVuIFNldFBsYW5l IGZhaWxzLCB3ZSBjYW4gcmVtb3ZlIHRoZSBoYWNrIHdoZXJlCndlIHRyeSB0byBwYW4vem9vbSB3 aGVuIG91dCBvZiBtaW4vbWF4IHNjYWxpbmcgcmFuZ2UuIFRoaXMgd2FzIGFscmVhZHkKcG9vciBi ZWhhdmlvciB3aGVyZSB0aGUgc2NyZWVuIGRpZG4ndCBzaG93IHdoYXQgd2FzIHJlcXVlc3RlZCwg YW5kIG5vdwppbnN0ZWFkIHdlIHJlamVjdCBpdCBvdXRyaWdodC4gVGhpcyBzaW1wbGlmaWVzIGNo ZWNrX3Nwcml0ZV9wbGFuZSBhIGxvdC4KCkNoYW5nZXMgc2luY2UgdjE6Ci0gU2V0IGNydGNfaCB0 byB0aGUgaGVpZ2h0IGNvcnJlY3RseS4KLSBSZWplY3QgPCAzeDMgcmVjdGFuZ2xlcyBpbnN0ZWFk IG9mIG1ha2luZyB0aGVtIGludmlzaWJsZSBmb3IgPGdlbjkuCiAgRm9yIGdlbjkrIHNrbF91cGRh dGVfc2NhbGVyX3BsYW5lIHdpbGwgcmVqZWN0IHRoZW0uCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVu IExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIHwgMTQ0ICsrKysrKystLS0tLS0tLS0tLS0t LS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzNSBpbnNlcnRpb25zKCspLCAxMDkgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCA0NGQ3YWNhMjIyYjAuLjk3 MDAxNWRjYzZmMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRl LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTkzNiwyMiAr OTM2LDEyIEBAIGludGVsX2NoZWNrX3Nwcml0ZV9wbGFuZShzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBs YW5lLAogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUocGxhbmUt PmJhc2UuZGV2KTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0 Y19zdGF0ZS0+YmFzZS5jcnRjKTsKIAlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHN0YXRl LT5iYXNlLmZiOwotCWludCBjcnRjX3gsIGNydGNfeTsKLQl1bnNpZ25lZCBpbnQgY3J0Y193LCBj cnRjX2g7Ci0JdWludDMyX3Qgc3JjX3gsIHNyY195LCBzcmNfdywgc3JjX2g7Ci0Jc3RydWN0IGRy bV9yZWN0ICpzcmMgPSAmc3RhdGUtPmJhc2Uuc3JjOwotCXN0cnVjdCBkcm1fcmVjdCAqZHN0ID0g JnN0YXRlLT5iYXNlLmRzdDsKLQlzdHJ1Y3QgZHJtX3JlY3QgY2xpcCA9IHt9OwogCWludCBtYXhf c3RyaWRlID0gSU5URUxfR0VOKGRldl9wcml2KSA+PSA5ID8gMzI3NjggOiAxNjM4NDsKLQlpbnQg aHNjYWxlLCB2c2NhbGU7CiAJaW50IG1heF9zY2FsZSwgbWluX3NjYWxlOwogCWJvb2wgY2FuX3Nj YWxlOwogCWludCByZXQ7CiAJdWludDMyX3QgcGl4ZWxfZm9ybWF0ID0gMDsKIAotCSpzcmMgPSBk cm1fcGxhbmVfc3RhdGVfc3JjKCZzdGF0ZS0+YmFzZSk7Ci0JKmRzdCA9IGRybV9wbGFuZV9zdGF0 ZV9kZXN0KCZzdGF0ZS0+YmFzZSk7Ci0KIAlpZiAoIWZiKSB7CiAJCXN0YXRlLT5iYXNlLnZpc2li bGUgPSBmYWxzZTsKIAkJcmV0dXJuIDA7CkBAIC05OTAsNjQgKzk4MCwxOSBAQCBpbnRlbF9jaGVj a19zcHJpdGVfcGxhbmUoc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSwKIAkJbWluX3NjYWxlID0g cGxhbmUtPmNhbl9zY2FsZSA/IDEgOiAoMSA8PCAxNik7CiAJfQogCi0JLyoKLQkgKiBGSVhNRSB0 aGUgZm9sbG93aW5nIGNvZGUgZG9lcyBhIGJ1bmNoIG9mIGZ1enp5IGFkanVzdG1lbnRzIHRvIHRo ZQotCSAqIGNvb3JkaW5hdGVzIGFuZCBzaXplcy4gV2UgcHJvYmFibHkgbmVlZCBzb21lIHdheSB0 byBkZWNpZGUgd2hldGhlcgotCSAqIG1vcmUgc3RyaWN0IGNoZWNraW5nIHNob3VsZCBiZSBkb25l IGluc3RlYWQuCi0JICovCi0JZHJtX3JlY3Rfcm90YXRlKHNyYywgZmItPndpZHRoIDw8IDE2LCBm Yi0+aGVpZ2h0IDw8IDE2LAotCQkJc3RhdGUtPmJhc2Uucm90YXRpb24pOwotCi0JaHNjYWxlID0g ZHJtX3JlY3RfY2FsY19oc2NhbGVfcmVsYXhlZChzcmMsIGRzdCwgbWluX3NjYWxlLCBtYXhfc2Nh bGUpOwotCUJVR19PTihoc2NhbGUgPCAwKTsKLQotCXZzY2FsZSA9IGRybV9yZWN0X2NhbGNfdnNj YWxlX3JlbGF4ZWQoc3JjLCBkc3QsIG1pbl9zY2FsZSwgbWF4X3NjYWxlKTsKLQlCVUdfT04odnNj YWxlIDwgMCk7Ci0KLQlpZiAoY3J0Y19zdGF0ZS0+YmFzZS5lbmFibGUpCi0JCWRybV9tb2RlX2dl dF9odl90aW1pbmcoJmNydGNfc3RhdGUtPmJhc2UubW9kZSwKLQkJCQkgICAgICAgJmNsaXAueDIs ICZjbGlwLnkyKTsKLQotCXN0YXRlLT5iYXNlLnZpc2libGUgPSBkcm1fcmVjdF9jbGlwX3NjYWxl ZChzcmMsIGRzdCwgJmNsaXApOwotCi0JY3J0Y194ID0gZHN0LT54MTsKLQljcnRjX3kgPSBkc3Qt PnkxOwotCWNydGNfdyA9IGRybV9yZWN0X3dpZHRoKGRzdCk7Ci0JY3J0Y19oID0gZHJtX3JlY3Rf aGVpZ2h0KGRzdCk7CisJcmV0ID0gZHJtX2F0b21pY19oZWxwZXJfY2hlY2tfcGxhbmVfc3RhdGUo JnN0YXRlLT5iYXNlLAorCQkJCQkJICAmY3J0Y19zdGF0ZS0+YmFzZSwKKwkJCQkJCSAgbWluX3Nj YWxlLCBtYXhfc2NhbGUsCisJCQkJCQkgIHRydWUsIHRydWUpOworCWlmIChyZXQpCisJCXJldHVy biByZXQ7CiAKIAlpZiAoc3RhdGUtPmJhc2UudmlzaWJsZSkgewotCQkvKiBjaGVjayBhZ2FpbiBp biBjYXNlIGNsaXBwaW5nIGNsYW1wZWQgdGhlIHJlc3VsdHMgKi8KLQkJaHNjYWxlID0gZHJtX3Jl Y3RfY2FsY19oc2NhbGUoc3JjLCBkc3QsIG1pbl9zY2FsZSwgbWF4X3NjYWxlKTsKLQkJaWYgKGhz Y2FsZSA8IDApIHsKLQkJCURSTV9ERUJVR19LTVMoIkhvcml6b250YWwgc2NhbGluZyBmYWN0b3Ig b3V0IG9mIGxpbWl0c1xuIik7Ci0JCQlkcm1fcmVjdF9kZWJ1Z19wcmludCgic3JjOiAiLCBzcmMs IHRydWUpOwotCQkJZHJtX3JlY3RfZGVidWdfcHJpbnQoImRzdDogIiwgZHN0LCBmYWxzZSk7Ci0K LQkJCXJldHVybiBoc2NhbGU7Ci0JCX0KLQotCQl2c2NhbGUgPSBkcm1fcmVjdF9jYWxjX3ZzY2Fs ZShzcmMsIGRzdCwgbWluX3NjYWxlLCBtYXhfc2NhbGUpOwotCQlpZiAodnNjYWxlIDwgMCkgewot CQkJRFJNX0RFQlVHX0tNUygiVmVydGljYWwgc2NhbGluZyBmYWN0b3Igb3V0IG9mIGxpbWl0c1xu Iik7Ci0JCQlkcm1fcmVjdF9kZWJ1Z19wcmludCgic3JjOiAiLCBzcmMsIHRydWUpOwotCQkJZHJt X3JlY3RfZGVidWdfcHJpbnQoImRzdDogIiwgZHN0LCBmYWxzZSk7Ci0KLQkJCXJldHVybiB2c2Nh bGU7Ci0JCX0KLQotCQkvKiBNYWtlIHRoZSBzb3VyY2Ugdmlld3BvcnQgc2l6ZSBhbiBleGFjdCBt dWx0aXBsZSBvZiB0aGUgc2NhbGluZyBmYWN0b3JzLiAqLwotCQlkcm1fcmVjdF9hZGp1c3Rfc2l6 ZShzcmMsCi0JCQkJICAgICBkcm1fcmVjdF93aWR0aChkc3QpICogaHNjYWxlIC0gZHJtX3JlY3Rf d2lkdGgoc3JjKSwKLQkJCQkgICAgIGRybV9yZWN0X2hlaWdodChkc3QpICogdnNjYWxlIC0gZHJt X3JlY3RfaGVpZ2h0KHNyYykpOwotCi0JCWRybV9yZWN0X3JvdGF0ZV9pbnYoc3JjLCBmYi0+d2lk dGggPDwgMTYsIGZiLT5oZWlnaHQgPDwgMTYsCi0JCQkJICAgIHN0YXRlLT5iYXNlLnJvdGF0aW9u KTsKLQotCQkvKiBzYW5pdHkgY2hlY2sgdG8gbWFrZSBzdXJlIHRoZSBzcmMgdmlld3BvcnQgd2Fz bid0IGVubGFyZ2VkICovCi0JCVdBUk5fT04oc3JjLT54MSA8IChpbnQpIHN0YXRlLT5iYXNlLnNy Y194IHx8Ci0JCQlzcmMtPnkxIDwgKGludCkgc3RhdGUtPmJhc2Uuc3JjX3kgfHwKLQkJCXNyYy0+ eDIgPiAoaW50KSBzdGF0ZS0+YmFzZS5zcmNfeCArIHN0YXRlLT5iYXNlLnNyY193IHx8Ci0JCQlz cmMtPnkyID4gKGludCkgc3RhdGUtPmJhc2Uuc3JjX3kgKyBzdGF0ZS0+YmFzZS5zcmNfaCk7CisJ CXN0cnVjdCBkcm1fcmVjdCAqc3JjID0gJnN0YXRlLT5iYXNlLnNyYzsKKwkJc3RydWN0IGRybV9y ZWN0ICpkc3QgPSAmc3RhdGUtPmJhc2UuZHN0OworCQl1bnNpZ25lZCBpbnQgY3J0Y193ID0gZHJt X3JlY3Rfd2lkdGgoZHN0KTsKKwkJdW5zaWduZWQgaW50IGNydGNfaCA9IGRybV9yZWN0X2hlaWdo dChkc3QpOworCQl1aW50MzJfdCBzcmNfeCwgc3JjX3ksIHNyY193LCBzcmNfaDsKIAogCQkvKgog CQkgKiBIYXJkd2FyZSBkb2Vzbid0IGhhbmRsZSBzdWJwaXhlbCBjb29yZGluYXRlcy4KQEAgLTEw NjAsNTggKzEwMDUsMzkgQEAgaW50ZWxfY2hlY2tfc3ByaXRlX3BsYW5lKHN0cnVjdCBpbnRlbF9w bGFuZSAqcGxhbmUsCiAJCXNyY195ID0gc3JjLT55MSA+PiAxNjsKIAkJc3JjX2ggPSBkcm1fcmVj dF9oZWlnaHQoc3JjKSA+PiAxNjsKIAotCQlpZiAoaW50ZWxfZm9ybWF0X2lzX3l1dihmYi0+Zm9y bWF0LT5mb3JtYXQpKSB7Ci0JCQlzcmNfeCAmPSB+MTsKLQkJCXNyY193ICY9IH4xOwotCi0JCQkv KgotCQkJICogTXVzdCBrZWVwIHNyYyBhbmQgZHN0IHRoZQotCQkJICogc2FtZSBpZiB3ZSBjYW4n dCBzY2FsZS4KLQkJCSAqLwotCQkJaWYgKCFjYW5fc2NhbGUpCi0JCQkJY3J0Y193ICY9IH4xOwor CQlzcmMtPngxID0gc3JjX3ggPDwgMTY7CisJCXNyYy0+eDIgPSAoc3JjX3ggKyBzcmNfdykgPDwg MTY7CisJCXNyYy0+eTEgPSBzcmNfeSA8PCAxNjsKKwkJc3JjLT55MiA9IChzcmNfeSArIHNyY19o KSA8PCAxNjsKIAotCQkJaWYgKGNydGNfdyA9PSAwKQotCQkJCXN0YXRlLT5iYXNlLnZpc2libGUg PSBmYWxzZTsKKwkJaWYgKGludGVsX2Zvcm1hdF9pc195dXYoZmItPmZvcm1hdC0+Zm9ybWF0KSAm JgorCQkgICAgKHNyY194ICUgMiB8fCBzcmNfdyAlIDIpKSB7CisJCQlEUk1fREVCVUdfS01TKCJz cmMgeC93ICgldSwgJXUpIG11c3QgYmUgYSBtdWx0aXBsZSBvZiAyIGZvciBZVVYgcGxhbmVzXG4i LAorCQkJCSAgICAgIHNyY194LCBzcmNfdyk7CisJCQlyZXR1cm4gLUVJTlZBTDsKIAkJfQotCX0K IAotCS8qIENoZWNrIHNpemUgcmVzdHJpY3Rpb25zIHdoZW4gc2NhbGluZyAqLwotCWlmIChzdGF0 ZS0+YmFzZS52aXNpYmxlICYmIChzcmNfdyAhPSBjcnRjX3cgfHwgc3JjX2ggIT0gY3J0Y19oKSkg ewotCQl1bnNpZ25lZCBpbnQgd2lkdGhfYnl0ZXM7Ci0JCWludCBjcHAgPSBmYi0+Zm9ybWF0LT5j cHBbMF07CisJCS8qIENoZWNrIHNpemUgcmVzdHJpY3Rpb25zIHdoZW4gc2NhbGluZyAqLworCQlp ZiAoc3JjX3cgIT0gY3J0Y193IHx8IHNyY19oICE9IGNydGNfaCkgeworCQkJdW5zaWduZWQgaW50 IHdpZHRoX2J5dGVzOworCQkJaW50IGNwcCA9IGZiLT5mb3JtYXQtPmNwcFswXTsKIAotCQlXQVJO X09OKCFjYW5fc2NhbGUpOworCQkJV0FSTl9PTighY2FuX3NjYWxlKTsKIAotCQkvKiBGSVhNRSBp bnRlcmxhY2luZyBtaW4gaGVpZ2h0IGlzIDYgKi8KKwkJCXdpZHRoX2J5dGVzID0gKChzcmNfeCAq IGNwcCkgJiA2MykgKyBzcmNfdyAqIGNwcDsKIAotCQlpZiAoY3J0Y193IDwgMyB8fCBjcnRjX2gg PCAzKQotCQkJc3RhdGUtPmJhc2UudmlzaWJsZSA9IGZhbHNlOwotCi0JCWlmIChzcmNfdyA8IDMg fHwgc3JjX2ggPCAzKQotCQkJc3RhdGUtPmJhc2UudmlzaWJsZSA9IGZhbHNlOwotCi0JCXdpZHRo X2J5dGVzID0gKChzcmNfeCAqIGNwcCkgJiA2MykgKyBzcmNfdyAqIGNwcDsKLQotCQlpZiAoSU5U RUxfR0VOKGRldl9wcml2KSA8IDkgJiYgKHNyY193ID4gMjA0OCB8fCBzcmNfaCA+IDIwNDggfHwK LQkJICAgIHdpZHRoX2J5dGVzID4gNDA5NiB8fCBmYi0+cGl0Y2hlc1swXSA+IDQwOTYpKSB7Ci0J CQlEUk1fREVCVUdfS01TKCJTb3VyY2UgZGltZW5zaW9ucyBleGNlZWQgaGFyZHdhcmUgbGltaXRz XG4iKTsKLQkJCXJldHVybiAtRUlOVkFMOworCQkJLyogRklYTUUgaW50ZXJsYWNpbmcgbWluIGhl aWdodCBpcyA2ICovCisJCQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDkgJiYgKAorCQkJICAg ICBzcmNfdyA8IDMgfHwgc3JjX2ggPCAzIHx8CisJCQkgICAgIHNyY193ID4gMjA0OCB8fCBzcmNf aCA+IDIwNDggfHwKKwkJCSAgICAgY3J0Y193IDwgMyB8fCBjcnRjX2ggPCAzIHx8CisJCQkgICAg IHdpZHRoX2J5dGVzID4gNDA5NiB8fCBmYi0+cGl0Y2hlc1swXSA+IDQwOTYpKSB7CisJCQkJRFJN X0RFQlVHX0tNUygiU291cmNlIGRpbWVuc2lvbnMgZXhjZWVkIGhhcmR3YXJlIGxpbWl0c1xuIik7 CisJCQkJcmV0dXJuIC1FSU5WQUw7CisJCQl9CiAJCX0KIAl9CiAKLQlpZiAoc3RhdGUtPmJhc2Uu dmlzaWJsZSkgewotCQlzcmMtPngxID0gc3JjX3ggPDwgMTY7Ci0JCXNyYy0+eDIgPSAoc3JjX3gg KyBzcmNfdykgPDwgMTY7Ci0JCXNyYy0+eTEgPSBzcmNfeSA8PCAxNjsKLQkJc3JjLT55MiA9IChz cmNfeSArIHNyY19oKSA8PCAxNjsKLQl9Ci0KLQlkc3QtPngxID0gY3J0Y194OwotCWRzdC0+eDIg PSBjcnRjX3ggKyBjcnRjX3c7Ci0JZHN0LT55MSA9IGNydGNfeTsKLQlkc3QtPnkyID0gY3J0Y195 ICsgY3J0Y19oOwotCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOSkgewogCQlyZXQgPSBz a2xfY2hlY2tfcGxhbmVfc3VyZmFjZShjcnRjX3N0YXRlLCBzdGF0ZSk7CiAJCWlmIChyZXQpCi0t IAoyLjE3LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=