From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 12/15] drm/i915/gen11: Program the scalers
 correctly for planar formats.
Date: Wed, 19 Sep 2018 15:56:41 +0200
Message-ID: <20180919135644.14182-13-maarten.lankhorst@linux.intel.com>
References: <20180919135644.14182-1-maarten.lankhorst@linux.intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mblankhorst.nl (mblankhorst.nl
 [IPv6:2a02:2308::216:3eff:fe92:dfa3])
 by gabe.freedesktop.org (Postfix) with ESMTPS id BEF5E6E4FF
 for <intel-gfx@lists.freedesktop.org>; Wed, 19 Sep 2018 13:56:53 +0000 (UTC)
In-Reply-To: <20180919135644.14182-1-maarten.lankhorst@linux.intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

VGhlIGZpcnN0IDMgcGxhbmVzIChwcmltYXJ5LCBzcHJpdGUgMCBhbmQgMSkgaGF2ZSBhIGRlZGlj
YXRlZCBjaHJvbWEKdXBzYW1wbGVyIHRvIHVwc2NhbGUgWVVWNDIwIHRvIFlVVjQ0NCBhbmQgdGhl
IHNjYWxlciBzaG91bGQgb25seSBiZQp1c2VkIGZvciB1cHNjYWxpbmcuIEJlY2F1c2Ugb2YgdGhp
cyB3ZSBzaG91bGRuJ3QgcHJvZ3JhbSB0aGUgc2NhbGVycwppbiBwbGFuYXIgbW9kZSBpZiBOVjEy
IGFuZCB0aGUgY2hyb21hIHVwc2FtcGxlciBhcmUgdXNlZC4gSW5zdGVhZApwcm9ncmFtIHRoZSBz
Y2FsZXJzIGxpa2Ugb24gbm9ybWFsIHBsYW5lcy4KClNwcml0ZSAyIGFuZCAzIGhhdmUgbm8gZGVk
aWNhdGVkIHNjYWxlciwgYW5kIG5lZWQgdG8gcHJvZ3JhbSB0aGUKc2VsZWN0ZWQgWSBwbGFuZSBp
biB0aGUgc2NhbGVyIG1vZGUuCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFh
cnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1
L2k5MTVfcmVnLmggICAgICB8ICAyICsrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9t
aWMuYyAgfCAgNiArKysrKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8
IDMwICsrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX2Rydi5oICAgICB8ICA4ICsrKysrKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9z
cHJpdGUuYyAgfCAgMyArKy0KIDUgZmlsZXMgY2hhbmdlZCwgMzQgaW5zZXJ0aW9ucygrKSwgMTUg
ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcu
aCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKaW5kZXggZTdlNmNhN2Y5NjY1Li4x
YjU5ZDE1YWFmNTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgK
KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaApAQCAtNjg3Miw2ICs2ODcyLDgg
QEAgZW51bSB7CiAjZGVmaW5lIFBTX1ZBREFQVF9NT0RFX0xFQVNUX0FEQVBUICgwIDw8IDUpCiAj
ZGVmaW5lIFBTX1ZBREFQVF9NT0RFX01PRF9BREFQVCAgICgxIDw8IDUpCiAjZGVmaW5lIFBTX1ZB
REFQVF9NT0RFX01PU1RfQURBUFQgICgzIDw8IDUpCisjZGVmaW5lIFBTX1BMQU5FX1lfU0VMX01B
U0sgICg3IDw8IDUpCisjZGVmaW5lIFBTX1BMQU5FX1lfU0VMKHBsYW5lKSAoKChwbGFuZSkgKyAx
KSA8PCA1KQogCiAjZGVmaW5lIF9QU19QV1JfR0FURV8xQSAgICAgMHg2ODE2MAogI2RlZmluZSBf
UFNfUFdSX0dBVEVfMkEgICAgIDB4NjgyNjAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX2F0b21pYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfYXRvbWljLmMK
aW5kZXggNDBmYmEzZjIyZjg3Li5mZDkyYzcxMGQyOTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX2F0b21pYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X2F0b21pYy5jCkBAIC0yMzQsOSArMjM0LDEzIEBAIHN0YXRpYyB2b2lkIGludGVsX2F0b21pY19z
ZXR1cF9zY2FsZXIoc3RydWN0IGludGVsX2NydGNfc2NhbGVyX3N0YXRlICpzY2FsZXJfc3RhCiAJ
CWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID09IDkgJiYKIAkJICAgICFJU19HRU1JTklMQUtFKGRl
dl9wcml2KSkKIAkJCW1vZGUgPSBTS0xfUFNfU0NBTEVSX01PREVfTlYxMjsKLQkJZWxzZQorCQll
bHNlIGlmICghaWNsX2lzX2hkcl9wbGFuZSh0b19pbnRlbF9wbGFuZShwbGFuZV9zdGF0ZS0+YmFz
ZS5wbGFuZSkpKSB7CiAJCQltb2RlID0gUFNfU0NBTEVSX01PREVfUExBTkFSOwogCisJCQlpZiAo
cGxhbmVfc3RhdGUtPmxpbmtlZF9wbGFuZSkKKwkJCQltb2RlIHw9IFBTX1BMQU5FX1lfU0VMKHBs
YW5lX3N0YXRlLT5saW5rZWRfcGxhbmUtPmlkKTsKKwkJfSBlbHNlCisJCQltb2RlID0gUFNfU0NB
TEVSX01PREVfUEFDS0VEOwogCX0gZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+IDkgfHwg
SVNfR0VNSU5JTEFLRShkZXZfcHJpdikpIHsKIAkJbW9kZSA9IFBTX1NDQUxFUl9NT0RFX1BBQ0tF
RDsKIAl9IGVsc2UgaWYgKG51bV9zY2FsZXJzX25lZWQgPT0gMSAmJiBpbnRlbF9jcnRjLT5udW1f
c2NhbGVycyA+IDEpIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp
c3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBhNTM5
NTNkZjZjOWYuLjVhODI5NDZkMGQ5NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku
YwpAQCAtNDg0Miw4ICs0ODQyLDcgQEAgc3RhdGljIGludAogc2tsX3VwZGF0ZV9zY2FsZXIoc3Ry
dWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsIGJvb2wgZm9yY2VfZGV0YWNoLAogCQkg
IHVuc2lnbmVkIGludCBzY2FsZXJfdXNlciwgaW50ICpzY2FsZXJfaWQsCiAJCSAgaW50IHNyY193
LCBpbnQgc3JjX2gsIGludCBkc3RfdywgaW50IGRzdF9oLAotCQkgIGJvb2wgcGxhbmVfc2NhbGVy
X2NoZWNrLAotCQkgIHVpbnQzMl90IHBpeGVsX2Zvcm1hdCkKKwkJICBjb25zdCBzdHJ1Y3QgZHJt
X2Zvcm1hdF9pbmZvICpmb3JtYXQsIGJvb2wgbmVlZF9zY2FsaW5nKQogewogCXN0cnVjdCBpbnRl
bF9jcnRjX3NjYWxlcl9zdGF0ZSAqc2NhbGVyX3N0YXRlID0KIAkJJmNydGNfc3RhdGUtPnNjYWxl
cl9zdGF0ZTsKQEAgLTQ4NTIsMTggKzQ4NTEsMTQgQEAgc2tsX3VwZGF0ZV9zY2FsZXIoc3RydWN0
IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsIGJvb2wgZm9yY2VfZGV0YWNoLAogCXN0cnVj
dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoaW50ZWxfY3J0Yy0+YmFzZS5k
ZXYpOwogCWNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3RlZF9tb2RlID0KIAkJ
JmNydGNfc3RhdGUtPmJhc2UuYWRqdXN0ZWRfbW9kZTsKLQlpbnQgbmVlZF9zY2FsaW5nOwogCiAJ
LyoKIAkgKiBTcmMgY29vcmRpbmF0ZXMgYXJlIGFscmVhZHkgcm90YXRlZCBieSAyNzAgZGVncmVl
cyBmb3IKIAkgKiB0aGUgOTAvMjcwIGRlZ3JlZSBwbGFuZSByb3RhdGlvbiBjYXNlcyAodG8gbWF0
Y2ggdGhlCiAJICogR1RUIG1hcHBpbmcpLCBoZW5jZSBubyBuZWVkIHRvIGFjY291bnQgZm9yIHJv
dGF0aW9uIGhlcmUuCiAJICovCi0JbmVlZF9zY2FsaW5nID0gc3JjX3cgIT0gZHN0X3cgfHwgc3Jj
X2ggIT0gZHN0X2g7Ci0KLQlpZiAocGxhbmVfc2NhbGVyX2NoZWNrKQotCQlpZiAocGl4ZWxfZm9y
bWF0ID09IERSTV9GT1JNQVRfTlYxMikKLQkJCW5lZWRfc2NhbGluZyA9IHRydWU7CisJaWYgKHNy
Y193ICE9IGRzdF93IHx8IHNyY19oICE9IGRzdF9oKQorCQluZWVkX3NjYWxpbmcgPSB0cnVlOwog
CiAJaWYgKGNydGNfc3RhdGUtPnljYmNyNDIwICYmIHNjYWxlcl91c2VyID09IFNLTF9DUlRDX0lO
REVYKQogCQluZWVkX3NjYWxpbmcgPSB0cnVlOwpAQCAtNDkwNCw3ICs0ODk5LDcgQEAgc2tsX3Vw
ZGF0ZV9zY2FsZXIoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsIGJvb2wgZm9y
Y2VfZGV0YWNoLAogCQlyZXR1cm4gMDsKIAl9CiAKLQlpZiAocGxhbmVfc2NhbGVyX2NoZWNrICYm
IHBpeGVsX2Zvcm1hdCA9PSBEUk1fRk9STUFUX05WMTIgJiYKKwlpZiAoZm9ybWF0ICYmIGZvcm1h
dC0+Zm9ybWF0ID09IERSTV9GT1JNQVRfTlYxMiAmJgogCSAgICAoc3JjX2ggPCBTS0xfTUlOX1lV
Vl80MjBfU1JDX0ggfHwgc3JjX3cgPCBTS0xfTUlOX1lVVl80MjBfU1JDX1cpKSB7CiAJCURSTV9E
RUJVR19LTVMoIk5WMTI6IHNyYyBkaW1lbnNpb25zIG5vdCBtZXRcbiIpOwogCQlyZXR1cm4gLUVJ
TlZBTDsKQEAgLTQ5NTIsNyArNDk0Nyw3IEBAIGludCBza2xfdXBkYXRlX3NjYWxlcl9jcnRjKHN0
cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpzdGF0ZSkKIAkJCQkgJnN0YXRlLT5zY2FsZXJfc3RhdGUu
c2NhbGVyX2lkLAogCQkJCSBzdGF0ZS0+cGlwZV9zcmNfdywgc3RhdGUtPnBpcGVfc3JjX2gsCiAJ
CQkJIGFkanVzdGVkX21vZGUtPmNydGNfaGRpc3BsYXksCi0JCQkJIGFkanVzdGVkX21vZGUtPmNy
dGNfdmRpc3BsYXksIGZhbHNlLCAwKTsKKwkJCQkgYWRqdXN0ZWRfbW9kZS0+Y3J0Y192ZGlzcGxh
eSwgTlVMTCwgMCk7CiB9CiAKIC8qKgpAQCAtNDk2NywxMyArNDk2MiwyMiBAQCBpbnQgc2tsX3Vw
ZGF0ZV9zY2FsZXJfY3J0YyhzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqc3RhdGUpCiBzdGF0aWMg
aW50IHNrbF91cGRhdGVfc2NhbGVyX3BsYW5lKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRj
X3N0YXRlLAogCQkJCSAgIHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUpCiB7
Ci0KIAlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0KIAkJdG9faW50ZWxfcGxhbmUo
cGxhbmVfc3RhdGUtPmJhc2UucGxhbmUpOwogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0g
cGxhbmVfc3RhdGUtPmJhc2UuZmI7CiAJaW50IHJldDsKLQogCWJvb2wgZm9yY2VfZGV0YWNoID0g
IWZiIHx8ICFwbGFuZV9zdGF0ZS0+YmFzZS52aXNpYmxlOworCWJvb2wgbmVlZF9zY2FsaW5nID0g
ZmFsc2U7CisKKwlpZiAoZmIgJiYgZmItPmZvcm1hdC0+Zm9ybWF0ID09IERSTV9GT1JNQVRfTlYx
MikgeworCQkvKgorCQkgKiBHZW4xMC0gYW5kIHNwcml0ZSAyIGFuZCAzIGFsd2F5cyBuZWVkIHRo
ZSBzY2FsZXIuCisJCSAqIE9uIGdlbjExIHdlIHVzZSB0aGUgY2hyb21hIHVwc2FtcGxlciB3aGVu
IGF2YWlsYWJsZSwKKwkJICogYW5kIG9ubHkgdXNlIHRoZSBzY2FsZXIgZm9yIG5vcm1hbCBzY2Fs
aW5nLgorCQkgKi8KKwkJaWYgKCFpY2xfaXNfaGRyX3BsYW5lKGludGVsX3BsYW5lKSkKKwkJCW5l
ZWRfc2NhbGluZyA9IHRydWU7CisJfQogCiAJcmV0ID0gc2tsX3VwZGF0ZV9zY2FsZXIoY3J0Y19z
dGF0ZSwgZm9yY2VfZGV0YWNoLAogCQkJCWRybV9wbGFuZV9pbmRleCgmaW50ZWxfcGxhbmUtPmJh
c2UpLApAQCAtNDk4Miw3ICs0OTg2LDcgQEAgc3RhdGljIGludCBza2xfdXBkYXRlX3NjYWxlcl9w
bGFuZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCQlkcm1fcmVjdF9o
ZWlnaHQoJnBsYW5lX3N0YXRlLT5iYXNlLnNyYykgPj4gMTYsCiAJCQkJZHJtX3JlY3Rfd2lkdGgo
JnBsYW5lX3N0YXRlLT5iYXNlLmRzdCksCiAJCQkJZHJtX3JlY3RfaGVpZ2h0KCZwbGFuZV9zdGF0
ZS0+YmFzZS5kc3QpLAotCQkJCWZiID8gdHJ1ZSA6IGZhbHNlLCBmYiA/IGZiLT5mb3JtYXQtPmZv
cm1hdCA6IDApOworCQkJCWZiID8gZmItPmZvcm1hdCA6IE5VTEwsIG5lZWRfc2NhbGluZyk7CiAK
IAlpZiAocmV0IHx8IHBsYW5lX3N0YXRlLT5zY2FsZXJfaWQgPCAwKQogCQlyZXR1cm4gcmV0Owpk
aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBkZDk2MDAwNjVlZmYuLmQxZDllMGEwZTYwYSAx
MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTIxOTYsNiArMjE5NiwxNCBAQCBzdGF0aWMg
aW5saW5lIGJvb2wgaWNsX2lzX252MTJfeV9wbGFuZShlbnVtIHBsYW5lX2lkIGlkKQogCXJldHVy
biBmYWxzZTsKIH0KIAorc3RhdGljIGlubGluZSBib29sIGljbF9pc19oZHJfcGxhbmUoc3RydWN0
IGludGVsX3BsYW5lICpwbGFuZSkKK3sKKwlpZiAoSU5URUxfR0VOKHRvX2k5MTUocGxhbmUtPmJh
c2UuZGV2KSkgPCAxMSkKKwkJcmV0dXJuIGZhbHNlOworCisJcmV0dXJuIHBsYW5lLT5pZCA8IFBM
QU5FX1NQUklURTI7Cit9CisKIC8qIGludGVsX3R2LmMgKi8KIHZvaWQgaW50ZWxfdHZfaW5pdChz
dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X3Nwcml0ZS5jCmluZGV4IDdkM2M3NDY5ZDI3MS4uMGI0MWUwZDNiNzllIDEwMDY0NAotLS0gYS9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtMzAzLDcgKzMwMyw4IEBAIHNrbF9wcm9ncmFtX3NjYWxl
cihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJY3J0Y19oLS07CiAKIAkvKiBU
T0RPOiBoYW5kbGUgc3ViLXBpeGVsIGNvb3JkaW5hdGVzICovCi0JaWYgKHBsYW5lX3N0YXRlLT5i
YXNlLmZiLT5mb3JtYXQtPmZvcm1hdCA9PSBEUk1fRk9STUFUX05WMTIpIHsKKwlpZiAocGxhbmVf
c3RhdGUtPmJhc2UuZmItPmZvcm1hdC0+Zm9ybWF0ID09IERSTV9GT1JNQVRfTlYxMiAmJgorCSAg
ICAhaWNsX2lzX2hkcl9wbGFuZShwbGFuZSkpIHsKIAkJeV9ocGhhc2UgPSBza2xfc2NhbGVyX2Nh
bGNfcGhhc2UoMSwgZmFsc2UpOwogCQl5X3ZwaGFzZSA9IHNrbF9zY2FsZXJfY2FsY19waGFzZSgx
LCBmYWxzZSk7CiAKLS0gCjIuMTguMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl
ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu
Zm8vaW50ZWwtZ2Z4Cg==