From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH 11/15] drm/i915: Move programming plane scaler
 to its own function.
Date: Wed, 19 Sep 2018 15:56:40 +0200
Message-ID: <20180919135644.14182-12-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 AC0FE6E4FB
 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

VGhpcyBjbGVhbnMgdGhlIGNvZGUgdXAgc2xpZ2h0bHksIGFuZCB3aWxsIG1ha2Ugb3RoZXIgY2hh
bmdlcyBlYXNpZXIuCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5s
YW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X3Nwcml0ZS5jIHwgOTAgKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFu
Z2VkLCA1MiBpbnNlcnRpb25zKCspLCAzOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu
dGVsX3Nwcml0ZS5jCmluZGV4IGQ0YzhlMTBmYzkwYi4uN2QzYzc0NjlkMjcxIDEwMDY0NAotLS0g
YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtMjgwLDEzICsyODAsNjMgQEAgc2tsX3BsYW5lX21h
eF9zdHJpZGUoc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSwKIAkJcmV0dXJuIG1pbig4MTkyICog
Y3BwLCAzMjc2OCk7CiB9CiAKK3N0YXRpYyB2b2lkCitza2xfcHJvZ3JhbV9zY2FsZXIoc3RydWN0
IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorCQkgICBzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBs
YW5lLAorCQkgICBjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKKwkJ
ICAgY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKK3sKKwllbnVt
IHBsYW5lX2lkIHBsYW5lX2lkID0gcGxhbmUtPmlkOworCWVudW0gcGlwZSBwaXBlID0gcGxhbmUt
PnBpcGU7CisJaW50IHNjYWxlcl9pZCA9IHBsYW5lX3N0YXRlLT5zY2FsZXJfaWQ7CisJY29uc3Qg
c3RydWN0IGludGVsX3NjYWxlciAqc2NhbGVyID0KKwkJJmNydGNfc3RhdGUtPnNjYWxlcl9zdGF0
ZS5zY2FsZXJzW3NjYWxlcl9pZF07CisJaW50IGNydGNfeCA9IHBsYW5lX3N0YXRlLT5iYXNlLmRz
dC54MTsKKwlpbnQgY3J0Y195ID0gcGxhbmVfc3RhdGUtPmJhc2UuZHN0LnkxOworCXVpbnQzMl90
IGNydGNfdyA9IGRybV9yZWN0X3dpZHRoKCZwbGFuZV9zdGF0ZS0+YmFzZS5kc3QpOworCXVpbnQz
Ml90IGNydGNfaCA9IGRybV9yZWN0X2hlaWdodCgmcGxhbmVfc3RhdGUtPmJhc2UuZHN0KTsKKwl1
MTYgeV9ocGhhc2UsIHV2X3JnYl9ocGhhc2U7CisJdTE2IHlfdnBoYXNlLCB1dl9yZ2JfdnBoYXNl
OworCisJLyogU2l6ZXMgYXJlIDAgYmFzZWQgKi8KKwljcnRjX3ctLTsKKwljcnRjX2gtLTsKKwor
CS8qIFRPRE86IGhhbmRsZSBzdWItcGl4ZWwgY29vcmRpbmF0ZXMgKi8KKwlpZiAocGxhbmVfc3Rh
dGUtPmJhc2UuZmItPmZvcm1hdC0+Zm9ybWF0ID09IERSTV9GT1JNQVRfTlYxMikgeworCQl5X2hw
aGFzZSA9IHNrbF9zY2FsZXJfY2FsY19waGFzZSgxLCBmYWxzZSk7CisJCXlfdnBoYXNlID0gc2ts
X3NjYWxlcl9jYWxjX3BoYXNlKDEsIGZhbHNlKTsKKworCQkvKiBNUEVHMiBjaHJvbWEgc2l0aW5n
IGNvbnZlbnRpb24gKi8KKwkJdXZfcmdiX2hwaGFzZSA9IHNrbF9zY2FsZXJfY2FsY19waGFzZSgy
LCB0cnVlKTsKKwkJdXZfcmdiX3ZwaGFzZSA9IHNrbF9zY2FsZXJfY2FsY19waGFzZSgyLCBmYWxz
ZSk7CisJfSBlbHNlIHsKKwkJLyogbm90IHVzZWQgKi8KKwkJeV9ocGhhc2UgPSAwOworCQl5X3Zw
aGFzZSA9IDA7CisKKwkJdXZfcmdiX2hwaGFzZSA9IHNrbF9zY2FsZXJfY2FsY19waGFzZSgxLCBm
YWxzZSk7CisJCXV2X3JnYl92cGhhc2UgPSBza2xfc2NhbGVyX2NhbGNfcGhhc2UoMSwgZmFsc2Up
OworCX0KKworCUk5MTVfV1JJVEVfRlcoU0tMX1BTX0NUUkwocGlwZSwgc2NhbGVyX2lkKSwKKwkJ
ICAgICAgUFNfU0NBTEVSX0VOIHwgUFNfUExBTkVfU0VMKHBsYW5lX2lkKSB8IHNjYWxlci0+bW9k
ZSk7CisJSTkxNV9XUklURV9GVyhTS0xfUFNfUFdSX0dBVEUocGlwZSwgc2NhbGVyX2lkKSwgMCk7
CisJSTkxNV9XUklURV9GVyhTS0xfUFNfVlBIQVNFKHBpcGUsIHNjYWxlcl9pZCksCisJCSAgICAg
IFBTX1lfUEhBU0UoeV92cGhhc2UpIHwgUFNfVVZfUkdCX1BIQVNFKHV2X3JnYl92cGhhc2UpKTsK
KwlJOTE1X1dSSVRFX0ZXKFNLTF9QU19IUEhBU0UocGlwZSwgc2NhbGVyX2lkKSwKKwkJICAgICAg
UFNfWV9QSEFTRSh5X2hwaGFzZSkgfCBQU19VVl9SR0JfUEhBU0UodXZfcmdiX2hwaGFzZSkpOwor
CUk5MTVfV1JJVEVfRlcoU0tMX1BTX1dJTl9QT1MocGlwZSwgc2NhbGVyX2lkKSwgKGNydGNfeCA8
PCAxNikgfCBjcnRjX3kpOworCUk5MTVfV1JJVEVfRlcoU0tMX1BTX1dJTl9TWihwaXBlLCBzY2Fs
ZXJfaWQpLAorCQkgICAgICAoKGNydGNfdyArIDEpIDw8IDE2KXwoY3J0Y19oICsgMSkpOworfQor
CiB2b2lkCiBza2xfdXBkYXRlX3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCiAJCSBj
b25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJIGNvbnN0IHN0cnVj
dCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUpCiB7CiAJc3RydWN0IGRybV9pOTE1X3By
aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShwbGFuZS0+YmFzZS5kZXYpOwotCWNvbnN0IHN0cnVj
dCBkcm1fZnJhbWVidWZmZXIgKmZiID0gcGxhbmVfc3RhdGUtPmJhc2UuZmI7CiAJZW51bSBwbGFu
ZV9pZCBwbGFuZV9pZCA9IHBsYW5lLT5pZDsKIAllbnVtIHBpcGUgcGlwZSA9IHBsYW5lLT5waXBl
OwogCXUzMiBwbGFuZV9jdGwgPSBwbGFuZV9zdGF0ZS0+Y3RsOwpAQCAtMjk2LDggKzM0Niw2IEBA
IHNrbF91cGRhdGVfcGxhbmUoc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSwKIAl1MzIgYXV4X3N0
cmlkZSA9IHNrbF9wbGFuZV9zdHJpZGUocGxhbmVfc3RhdGUsIDEpOwogCWludCBjcnRjX3ggPSBw
bGFuZV9zdGF0ZS0+YmFzZS5kc3QueDE7CiAJaW50IGNydGNfeSA9IHBsYW5lX3N0YXRlLT5iYXNl
LmRzdC55MTsKLQl1aW50MzJfdCBjcnRjX3cgPSBkcm1fcmVjdF93aWR0aCgmcGxhbmVfc3RhdGUt
PmJhc2UuZHN0KTsKLQl1aW50MzJfdCBjcnRjX2ggPSBkcm1fcmVjdF9oZWlnaHQoJnBsYW5lX3N0
YXRlLT5iYXNlLmRzdCk7CiAJdWludDMyX3QgeCA9IHBsYW5lX3N0YXRlLT5jb2xvcl9wbGFuZVsw
XS54OwogCXVpbnQzMl90IHkgPSBwbGFuZV9zdGF0ZS0+Y29sb3JfcGxhbmVbMF0ueTsKIAl1aW50
MzJfdCBzcmNfdyA9IGRybV9yZWN0X3dpZHRoKCZwbGFuZV9zdGF0ZS0+YmFzZS5zcmMpID4+IDE2
OwpAQCAtMzA3LDggKzM1NSw2IEBAIHNrbF91cGRhdGVfcGxhbmUoc3RydWN0IGludGVsX3BsYW5l
ICpwbGFuZSwKIAkvKiBTaXplcyBhcmUgMCBiYXNlZCAqLwogCXNyY193LS07CiAJc3JjX2gtLTsK
LQljcnRjX3ctLTsKLQljcnRjX2gtLTsKIAogCXNwaW5fbG9ja19pcnFzYXZlKCZkZXZfcHJpdi0+
dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsKIApAQCAtMzMzLDM5ICszNzksNyBAQCBza2xfdXBkYXRl
X3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCiAKIAkvKiBwcm9ncmFtIHBsYW5lIHNj
YWxlciAqLwogCWlmIChwbGFuZV9zdGF0ZS0+c2NhbGVyX2lkID49IDApIHsKLQkJaW50IHNjYWxl
cl9pZCA9IHBsYW5lX3N0YXRlLT5zY2FsZXJfaWQ7Ci0JCWNvbnN0IHN0cnVjdCBpbnRlbF9zY2Fs
ZXIgKnNjYWxlciA9Ci0JCQkmY3J0Y19zdGF0ZS0+c2NhbGVyX3N0YXRlLnNjYWxlcnNbc2NhbGVy
X2lkXTsKLQkJdTE2IHlfaHBoYXNlLCB1dl9yZ2JfaHBoYXNlOwotCQl1MTYgeV92cGhhc2UsIHV2
X3JnYl92cGhhc2U7Ci0KLQkJLyogVE9ETzogaGFuZGxlIHN1Yi1waXhlbCBjb29yZGluYXRlcyAq
LwotCQlpZiAoZmItPmZvcm1hdC0+Zm9ybWF0ID09IERSTV9GT1JNQVRfTlYxMikgewotCQkJeV9o
cGhhc2UgPSBza2xfc2NhbGVyX2NhbGNfcGhhc2UoMSwgZmFsc2UpOwotCQkJeV92cGhhc2UgPSBz
a2xfc2NhbGVyX2NhbGNfcGhhc2UoMSwgZmFsc2UpOwotCi0JCQkvKiBNUEVHMiBjaHJvbWEgc2l0
aW5nIGNvbnZlbnRpb24gKi8KLQkJCXV2X3JnYl9ocGhhc2UgPSBza2xfc2NhbGVyX2NhbGNfcGhh
c2UoMiwgdHJ1ZSk7Ci0JCQl1dl9yZ2JfdnBoYXNlID0gc2tsX3NjYWxlcl9jYWxjX3BoYXNlKDIs
IGZhbHNlKTsKLQkJfSBlbHNlIHsKLQkJCS8qIG5vdCB1c2VkICovCi0JCQl5X2hwaGFzZSA9IDA7
Ci0JCQl5X3ZwaGFzZSA9IDA7Ci0KLQkJCXV2X3JnYl9ocGhhc2UgPSBza2xfc2NhbGVyX2NhbGNf
cGhhc2UoMSwgZmFsc2UpOwotCQkJdXZfcmdiX3ZwaGFzZSA9IHNrbF9zY2FsZXJfY2FsY19waGFz
ZSgxLCBmYWxzZSk7Ci0JCX0KLQotCQlJOTE1X1dSSVRFX0ZXKFNLTF9QU19DVFJMKHBpcGUsIHNj
YWxlcl9pZCksCi0JCQkgICAgICBQU19TQ0FMRVJfRU4gfCBQU19QTEFORV9TRUwocGxhbmVfaWQp
IHwgc2NhbGVyLT5tb2RlKTsKLQkJSTkxNV9XUklURV9GVyhTS0xfUFNfUFdSX0dBVEUocGlwZSwg
c2NhbGVyX2lkKSwgMCk7Ci0JCUk5MTVfV1JJVEVfRlcoU0tMX1BTX1ZQSEFTRShwaXBlLCBzY2Fs
ZXJfaWQpLAotCQkJICAgICAgUFNfWV9QSEFTRSh5X3ZwaGFzZSkgfCBQU19VVl9SR0JfUEhBU0Uo
dXZfcmdiX3ZwaGFzZSkpOwotCQlJOTE1X1dSSVRFX0ZXKFNLTF9QU19IUEhBU0UocGlwZSwgc2Nh
bGVyX2lkKSwKLQkJCSAgICAgIFBTX1lfUEhBU0UoeV9ocGhhc2UpIHwgUFNfVVZfUkdCX1BIQVNF
KHV2X3JnYl9ocGhhc2UpKTsKLQkJSTkxNV9XUklURV9GVyhTS0xfUFNfV0lOX1BPUyhwaXBlLCBz
Y2FsZXJfaWQpLCAoY3J0Y194IDw8IDE2KSB8IGNydGNfeSk7Ci0JCUk5MTVfV1JJVEVfRlcoU0tM
X1BTX1dJTl9TWihwaXBlLCBzY2FsZXJfaWQpLAotCQkJICAgICAgKChjcnRjX3cgKyAxKSA8PCAx
Nil8KGNydGNfaCArIDEpKTsKKwkJc2tsX3Byb2dyYW1fc2NhbGVyKGRldl9wcml2LCBwbGFuZSwg
Y3J0Y19zdGF0ZSwgcGxhbmVfc3RhdGUpOwogCiAJCUk5MTVfV1JJVEVfRlcoUExBTkVfUE9TKHBp
cGUsIHBsYW5lX2lkKSwgMCk7CiAJfSBlbHNlIHsKLS0gCjIuMTguMAoKX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJ
bnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au
b3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==