From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1373C2BA83 for ; Wed, 12 Feb 2020 16:17:53 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AD74220714 for ; Wed, 12 Feb 2020 16:17:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AD74220714 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 568166F53F; Wed, 12 Feb 2020 16:17:53 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id B08046F53F for ; Wed, 12 Feb 2020 16:17:51 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Feb 2020 08:17:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,433,1574150400"; d="scan'208";a="226912021" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by orsmga008.jf.intel.com with SMTP; 12 Feb 2020 08:17:47 -0800 Received: by stinkbox (sSMTP sendmail emulation); Wed, 12 Feb 2020 18:17:47 +0200 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Date: Wed, 12 Feb 2020 18:17:33 +0200 Message-Id: <20200212161738.28141-4-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200212161738.28141-1-ville.syrjala@linux.intel.com> References: <20200212161738.28141-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v2 3/8] drm/i915: Fix skl+ non-scaled pfit modes X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkZp eCBza2xfdXBkYXRlX3NjYWxlcl9jcnRjKCkgdG8gZGVhbCB3aXRoIGRpZmZlcmVudCBzY2FsaW5n Cm1vZGVzIGNvcnJlY3RseS4gVGhlIGN1cnJlbnQgaW1wbGVtZW50YXRpb24gYXNzdW1lcwpEUk1f TU9ERV9TQ0FMRV9GVUxMU0NSRUVOLiBGb3J0dW5hdGVseSB3ZSBkb24ndCBleHBvc2UgYW55CmJv cmRlciBwcm9wZXJ0aWVzIGN1cnJlbnRseSBzbyB0aGUgY29kZSBkb2VzIGFjdHVhbGx5IGVuZAp1 cCBkb2luZyB0aGUgcmlnaHQgdGhpbmcgKGFzc2lnbmluZyBhIHNjYWxlciBmb3IgcGZpdCkuClRo ZSBjb2RlIGRvZXMgbmVlZCB0byBiZSBmaXhlZCBiZWZvcmUgYW55IGJvcmRlcnMgYXJlCmV4cG9z ZWQuCgpBbHNvIHdlIGhhdmUgcmVkdW5kYW50IGNhbGxzIHRvIHNrbF91cGRhdGVfc2NhbGVyX2Ny dGMoKSBpbgpkcC9oZG1pIC5jb21wdXRlX2NvbmZpZygpIHdoaWNoIGNhbiBiZSBudWtlZC4gVGhl eSB3ZXJlIGFueXdheQpjYWxsZWQgYmVmb3JlIHdlIGhhZCBldmVuIGNvbXB1dGVkIHRoZSBwZml0 IHN0YXRlIHNvIHdlcmUKYmFzaWNhbGx5IG5vbnNlbnNlLiBUaGUgcmVhbCBjYWxsIHdlIG5lZWQg dG8ga2VlcCBpcyBpbgppbnRlbF9jcnRjX2F0b21pY19jaGVjaygpLgoKdjI6IERlYWwgd2l0cmgg c2tsX3VwZGF0ZV9zY2FsZXJfY3J0YygpIGluIGludGVsX2RwX3ljYmNyNDIwX2NvbmZpZygpCgpT aWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXguaW50ZWwu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5jIHwg NDAgKysrKysrKysrKy0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50 ZWxfZGlzcGxheS5oIHwgIDEgLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9k cC5jICAgICAgfCAxNSAtLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRl bF9oZG1pLmMgICAgfCAgNiAtLS0KIDQgZmlsZXMgY2hhbmdlZCwgMTkgaW5zZXJ0aW9ucygrKSwg NDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxh eS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rp c3BsYXkuYwppbmRleCBkZTUwYWEwYjA3NmMuLmJlY2M2MzIyYjdkYyAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKQEAgLTYxMDEsMzAgKzYxMDEsMjgg QEAgc2tsX3VwZGF0ZV9zY2FsZXIoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUs IGJvb2wgZm9yY2VfZGV0YWNoLAogCXJldHVybiAwOwogfQogCi0vKioKLSAqIHNrbF91cGRhdGVf c2NhbGVyX2NydGMgLSBTdGFnZXMgdXBkYXRlIHRvIHNjYWxlciBzdGF0ZSBmb3IgYSBnaXZlbiBj cnRjLgotICoKLSAqIEBzdGF0ZTogY3J0YydzIHNjYWxlciBzdGF0ZQotICoKLSAqIFJldHVybgot ICogICAgIDAgLSBzY2FsZXJfdXNhZ2UgdXBkYXRlZCBzdWNjZXNzZnVsbHkKLSAqICAgIGVycm9y IC0gcmVxdWVzdGVkIHNjYWxpbmcgY2Fubm90IGJlIHN1cHBvcnRlZCBvciBvdGhlciBlcnJvciBj b25kaXRpb24KLSAqLwotaW50IHNrbF91cGRhdGVfc2NhbGVyX2NydGMoc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKnN0YXRlKQorc3RhdGljIGludCBza2xfdXBkYXRlX3NjYWxlcl9jcnRjKHN0cnVj dCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogewotCWNvbnN0IHN0cnVjdCBkcm1fZGlz cGxheV9tb2RlICphZGp1c3RlZF9tb2RlID0gJnN0YXRlLT5ody5hZGp1c3RlZF9tb2RlOwotCWJv b2wgbmVlZF9zY2FsZXIgPSBmYWxzZTsKKwljb25zdCBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAq YWRqdXN0ZWRfbW9kZSA9CisJCSZjcnRjX3N0YXRlLT5ody5hZGp1c3RlZF9tb2RlOworCWludCB3 aWR0aCwgaGVpZ2h0OwogCi0JaWYgKHN0YXRlLT5vdXRwdXRfZm9ybWF0ID09IElOVEVMX09VVFBV VF9GT1JNQVRfWUNCQ1I0MjAgfHwKLQkgICAgc3RhdGUtPnBjaF9wZml0LmVuYWJsZWQpCi0JCW5l ZWRfc2NhbGVyID0gdHJ1ZTsKKwlpZiAoY3J0Y19zdGF0ZS0+cGNoX3BmaXQuZW5hYmxlZCkgewor CQl1MzIgcGZpdF9zaXplID0gY3J0Y19zdGF0ZS0+cGNoX3BmaXQuc2l6ZTsKKworCQl3aWR0aCA9 IHBmaXRfc2l6ZSA+PiAxNjsKKwkJaGVpZ2h0ID0gcGZpdF9zaXplICYgMHhmZmZmOworCX0gZWxz ZSB7CisJCXdpZHRoID0gYWRqdXN0ZWRfbW9kZS0+Y3J0Y19oZGlzcGxheTsKKwkJaGVpZ2h0ID0g YWRqdXN0ZWRfbW9kZS0+Y3J0Y192ZGlzcGxheTsKKwl9CiAKLQlyZXR1cm4gc2tsX3VwZGF0ZV9z Y2FsZXIoc3RhdGUsICFzdGF0ZS0+aHcuYWN0aXZlLCBTS0xfQ1JUQ19JTkRFWCwKLQkJCQkgJnN0 YXRlLT5zY2FsZXJfc3RhdGUuc2NhbGVyX2lkLAotCQkJCSBzdGF0ZS0+cGlwZV9zcmNfdywgc3Rh dGUtPnBpcGVfc3JjX2gsCi0JCQkJIGFkanVzdGVkX21vZGUtPmNydGNfaGRpc3BsYXksCi0JCQkJ IGFkanVzdGVkX21vZGUtPmNydGNfdmRpc3BsYXksIE5VTEwsIDAsCi0JCQkJIG5lZWRfc2NhbGVy KTsKKwlyZXR1cm4gc2tsX3VwZGF0ZV9zY2FsZXIoY3J0Y19zdGF0ZSwgIWNydGNfc3RhdGUtPmh3 LmFjdGl2ZSwKKwkJCQkgU0tMX0NSVENfSU5ERVgsCisJCQkJICZjcnRjX3N0YXRlLT5zY2FsZXJf c3RhdGUuc2NhbGVyX2lkLAorCQkJCSBjcnRjX3N0YXRlLT5waXBlX3NyY193LCBjcnRjX3N0YXRl LT5waXBlX3NyY19oLAorCQkJCSB3aWR0aCwgaGVpZ2h0LCBOVUxMLCAwLAorCQkJCSBjcnRjX3N0 YXRlLT5wY2hfcGZpdC5lbmFibGVkKTsKIH0KIAogLyoqCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2Rpc3BsYXkvaW50ZWxfZGlzcGxheS5oCmluZGV4IDc1NDM4YTEzNmQ1OC4uNjI5MWQzZGJjNTEz IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXku aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3BsYXkuaApAQCAt NTg0LDcgKzU4NCw2IEBAIHZvaWQgaW50ZWxfY3J0Y19hcm1fZmlmb191bmRlcnJ1bihzdHJ1Y3Qg aW50ZWxfY3J0YyAqY3J0YywKIAkJCQkgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0 YXRlKTsKIAogdTE2IHNrbF9zY2FsZXJfY2FsY19waGFzZShpbnQgc3ViLCBpbnQgc2NhbGUsIGJv b2wgY2hyb21hX2NlbnRlcik7Ci1pbnQgc2tsX3VwZGF0ZV9zY2FsZXJfY3J0YyhzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSk7CiB2b2lkIHNrbF9zY2FsZXJfZGlzYWJsZShjb25z dCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUpOwogdm9pZCBpbGtfcGZp dF9kaXNhYmxlKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSk7 CiB1MzIgZ2xrX3BsYW5lX2NvbG9yX2N0bChjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAq Y3J0Y19zdGF0ZSwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50 ZWxfZHAuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfZHAuYwppbmRleCBm NGRlZGU2MjUzZjguLmE4MjdlYWM4YWNjMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvZGlzcGxheS9pbnRlbF9kcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkv aW50ZWxfZHAuYwpAQCAtMjMwNyw3ICsyMzA3LDYgQEAgaW50ZWxfZHBfeWNiY3I0MjBfY29uZmln KHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsCiAJY29uc3Qgc3RydWN0IGRybV9kaXNwbGF5X21v ZGUgKmFkanVzdGVkX21vZGUgPQogCQkmY3J0Y19zdGF0ZS0+aHcuYWRqdXN0ZWRfbW9kZTsKIAlz dHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Y19zdGF0ZS0+dWFwaS5j cnRjKTsKLQlpbnQgcmV0OwogCiAJaWYgKCFkcm1fbW9kZV9pc180MjBfb25seShpbmZvLCBhZGp1 c3RlZF9tb2RlKSB8fAogCSAgICAhaW50ZWxfZHBfZ2V0X2NvbG9yaW1ldHJ5X3N0YXR1cyhpbnRl bF9kcCkgfHwKQEAgLTIzMTYsMTMgKzIzMTUsNiBAQCBpbnRlbF9kcF95Y2JjcjQyMF9jb25maWco c3RydWN0IGludGVsX2RwICppbnRlbF9kcCwKIAogCWNydGNfc3RhdGUtPm91dHB1dF9mb3JtYXQg PSBJTlRFTF9PVVRQVVRfRk9STUFUX1lDQkNSNDIwOwogCi0JLyogWUNCQ1IgNDIwIG91dHB1dCBj b252ZXJzaW9uIG5lZWRzIGEgc2NhbGVyICovCi0JcmV0ID0gc2tsX3VwZGF0ZV9zY2FsZXJfY3J0 YyhjcnRjX3N0YXRlKTsKLQlpZiAocmV0KSB7Ci0JCURSTV9ERUJVR19LTVMoIlNjYWxlciBhbGxv Y2F0aW9uIGZvciBvdXRwdXQgZmFpbGVkXG4iKTsKLQkJcmV0dXJuIHJldDsKLQl9Ci0KIAlpbnRl bF9wY2hfcGFuZWxfZml0dGluZyhjcnRjLCBjcnRjX3N0YXRlLCBEUk1fTU9ERV9TQ0FMRV9GVUxM U0NSRUVOKTsKIAogCXJldHVybiAwOwpAQCAtMjQwMCw3ICsyMzkyLDYgQEAgaW50ZWxfZHBfY29t cHV0ZV9jb25maWcoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJZWxzZQogCQlyZXQg PSBpbnRlbF9kcF95Y2JjcjQyMF9jb25maWcoaW50ZWxfZHAsICZpbnRlbF9jb25uZWN0b3ItPmJh c2UsCiAJCQkJCSAgICAgICBwaXBlX2NvbmZpZyk7Ci0KIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0 OwogCkBAIC0yNDE2LDEyICsyNDA3LDYgQEAgaW50ZWxfZHBfY29tcHV0ZV9jb25maWcoc3RydWN0 IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJCWludGVsX2ZpeGVkX3BhbmVsX21vZGUoaW50ZWxf Y29ubmVjdG9yLT5wYW5lbC5maXhlZF9tb2RlLAogCQkJCSAgICAgICBhZGp1c3RlZF9tb2RlKTsK IAotCQlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA5KSB7Ci0JCQlyZXQgPSBza2xfdXBkYXRl X3NjYWxlcl9jcnRjKHBpcGVfY29uZmlnKTsKLQkJCWlmIChyZXQpCi0JCQkJcmV0dXJuIHJldDsK LQkJfQotCiAJCWlmIChIQVNfR01DSChkZXZfcHJpdikpCiAJCQlpbnRlbF9nbWNoX3BhbmVsX2Zp dHRpbmcoaW50ZWxfY3J0YywgcGlwZV9jb25maWcsCiAJCQkJCQkgY29ubl9zdGF0ZS0+c2NhbGlu Z19tb2RlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxf aGRtaS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9oZG1pLmMKaW5kZXgg ZTY4YmFmYjc2Y2IxLi4xZTQyYjAxMDQ1YjEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2Rpc3BsYXkvaW50ZWxfaGRtaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3Bs YXkvaW50ZWxfaGRtaS5jCkBAIC0yMzA4LDEyICsyMzA4LDYgQEAgaW50ZWxfaGRtaV95Y2JjcjQy MF9jb25maWcoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwKIAogCWNvbmZpZy0+b3V0 cHV0X2Zvcm1hdCA9IElOVEVMX09VVFBVVF9GT1JNQVRfWUNCQ1I0MjA7CiAKLQkvKiBZQ0JDUiA0 MjAgb3V0cHV0IGNvbnZlcnNpb24gbmVlZHMgYSBzY2FsZXIgKi8KLQlpZiAoc2tsX3VwZGF0ZV9z Y2FsZXJfY3J0Yyhjb25maWcpKSB7Ci0JCURSTV9ERUJVR19LTVMoIlNjYWxlciBhbGxvY2F0aW9u IGZvciBvdXRwdXQgZmFpbGVkXG4iKTsKLQkJcmV0dXJuIGZhbHNlOwotCX0KLQogCWludGVsX3Bj aF9wYW5lbF9maXR0aW5nKGludGVsX2NydGMsIGNvbmZpZywKIAkJCQlEUk1fTU9ERV9TQ0FMRV9G VUxMU0NSRUVOKTsKIAotLSAKMi4yNC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK