From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ville Syrjala <ville.syrjala@linux.intel.com>
Subject: [PATCH] drm/i915: Clean up cherryview_load_luts()
Date: Mon,  8 Apr 2019 15:18:15 +0300
Message-ID: <20190408121815.30142-1-ville.syrjala@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 mga06.intel.com (mga06.intel.com [134.134.136.31])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 5446E8923C
 for <intel-gfx@lists.freedesktop.org>; Mon,  8 Apr 2019 12:18:18 +0000 (UTC)
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

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkkg
bGlrZSBteSBmdW5jdGlvbnMgc2ltcGxlLCBzbyBzcGxpdCB1cCB0aGUgbG93IGxldmVsIGJpdHMg
ZnJvbQpjaGVycnl2aWV3X2xvYWRfbHV0cygpIGludG8gc2VwYXJhdGUgZnVuY3Rpb25zLiBBbHNv
IHJlbmFtZSB0aGUKd2hvbGUgdGhpbmcgdG8gY2h2X2xvYWRfbHV0cygpIHRvIG1hdGNoIHRoZSBu
ZXcgd29ybGQgb3JkZXIuCgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5
cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Nv
bG9yLmMgfCA5OCArKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk
LCA2MCBpbnNlcnRpb25zKCspLCAzOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJz
L2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xvci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
Y29sb3IuYwppbmRleCBjYTM0MWE5ZTQ3ZTYuLjllMzRhYmE0ZDYzMCAxMDA2NDQKLS0tIGEvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY29sb3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9jb2xvci5jCkBAIC03ODQsMTMgKzc4NCw2NSBAQCBzdGF0aWMgdm9pZCBpY2xfbG9h
ZF9sdXRzKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlKQogCX0KIH0K
IAotc3RhdGljIHZvaWQgY2hlcnJ5dmlld19sb2FkX2x1dHMoY29uc3Qgc3RydWN0IGludGVsX2Ny
dGNfc3RhdGUgKmNydGNfc3RhdGUpCitzdGF0aWMgdTMyIGNodl9jZ21fZGVnYW1tYV9sZHcoY29u
c3Qgc3RydWN0IGRybV9jb2xvcl9sdXQgKmNvbG9yKQoreworCXJldHVybiBkcm1fY29sb3JfbHV0
X2V4dHJhY3QoY29sb3ItPmdyZWVuLCAxNCkgPDwgMTYgfAorCQlkcm1fY29sb3JfbHV0X2V4dHJh
Y3QoY29sb3ItPmJsdWUsIDE0KTsKK30KKworc3RhdGljIHUzMiBjaHZfY2dtX2RlZ2FtbWFfdWR3
KGNvbnN0IHN0cnVjdCBkcm1fY29sb3JfbHV0ICpjb2xvcikKK3sKKwlyZXR1cm4gZHJtX2NvbG9y
X2x1dF9leHRyYWN0KGNvbG9yLT5yZWQsIDE0KTsKK30KKworc3RhdGljIHZvaWQgY2h2X2xvYWRf
Y2dtX2RlZ2FtbWEoc3RydWN0IGludGVsX2NydGMgKmNydGMsCisJCQkJIGNvbnN0IHN0cnVjdCBk
cm1fcHJvcGVydHlfYmxvYiAqYmxvYikKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2
X3ByaXYgPSB0b19pOTE1KGNydGMtPmJhc2UuZGV2KTsKKwljb25zdCBzdHJ1Y3QgZHJtX2NvbG9y
X2x1dCAqbHV0ID0gYmxvYi0+ZGF0YTsKKwlpbnQgaSwgbHV0X3NpemUgPSBkcm1fY29sb3JfbHV0
X3NpemUoYmxvYik7CisJZW51bSBwaXBlIHBpcGUgPSBjcnRjLT5waXBlOworCisJZm9yIChpID0g
MDsgaSA8IGx1dF9zaXplOyBpKyspIHsKKwkJSTkxNV9XUklURShDR01fUElQRV9ERUdBTU1BKHBp
cGUsIGksIDApLAorCQkJICAgY2h2X2NnbV9kZWdhbW1hX2xkdygmbHV0W2ldKSk7CisJCUk5MTVf
V1JJVEUoQ0dNX1BJUEVfREVHQU1NQShwaXBlLCBpLCAxKSwKKwkJCSAgIGNodl9jZ21fZGVnYW1t
YV91ZHcoJmx1dFtpXSkpOworCX0KK30KKworc3RhdGljIHUzMiBjaHZfY2dtX2dhbW1hX2xkdyhj
b25zdCBzdHJ1Y3QgZHJtX2NvbG9yX2x1dCAqY29sb3IpCit7CisJcmV0dXJuIGRybV9jb2xvcl9s
dXRfZXh0cmFjdChjb2xvci0+Z3JlZW4sIDEwKSA8PCAxNiB8CisJCWRybV9jb2xvcl9sdXRfZXh0
cmFjdChjb2xvci0+Ymx1ZSwgMTApOworfQorCitzdGF0aWMgdTMyIGNodl9jZ21fZ2FtbWFfdWR3
KGNvbnN0IHN0cnVjdCBkcm1fY29sb3JfbHV0ICpjb2xvcikKK3sKKwlyZXR1cm4gZHJtX2NvbG9y
X2x1dF9leHRyYWN0KGNvbG9yLT5yZWQsIDEwKTsKK30KKworc3RhdGljIHZvaWQgY2h2X2xvYWRf
Y2dtX2dhbW1hKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAorCQkJICAgICAgIGNvbnN0IHN0cnVj
dCBkcm1fcHJvcGVydHlfYmxvYiAqYmxvYikKK3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq
ZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmJhc2UuZGV2KTsKKwljb25zdCBzdHJ1Y3QgZHJtX2Nv
bG9yX2x1dCAqbHV0ID0gYmxvYi0+ZGF0YTsKKwlpbnQgaSwgbHV0X3NpemUgPSBkcm1fY29sb3Jf
bHV0X3NpemUoYmxvYik7CisJZW51bSBwaXBlIHBpcGUgPSBjcnRjLT5waXBlOworCisJZm9yIChp
ID0gMDsgaSA8IGx1dF9zaXplOyBpKyspIHsKKwkJSTkxNV9XUklURShDR01fUElQRV9HQU1NQShw
aXBlLCBpLCAwKSwKKwkJCSAgIGNodl9jZ21fZ2FtbWFfbGR3KCZsdXRbaV0pKTsKKwkJSTkxNV9X
UklURShDR01fUElQRV9HQU1NQShwaXBlLCBpLCAxKSwKKwkJCSAgIGNodl9jZ21fZ2FtbWFfdWR3
KCZsdXRbaV0pKTsKKwl9Cit9CisKK3N0YXRpYyB2b2lkIGNodl9sb2FkX2x1dHMoY29uc3Qgc3Ry
dWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiB7CiAJc3RydWN0IGludGVsX2NydGMg
KmNydGMgPSB0b19pbnRlbF9jcnRjKGNydGNfc3RhdGUtPmJhc2UuY3J0Yyk7Ci0Jc3RydWN0IGRy
bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShjcnRjLT5iYXNlLmRldik7CiAJY29u
c3Qgc3RydWN0IGRybV9wcm9wZXJ0eV9ibG9iICpnYW1tYV9sdXQgPSBjcnRjX3N0YXRlLT5iYXNl
LmdhbW1hX2x1dDsKIAljb25zdCBzdHJ1Y3QgZHJtX3Byb3BlcnR5X2Jsb2IgKmRlZ2FtbWFfbHV0
ID0gY3J0Y19zdGF0ZS0+YmFzZS5kZWdhbW1hX2x1dDsKLQllbnVtIHBpcGUgcGlwZSA9IGNydGMt
PnBpcGU7CiAKIAljaGVycnl2aWV3X2xvYWRfY3NjX21hdHJpeChjcnRjX3N0YXRlKTsKIApAQCAt
Nzk5LDQxICs4NTEsMTEgQEAgc3RhdGljIHZvaWQgY2hlcnJ5dmlld19sb2FkX2x1dHMoY29uc3Qg
c3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJCXJldHVybjsKIAl9CiAKLQlp
ZiAoZGVnYW1tYV9sdXQpIHsKLQkJY29uc3Qgc3RydWN0IGRybV9jb2xvcl9sdXQgKmx1dCA9IGRl
Z2FtbWFfbHV0LT5kYXRhOwotCQlpbnQgaSwgbHV0X3NpemUgPSBJTlRFTF9JTkZPKGRldl9wcml2
KS0+Y29sb3IuZGVnYW1tYV9sdXRfc2l6ZTsKKwlpZiAoZGVnYW1tYV9sdXQpCisJCWNodl9sb2Fk
X2NnbV9kZWdhbW1hKGNydGMsIGRlZ2FtbWFfbHV0KTsKIAotCQlmb3IgKGkgPSAwOyBpIDwgbHV0
X3NpemU7IGkrKykgewotCQkJdTMyIHdvcmQwLCB3b3JkMTsKLQotCQkJLyogV3JpdGUgTFVUIGlu
IFUwLjE0IGZvcm1hdC4gKi8KLQkJCXdvcmQwID0KLQkJCShkcm1fY29sb3JfbHV0X2V4dHJhY3Qo
bHV0W2ldLmdyZWVuLCAxNCkgPDwgMTYpIHwKLQkJCWRybV9jb2xvcl9sdXRfZXh0cmFjdChsdXRb
aV0uYmx1ZSwgMTQpOwotCQkJd29yZDEgPSBkcm1fY29sb3JfbHV0X2V4dHJhY3QobHV0W2ldLnJl
ZCwgMTQpOwotCi0JCQlJOTE1X1dSSVRFKENHTV9QSVBFX0RFR0FNTUEocGlwZSwgaSwgMCksIHdv
cmQwKTsKLQkJCUk5MTVfV1JJVEUoQ0dNX1BJUEVfREVHQU1NQShwaXBlLCBpLCAxKSwgd29yZDEp
OwotCQl9Ci0JfQotCi0JaWYgKGdhbW1hX2x1dCkgewotCQljb25zdCBzdHJ1Y3QgZHJtX2NvbG9y
X2x1dCAqbHV0ID0gZ2FtbWFfbHV0LT5kYXRhOwotCQlpbnQgaSwgbHV0X3NpemUgPSBJTlRFTF9J
TkZPKGRldl9wcml2KS0+Y29sb3IuZ2FtbWFfbHV0X3NpemU7Ci0KLQkJZm9yIChpID0gMDsgaSA8
IGx1dF9zaXplOyBpKyspIHsKLQkJCXUzMiB3b3JkMCwgd29yZDE7Ci0KLQkJCS8qIFdyaXRlIExV
VCBpbiBVMC4xMCBmb3JtYXQuICovCi0JCQl3b3JkMCA9Ci0JCQkoZHJtX2NvbG9yX2x1dF9leHRy
YWN0KGx1dFtpXS5ncmVlbiwgMTApIDw8IDE2KSB8Ci0JCQlkcm1fY29sb3JfbHV0X2V4dHJhY3Qo
bHV0W2ldLmJsdWUsIDEwKTsKLQkJCXdvcmQxID0gZHJtX2NvbG9yX2x1dF9leHRyYWN0KGx1dFtp
XS5yZWQsIDEwKTsKLQotCQkJSTkxNV9XUklURShDR01fUElQRV9HQU1NQShwaXBlLCBpLCAwKSwg
d29yZDApOwotCQkJSTkxNV9XUklURShDR01fUElQRV9HQU1NQShwaXBlLCBpLCAxKSwgd29yZDEp
OwotCQl9Ci0JfQorCWlmIChnYW1tYV9sdXQpCisJCWNodl9sb2FkX2NnbV9nYW1tYShjcnRjLCBn
YW1tYV9sdXQpOwogfQogCiB2b2lkIGludGVsX2NvbG9yX2xvYWRfbHV0cyhjb25zdCBzdHJ1Y3Qg
aW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKQEAgLTEyMzIsNyArMTI1NCw3IEBAIHZvaWQg
aW50ZWxfY29sb3JfaW5pdChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkJaWYgKElTX0NIRVJS
WVZJRVcoZGV2X3ByaXYpKSB7CiAJCQlkZXZfcHJpdi0+ZGlzcGxheS5jb2xvcl9jaGVjayA9IGNo
dl9jb2xvcl9jaGVjazsKIAkJCWRldl9wcml2LT5kaXNwbGF5LmNvbG9yX2NvbW1pdCA9IGk5eHhf
Y29sb3JfY29tbWl0OwotCQkJZGV2X3ByaXYtPmRpc3BsYXkubG9hZF9sdXRzID0gY2hlcnJ5dmll
d19sb2FkX2x1dHM7CisJCQlkZXZfcHJpdi0+ZGlzcGxheS5sb2FkX2x1dHMgPSBjaHZfbG9hZF9s
dXRzOwogCQl9IGVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNCkgewogCQkJZGV2X3By
aXYtPmRpc3BsYXkuY29sb3JfY2hlY2sgPSBpOXh4X2NvbG9yX2NoZWNrOwogCQkJZGV2X3ByaXYt
PmRpc3BsYXkuY29sb3JfY29tbWl0ID0gaTl4eF9jb2xvcl9jb21taXQ7Ci0tIAoyLjIxLjAKCl9f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt
YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz
LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA==