From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ville Syrjala <ville.syrjala@linux.intel.com>
Subject: [PATCH v2 12/13] drm/i915: s/intel_plane/plane/ in
 sprite init
Date: Wed, 30 May 2018 20:16:00 +0300
Message-ID: <20180530171601.19073-3-ville.syrjala@linux.intel.com>
References: <20180530165933.11424-1-ville.syrjala@linux.intel.com>
 <20180530171601.19073-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 mga12.intel.com (mga12.intel.com [192.55.52.136])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 24CEF6EDD1
 for <intel-gfx@lists.freedesktop.org>; Wed, 30 May 2018 17:16:10 +0000 (UTC)
In-Reply-To: <20180530171601.19073-1-ville.syrjala@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

RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClVz
ZSBhIG1vcmUgZmFtaWxpYXIgbmFtaW5nIHBhdHRlcm4gZm9yIG91ciB2YXJpYWJsZXMgaW4gdGhl
IHNwcml0ZSBwbGFuZQppbml0IGZ1bmN0aW9uLgoKdjI6IERyb3AgdGhlIHJlZHVuZGFudCAncGxh
bmUnIGZyb20gcGxhbmVfZm9ybWF0cyBhbmQgbnVtX3BsYW5lc19mb3JtYXRzCiAgICB0b28KClNp
Z25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5j
b20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgfCAxMDMgKysrKysr
KysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNTEgaW5zZXJ0
aW9ucygrKSwgNTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5
MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpp
bmRleCBlODQ3NTVjOTU1N2EuLjdiYzc5ZTBjN2ViOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
c3ByaXRlLmMKQEAgLTE1MTUsNzQgKzE1MTUsNzQgQEAgc2tsX3VuaXZlcnNhbF9wbGFuZV9jcmVh
dGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCiBzdHJ1Y3QgaW50ZWxfcGxh
bmUgKgogaW50ZWxfc3ByaXRlX3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq
ZGV2X3ByaXYsCi0JCQkgIGVudW0gcGlwZSBwaXBlLCBpbnQgcGxhbmUpCisJCQkgIGVudW0gcGlw
ZSBwaXBlLCBpbnQgc3ByaXRlKQogewotCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmU7
CisJc3RydWN0IGludGVsX3BsYW5lICpwbGFuZTsKIAl1bnNpZ25lZCBsb25nIHBvc3NpYmxlX2Ny
dGNzOwotCWNvbnN0IHVpbnQzMl90ICpwbGFuZV9mb3JtYXRzOwotCWNvbnN0IHVpbnQ2NF90ICpt
b2RpZmllcnM7CiAJdW5zaWduZWQgaW50IHN1cHBvcnRlZF9yb3RhdGlvbnM7Ci0JaW50IG51bV9w
bGFuZV9mb3JtYXRzOworCWNvbnN0IHU2NCAqbW9kaWZpZXJzOworCWNvbnN0IHUzMiAqZm9ybWF0
czsKKwlpbnQgbnVtX2Zvcm1hdHM7CiAJaW50IHJldDsKIAogCWlmIChJTlRFTF9HRU4oZGV2X3By
aXYpID49IDkpIHsKLQkJaW50ZWxfcGxhbmUgPSBza2xfdW5pdmVyc2FsX3BsYW5lX2NyZWF0ZShk
ZXZfcHJpdiwgcGlwZSwKLQkJCQkJCQkgUExBTkVfU1BSSVRFMCArIHBsYW5lKTsKLQkJaWYgKElT
X0VSUihpbnRlbF9wbGFuZSkpCi0JCQlyZXR1cm4gaW50ZWxfcGxhbmU7CisJCXBsYW5lID0gc2ts
X3VuaXZlcnNhbF9wbGFuZV9jcmVhdGUoZGV2X3ByaXYsIHBpcGUsCisJCQkJCQkgICBQTEFORV9T
UFJJVEUwICsgc3ByaXRlKTsKKwkJaWYgKElTX0VSUihwbGFuZSkpCisJCQlyZXR1cm4gcGxhbmU7
CiAKIAkJLyogRklYTUUgdW5pZnkgKi8KLQkJaW50ZWxfcGxhbmUtPmNoZWNrX3BsYW5lID0gaW50
ZWxfY2hlY2tfc3ByaXRlX3BsYW5lOworCQlwbGFuZS0+Y2hlY2tfcGxhbmUgPSBpbnRlbF9jaGVj
a19zcHJpdGVfcGxhbmU7CiAKLQkJcmV0dXJuIGludGVsX3BsYW5lOworCQlyZXR1cm4gcGxhbmU7
CiAJfQogCi0JaW50ZWxfcGxhbmUgPSBpbnRlbF9wbGFuZV9hbGxvYygpOwotCWlmIChJU19FUlIo
aW50ZWxfcGxhbmUpKQotCQlyZXR1cm4gaW50ZWxfcGxhbmU7CisJcGxhbmUgPSBpbnRlbF9wbGFu
ZV9hbGxvYygpOworCWlmIChJU19FUlIocGxhbmUpKQorCQlyZXR1cm4gcGxhbmU7CiAKIAlpZiAo
SVNfVkFMTEVZVklFVyhkZXZfcHJpdikgfHwgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKLQkJ
aW50ZWxfcGxhbmUtPmNhbl9zY2FsZSA9IGZhbHNlOwotCQlpbnRlbF9wbGFuZS0+bWF4X2Rvd25z
Y2FsZSA9IDE7CisJCXBsYW5lLT5jYW5fc2NhbGUgPSBmYWxzZTsKKwkJcGxhbmUtPm1heF9kb3du
c2NhbGUgPSAxOwogCi0JCWludGVsX3BsYW5lLT51cGRhdGVfcGxhbmUgPSB2bHZfdXBkYXRlX3Bs
YW5lOwotCQlpbnRlbF9wbGFuZS0+ZGlzYWJsZV9wbGFuZSA9IHZsdl9kaXNhYmxlX3BsYW5lOwot
CQlpbnRlbF9wbGFuZS0+Z2V0X2h3X3N0YXRlID0gdmx2X3BsYW5lX2dldF9od19zdGF0ZTsKKwkJ
cGxhbmUtPnVwZGF0ZV9wbGFuZSA9IHZsdl91cGRhdGVfcGxhbmU7CisJCXBsYW5lLT5kaXNhYmxl
X3BsYW5lID0gdmx2X2Rpc2FibGVfcGxhbmU7CisJCXBsYW5lLT5nZXRfaHdfc3RhdGUgPSB2bHZf
cGxhbmVfZ2V0X2h3X3N0YXRlOwogCi0JCXBsYW5lX2Zvcm1hdHMgPSB2bHZfcGxhbmVfZm9ybWF0
czsKLQkJbnVtX3BsYW5lX2Zvcm1hdHMgPSBBUlJBWV9TSVpFKHZsdl9wbGFuZV9mb3JtYXRzKTsK
KwkJZm9ybWF0cyA9IHZsdl9wbGFuZV9mb3JtYXRzOworCQludW1fZm9ybWF0cyA9IEFSUkFZX1NJ
WkUodmx2X3BsYW5lX2Zvcm1hdHMpOwogCQltb2RpZmllcnMgPSBpOXh4X3BsYW5lX2Zvcm1hdF9t
b2RpZmllcnM7CiAJfSBlbHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDcpIHsKIAkJaWYg
KElTX0lWWUJSSURHRShkZXZfcHJpdikpIHsKLQkJCWludGVsX3BsYW5lLT5jYW5fc2NhbGUgPSB0
cnVlOwotCQkJaW50ZWxfcGxhbmUtPm1heF9kb3duc2NhbGUgPSAyOworCQkJcGxhbmUtPmNhbl9z
Y2FsZSA9IHRydWU7CisJCQlwbGFuZS0+bWF4X2Rvd25zY2FsZSA9IDI7CiAJCX0gZWxzZSB7Ci0J
CQlpbnRlbF9wbGFuZS0+Y2FuX3NjYWxlID0gZmFsc2U7Ci0JCQlpbnRlbF9wbGFuZS0+bWF4X2Rv
d25zY2FsZSA9IDE7CisJCQlwbGFuZS0+Y2FuX3NjYWxlID0gZmFsc2U7CisJCQlwbGFuZS0+bWF4
X2Rvd25zY2FsZSA9IDE7CiAJCX0KIAotCQlpbnRlbF9wbGFuZS0+dXBkYXRlX3BsYW5lID0gaXZi
X3VwZGF0ZV9wbGFuZTsKLQkJaW50ZWxfcGxhbmUtPmRpc2FibGVfcGxhbmUgPSBpdmJfZGlzYWJs
ZV9wbGFuZTsKLQkJaW50ZWxfcGxhbmUtPmdldF9od19zdGF0ZSA9IGl2Yl9wbGFuZV9nZXRfaHdf
c3RhdGU7CisJCXBsYW5lLT51cGRhdGVfcGxhbmUgPSBpdmJfdXBkYXRlX3BsYW5lOworCQlwbGFu
ZS0+ZGlzYWJsZV9wbGFuZSA9IGl2Yl9kaXNhYmxlX3BsYW5lOworCQlwbGFuZS0+Z2V0X2h3X3N0
YXRlID0gaXZiX3BsYW5lX2dldF9od19zdGF0ZTsKIAotCQlwbGFuZV9mb3JtYXRzID0gc25iX3Bs
YW5lX2Zvcm1hdHM7Ci0JCW51bV9wbGFuZV9mb3JtYXRzID0gQVJSQVlfU0laRShzbmJfcGxhbmVf
Zm9ybWF0cyk7CisJCWZvcm1hdHMgPSBzbmJfcGxhbmVfZm9ybWF0czsKKwkJbnVtX2Zvcm1hdHMg
PSBBUlJBWV9TSVpFKHNuYl9wbGFuZV9mb3JtYXRzKTsKIAkJbW9kaWZpZXJzID0gaTl4eF9wbGFu
ZV9mb3JtYXRfbW9kaWZpZXJzOwogCX0gZWxzZSB7Ci0JCWludGVsX3BsYW5lLT5jYW5fc2NhbGUg
PSB0cnVlOwotCQlpbnRlbF9wbGFuZS0+bWF4X2Rvd25zY2FsZSA9IDE2OworCQlwbGFuZS0+Y2Fu
X3NjYWxlID0gdHJ1ZTsKKwkJcGxhbmUtPm1heF9kb3duc2NhbGUgPSAxNjsKIAotCQlpbnRlbF9w
bGFuZS0+dXBkYXRlX3BsYW5lID0gZzR4X3VwZGF0ZV9wbGFuZTsKLQkJaW50ZWxfcGxhbmUtPmRp
c2FibGVfcGxhbmUgPSBnNHhfZGlzYWJsZV9wbGFuZTsKLQkJaW50ZWxfcGxhbmUtPmdldF9od19z
dGF0ZSA9IGc0eF9wbGFuZV9nZXRfaHdfc3RhdGU7CisJCXBsYW5lLT51cGRhdGVfcGxhbmUgPSBn
NHhfdXBkYXRlX3BsYW5lOworCQlwbGFuZS0+ZGlzYWJsZV9wbGFuZSA9IGc0eF9kaXNhYmxlX3Bs
YW5lOworCQlwbGFuZS0+Z2V0X2h3X3N0YXRlID0gZzR4X3BsYW5lX2dldF9od19zdGF0ZTsKIAog
CQltb2RpZmllcnMgPSBpOXh4X3BsYW5lX2Zvcm1hdF9tb2RpZmllcnM7CiAJCWlmIChJU19HRU42
KGRldl9wcml2KSkgewotCQkJcGxhbmVfZm9ybWF0cyA9IHNuYl9wbGFuZV9mb3JtYXRzOwotCQkJ
bnVtX3BsYW5lX2Zvcm1hdHMgPSBBUlJBWV9TSVpFKHNuYl9wbGFuZV9mb3JtYXRzKTsKKwkJCWZv
cm1hdHMgPSBzbmJfcGxhbmVfZm9ybWF0czsKKwkJCW51bV9mb3JtYXRzID0gQVJSQVlfU0laRShz
bmJfcGxhbmVfZm9ybWF0cyk7CiAJCX0gZWxzZSB7Ci0JCQlwbGFuZV9mb3JtYXRzID0gZzR4X3Bs
YW5lX2Zvcm1hdHM7Ci0JCQludW1fcGxhbmVfZm9ybWF0cyA9IEFSUkFZX1NJWkUoZzR4X3BsYW5l
X2Zvcm1hdHMpOworCQkJZm9ybWF0cyA9IGc0eF9wbGFuZV9mb3JtYXRzOworCQkJbnVtX2Zvcm1h
dHMgPSBBUlJBWV9TSVpFKGc0eF9wbGFuZV9mb3JtYXRzKTsKIAkJfQogCX0KIApAQCAtMTU5NSwy
NyArMTU5NSwyNiBAQCBpbnRlbF9zcHJpdGVfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1faTkxNV9w
cml2YXRlICpkZXZfcHJpdiwKIAkJCURSTV9NT0RFX1JPVEFURV8wIHwgRFJNX01PREVfUk9UQVRF
XzE4MDsKIAl9CiAKLQlpbnRlbF9wbGFuZS0+cGlwZSA9IHBpcGU7Ci0JaW50ZWxfcGxhbmUtPmlk
ID0gUExBTkVfU1BSSVRFMCArIHBsYW5lOwotCWludGVsX3BsYW5lLT5mcm9udGJ1ZmZlcl9iaXQg
PSBJTlRFTF9GUk9OVEJVRkZFUihwaXBlLCBpbnRlbF9wbGFuZS0+aWQpOwotCWludGVsX3BsYW5l
LT5jaGVja19wbGFuZSA9IGludGVsX2NoZWNrX3Nwcml0ZV9wbGFuZTsKKwlwbGFuZS0+cGlwZSA9
IHBpcGU7CisJcGxhbmUtPmlkID0gUExBTkVfU1BSSVRFMCArIHNwcml0ZTsKKwlwbGFuZS0+ZnJv
bnRidWZmZXJfYml0ID0gSU5URUxfRlJPTlRCVUZGRVIocGlwZSwgcGxhbmUtPmlkKTsKKwlwbGFu
ZS0+Y2hlY2tfcGxhbmUgPSBpbnRlbF9jaGVja19zcHJpdGVfcGxhbmU7CiAKIAlwb3NzaWJsZV9j
cnRjcyA9IEJJVChwaXBlKTsKIAotCXJldCA9IGRybV91bml2ZXJzYWxfcGxhbmVfaW5pdCgmZGV2
X3ByaXYtPmRybSwgJmludGVsX3BsYW5lLT5iYXNlLAorCXJldCA9IGRybV91bml2ZXJzYWxfcGxh
bmVfaW5pdCgmZGV2X3ByaXYtPmRybSwgJnBsYW5lLT5iYXNlLAogCQkJCSAgICAgICBwb3NzaWJs
ZV9jcnRjcywgJmludGVsX3Nwcml0ZV9wbGFuZV9mdW5jcywKLQkJCQkgICAgICAgcGxhbmVfZm9y
bWF0cywgbnVtX3BsYW5lX2Zvcm1hdHMsCi0JCQkJICAgICAgIG1vZGlmaWVycywKKwkJCQkgICAg
ICAgZm9ybWF0cywgbnVtX2Zvcm1hdHMsIG1vZGlmaWVycywKIAkJCQkgICAgICAgRFJNX1BMQU5F
X1RZUEVfT1ZFUkxBWSwKLQkJCQkgICAgICAgInNwcml0ZSAlYyIsIHNwcml0ZV9uYW1lKHBpcGUs
IHBsYW5lKSk7CisJCQkJICAgICAgICJzcHJpdGUgJWMiLCBzcHJpdGVfbmFtZShwaXBlLCBzcHJp
dGUpKTsKIAlpZiAocmV0KQogCQlnb3RvIGZhaWw7CiAKLQlkcm1fcGxhbmVfY3JlYXRlX3JvdGF0
aW9uX3Byb3BlcnR5KCZpbnRlbF9wbGFuZS0+YmFzZSwKKwlkcm1fcGxhbmVfY3JlYXRlX3JvdGF0
aW9uX3Byb3BlcnR5KCZwbGFuZS0+YmFzZSwKIAkJCQkJICAgRFJNX01PREVfUk9UQVRFXzAsCiAJ
CQkJCSAgIHN1cHBvcnRlZF9yb3RhdGlvbnMpOwogCi0JZHJtX3BsYW5lX2NyZWF0ZV9jb2xvcl9w
cm9wZXJ0aWVzKCZpbnRlbF9wbGFuZS0+YmFzZSwKKwlkcm1fcGxhbmVfY3JlYXRlX2NvbG9yX3By
b3BlcnRpZXMoJnBsYW5lLT5iYXNlLAogCQkJCQkgIEJJVChEUk1fQ09MT1JfWUNCQ1JfQlQ2MDEp
IHwKIAkJCQkJICBCSVQoRFJNX0NPTE9SX1lDQkNSX0JUNzA5KSwKIAkJCQkJICBCSVQoRFJNX0NP
TE9SX1lDQkNSX0xJTUlURURfUkFOR0UpIHwKQEAgLTE2MjMsMTIgKzE2MjIsMTIgQEAgaW50ZWxf
c3ByaXRlX3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJ
CQkJCSAgRFJNX0NPTE9SX1lDQkNSX0JUNzA5LAogCQkJCQkgIERSTV9DT0xPUl9ZQ0JDUl9MSU1J
VEVEX1JBTkdFKTsKIAotCWRybV9wbGFuZV9oZWxwZXJfYWRkKCZpbnRlbF9wbGFuZS0+YmFzZSwg
JmludGVsX3BsYW5lX2hlbHBlcl9mdW5jcyk7CisJZHJtX3BsYW5lX2hlbHBlcl9hZGQoJnBsYW5l
LT5iYXNlLCAmaW50ZWxfcGxhbmVfaGVscGVyX2Z1bmNzKTsKIAotCXJldHVybiBpbnRlbF9wbGFu
ZTsKKwlyZXR1cm4gcGxhbmU7CiAKIGZhaWw6Ci0JaW50ZWxfcGxhbmVfZnJlZShpbnRlbF9wbGFu
ZSk7CisJaW50ZWxfcGxhbmVfZnJlZShwbGFuZSk7CiAKIAlyZXR1cm4gRVJSX1BUUihyZXQpOwog
fQotLSAKMi4xNi4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5v
cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n
ZngK