From mboxrd@z Thu Jan  1 00:00:00 1970
From: John Stultz <john.stultz@linaro.org>
Subject: [PATCH v5 06/25] drm: kirin: Rename ade_plane to kirin_plane
Date: Tue, 20 Aug 2019 23:06:07 +0000
Message-ID: <20190820230626.23253-7-john.stultz@linaro.org>
References: <20190820230626.23253-1-john.stultz@linaro.org>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <dri-devel-bounces@lists.freedesktop.org>
Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com
 [IPv6:2607:f8b0:4864:20::542])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 21A2B6E8B2
 for <dri-devel@lists.freedesktop.org>; Tue, 20 Aug 2019 23:06:39 +0000 (UTC)
Received: by mail-pg1-x542.google.com with SMTP id i18so141763pgl.11
 for <dri-devel@lists.freedesktop.org>; Tue, 20 Aug 2019 16:06:39 -0700 (PDT)
In-Reply-To: <20190820230626.23253-1-john.stultz@linaro.org>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
To: lkml <linux-kernel@vger.kernel.org>
Cc: Xu YiPing <xuyiping@hisilicon.com>, David Airlie <airlied@linux.ie>, dri-devel <dri-devel@lists.freedesktop.org>, Xinliang Liu <z.liuxinliang@hisilicon.com>, Rongrong Zou <zourongrong@gmail.com>, Sam Ravnborg <sam@ravnborg.org>
List-Id: dri-devel@lists.freedesktop.org

RnJvbTogWHUgWWlQaW5nIDx4dXlpcGluZ0BoaXNpbGljb24uY29tPgoKQXMgcGFydCBvZiByZWZh
Y3RvcmluZyB0aGUga2lyaW4gZHJpdmVyIHRvIGJldHRlciBzdXBwb3J0CmRpZmZlcmVudCBoYXJk
d2FyZSByZXZpc2lvbnMsIHRoaXMgcGF0Y2ggcmVuYW1lcyB0aGUKc3RydWN0IGFkZV9wbGFuZSB0
byBraXJpbl9wbGFuZS4KClRoZSBzdHJ1Y3Qga2lyaW5fcGxhbmUgd2lsbCBsYXRlciB1c2VkIGJ5
IGJvdGgga2lyaW42MjAgYW5kCmZ1dHVyZSBraXJpbjk2MCBkcml2ZXIsIGFuZCB3aWxsIGJlIG1v
dmVkIHRvIGEgY29tbW9uCmtpcmluX2RybV9kcnYuaCBpbiBhIGZ1dHVyZSBwYXRjaAoKQ2M6IFJv
bmdyb25nIFpvdSA8em91cm9uZ3JvbmdAZ21haWwuY29tPgpDYzogWGlubGlhbmcgTGl1IDx6Lmxp
dXhpbmxpYW5nQGhpc2lsaWNvbi5jb20+CkNjOiBEYXZpZCBBaXJsaWUgPGFpcmxpZWRAbGludXgu
aWU+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWxAZmZ3bGwuY2g+CkNjOiBkcmktZGV2ZWwgPGRy
aS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmc+CkNjOiBTYW0gUmF2bmJvcmcgPHNhbUByYXZu
Ym9yZy5vcmc+CkFja2VkLWJ5OiBYaW5saWFuZyBMaXUgPHoubGl1eGlubGlhbmdAaGlzaWxpY29u
LmNvbT4KUmV2aWV3ZWQtYnk6IFNhbSBSYXZuYm9yZyA8c2FtQHJhdm5ib3JnLm9yZz4KU2lnbmVk
LW9mZi1ieTogWHUgWWlQaW5nIDx4dXlpcGluZ0BoaXNpbGljb24uY29tPgpbanN0dWx0ejogcmV3
b3JkZWQgY29tbWl0IG1lc3NhZ2VdClNpZ25lZC1vZmYtYnk6IEpvaG4gU3R1bHR6IDxqb2huLnN0
dWx0ekBsaW5hcm8ub3JnPgotLS0KIC4uLi9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9k
cm1fYWRlLmMgICB8IDU3ICsrKysrKysrKystLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyOSBp
bnNlcnRpb25zKCspLCAyOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k
cm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9hZGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9oaXNp
bGljb24va2lyaW4va2lyaW5fZHJtX2FkZS5jCmluZGV4IDY1ZjFhNTdmNzMwNC4uMTlkMjc5MTY3
Njk0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2Ry
bV9hZGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9h
ZGUuYwpAQCAtNDEsOCArNDEsOSBAQAogI2RlZmluZSB0b19hZGVfY3J0YyhjcnRjKSBcCiAJY29u
dGFpbmVyX29mKGNydGMsIHN0cnVjdCBhZGVfY3J0YywgYmFzZSkKIAotI2RlZmluZSB0b19hZGVf
cGxhbmUocGxhbmUpIFwKLQljb250YWluZXJfb2YocGxhbmUsIHN0cnVjdCBhZGVfcGxhbmUsIGJh
c2UpCisjZGVmaW5lIHRvX2tpcmluX3BsYW5lKHBsYW5lKSBcCisJY29udGFpbmVyX29mKHBsYW5l
LCBzdHJ1Y3Qga2lyaW5fcGxhbmUsIGJhc2UpCisKIAogc3RydWN0IGFkZV9od19jdHggewogCXZv
aWQgX19pb21lbSAgKmJhc2U7CkBAIC02MiwxNSArNjMsMTUgQEAgc3RydWN0IGFkZV9jcnRjIHsK
IAlib29sIGVuYWJsZTsKIH07CiAKLXN0cnVjdCBhZGVfcGxhbmUgeworc3RydWN0IGtpcmluX3Bs
YW5lIHsKIAlzdHJ1Y3QgZHJtX3BsYW5lIGJhc2U7Ci0Jdm9pZCAqY3R4OwotCXU4IGNoOyAvKiBj
aGFubmVsICovCisJdm9pZCAqaHdfY3R4OworCXUzMiBjaDsKIH07CiAKIHN0cnVjdCBhZGVfZGF0
YSB7CiAJc3RydWN0IGFkZV9jcnRjIGFjcnRjOwotCXN0cnVjdCBhZGVfcGxhbmUgYXBsYW5lW0FE
RV9DSF9OVU1dOworCXN0cnVjdCBraXJpbl9wbGFuZSBwbGFuZXNbQURFX0NIX05VTV07CiAJc3Ry
dWN0IGFkZV9od19jdHggY3R4OwogfTsKIApAQCAtNzk1LDE2ICs3OTYsMTYgQEAgc3RhdGljIHZv
aWQgYWRlX2NvbXBvc2l0b3Jfcm91dGluZ19kaXNhYmxlKHZvaWQgX19pb21lbSAqYmFzZSwgdTMy
IGNoKQogLyoKICAqIFR5cGljYWx5LCBhIGNoYW5uZWwgbG9va3MgbGlrZTogRE1BLS0+Y2xpcC0t
PnNjYWxlLS0+Y3RyYW5zLS0+Y29tcG9zaXRvcgogICovCi1zdGF0aWMgdm9pZCBhZGVfdXBkYXRl
X2NoYW5uZWwoc3RydWN0IGFkZV9wbGFuZSAqYXBsYW5lLAorc3RhdGljIHZvaWQgYWRlX3VwZGF0
ZV9jaGFubmVsKHN0cnVjdCBraXJpbl9wbGFuZSAqa3BsYW5lLAogCQkJICAgICAgIHN0cnVjdCBk
cm1fZnJhbWVidWZmZXIgKmZiLCBpbnQgY3J0Y194LAogCQkJICAgICAgIGludCBjcnRjX3ksIHVu
c2lnbmVkIGludCBjcnRjX3csCiAJCQkgICAgICAgdW5zaWduZWQgaW50IGNydGNfaCwgdTMyIHNy
Y194LAogCQkJICAgICAgIHUzMiBzcmNfeSwgdTMyIHNyY193LCB1MzIgc3JjX2gpCiB7Ci0Jc3Ry
dWN0IGFkZV9od19jdHggKmN0eCA9IGFwbGFuZS0+Y3R4OworCXN0cnVjdCBhZGVfaHdfY3R4ICpj
dHggPSBrcGxhbmUtPmh3X2N0eDsKIAl2b2lkIF9faW9tZW0gKmJhc2UgPSBjdHgtPmJhc2U7CiAJ
dTMyIGZtdCA9IGFkZV9nZXRfZm9ybWF0KGZiLT5mb3JtYXQtPmZvcm1hdCk7Ci0JdTMyIGNoID0g
YXBsYW5lLT5jaDsKKwl1MzIgY2ggPSBrcGxhbmUtPmNoOwogCXUzMiBpbl93OwogCXUzMiBpbl9o
OwogCkBAIC04MjgsMTEgKzgyOSwxMSBAQCBzdGF0aWMgdm9pZCBhZGVfdXBkYXRlX2NoYW5uZWwo
c3RydWN0IGFkZV9wbGFuZSAqYXBsYW5lLAogCWFkZV9jb21wb3NpdG9yX3JvdXRpbmdfc2V0KGJh
c2UsIGNoLCBjcnRjX3gsIGNydGNfeSwgaW5fdywgaW5faCwgZm10KTsKIH0KIAotc3RhdGljIHZv
aWQgYWRlX2Rpc2FibGVfY2hhbm5lbChzdHJ1Y3QgYWRlX3BsYW5lICphcGxhbmUpCitzdGF0aWMg
dm9pZCBhZGVfZGlzYWJsZV9jaGFubmVsKHN0cnVjdCBraXJpbl9wbGFuZSAqa3BsYW5lKQogewot
CXN0cnVjdCBhZGVfaHdfY3R4ICpjdHggPSBhcGxhbmUtPmN0eDsKKwlzdHJ1Y3QgYWRlX2h3X2N0
eCAqY3R4ID0ga3BsYW5lLT5od19jdHg7CiAJdm9pZCBfX2lvbWVtICpiYXNlID0gY3R4LT5iYXNl
OwotCXUzMiBjaCA9IGFwbGFuZS0+Y2g7CisJdTMyIGNoID0ga3BsYW5lLT5jaDsKIAogCURSTV9E
RUJVR19EUklWRVIoImRpc2FibGUgY2hhbm5lbCVkXG4iLCBjaCArIDEpOwogCkBAIC04OTQsMTAg
Kzg5NSwxMCBAQCBzdGF0aWMgaW50IGFkZV9wbGFuZV9hdG9taWNfY2hlY2soc3RydWN0IGRybV9w
bGFuZSAqcGxhbmUsCiBzdGF0aWMgdm9pZCBhZGVfcGxhbmVfYXRvbWljX3VwZGF0ZShzdHJ1Y3Qg
ZHJtX3BsYW5lICpwbGFuZSwKIAkJCQkgICAgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqb2xkX3N0
YXRlKQogewotCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUJKnN0YXRlCT0gcGxhbmUtPnN0YXRlOwot
CXN0cnVjdCBhZGVfcGxhbmUgKmFwbGFuZSA9IHRvX2FkZV9wbGFuZShwbGFuZSk7CisJc3RydWN0
IGRybV9wbGFuZV9zdGF0ZSAqc3RhdGUgPSBwbGFuZS0+c3RhdGU7CisJc3RydWN0IGtpcmluX3Bs
YW5lICprcGxhbmUgPSB0b19raXJpbl9wbGFuZShwbGFuZSk7CiAKLQlhZGVfdXBkYXRlX2NoYW5u
ZWwoYXBsYW5lLCBzdGF0ZS0+ZmIsIHN0YXRlLT5jcnRjX3gsIHN0YXRlLT5jcnRjX3ksCisJYWRl
X3VwZGF0ZV9jaGFubmVsKGtwbGFuZSwgc3RhdGUtPmZiLCBzdGF0ZS0+Y3J0Y194LCBzdGF0ZS0+
Y3J0Y195LAogCQkJICAgc3RhdGUtPmNydGNfdywgc3RhdGUtPmNydGNfaCwKIAkJCSAgIHN0YXRl
LT5zcmNfeCA+PiAxNiwgc3RhdGUtPnNyY195ID4+IDE2LAogCQkJICAgc3RhdGUtPnNyY193ID4+
IDE2LCBzdGF0ZS0+c3JjX2ggPj4gMTYpOwpAQCAtOTA2LDkgKzkwNyw5IEBAIHN0YXRpYyB2b2lk
IGFkZV9wbGFuZV9hdG9taWNfdXBkYXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogc3RhdGlj
IHZvaWQgYWRlX3BsYW5lX2F0b21pY19kaXNhYmxlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAog
CQkJCSAgICAgc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqb2xkX3N0YXRlKQogewotCXN0cnVjdCBh
ZGVfcGxhbmUgKmFwbGFuZSA9IHRvX2FkZV9wbGFuZShwbGFuZSk7CisJc3RydWN0IGtpcmluX3Bs
YW5lICprcGxhbmUgPSB0b19raXJpbl9wbGFuZShwbGFuZSk7CiAKLQlhZGVfZGlzYWJsZV9jaGFu
bmVsKGFwbGFuZSk7CisJYWRlX2Rpc2FibGVfY2hhbm5lbChrcGxhbmUpOwogfQogCiBzdGF0aWMg
Y29uc3Qgc3RydWN0IGRybV9wbGFuZV9oZWxwZXJfZnVuY3MgYWRlX3BsYW5lX2hlbHBlcl9mdW5j
cyA9IHsKQEAgLTkyNiw3ICs5MjcsNyBAQCBzdGF0aWMgc3RydWN0IGRybV9wbGFuZV9mdW5jcyBh
ZGVfcGxhbmVfZnVuY3MgPSB7CiAJLmF0b21pY19kZXN0cm95X3N0YXRlID0gZHJtX2F0b21pY19o
ZWxwZXJfcGxhbmVfZGVzdHJveV9zdGF0ZSwKIH07CiAKLXN0YXRpYyBpbnQgYWRlX3BsYW5lX2lu
aXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGFkZV9wbGFuZSAqYXBsYW5lLAorc3Rh
dGljIGludCBhZGVfcGxhbmVfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3Qga2ly
aW5fcGxhbmUgKmtwbGFuZSwKIAkJCSAgZW51bSBkcm1fcGxhbmVfdHlwZSB0eXBlKQogewogCWNv
bnN0IHUzMiAqZm10czsKQEAgLTkzNCwxOCArOTM1LDE4IEBAIHN0YXRpYyBpbnQgYWRlX3BsYW5l
X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGFkZV9wbGFuZSAqYXBsYW5lLAog
CWludCByZXQgPSAwOwogCiAJLyogZ2V0ICBwcm9wZXJ0aWVzICovCi0JZm10c19jbnQgPSBhZGVf
Z2V0X2NoYW5uZWxfZm9ybWF0cyhhcGxhbmUtPmNoLCAmZm10cyk7CisJZm10c19jbnQgPSBhZGVf
Z2V0X2NoYW5uZWxfZm9ybWF0cyhrcGxhbmUtPmNoLCAmZm10cyk7CiAJaWYgKHJldCkKIAkJcmV0
dXJuIHJldDsKIAotCXJldCA9IGRybV91bml2ZXJzYWxfcGxhbmVfaW5pdChkZXYsICZhcGxhbmUt
PmJhc2UsIDEsICZhZGVfcGxhbmVfZnVuY3MsCisJcmV0ID0gZHJtX3VuaXZlcnNhbF9wbGFuZV9p
bml0KGRldiwgJmtwbGFuZS0+YmFzZSwgMSwgJmFkZV9wbGFuZV9mdW5jcywKIAkJCQkgICAgICAg
Zm10cywgZm10c19jbnQsIE5VTEwsIHR5cGUsIE5VTEwpOwogCWlmIChyZXQpIHsKLQkJRFJNX0VS
Uk9SKCJmYWlsIHRvIGluaXQgcGxhbmUsIGNoPSVkXG4iLCBhcGxhbmUtPmNoKTsKKwkJRFJNX0VS
Uk9SKCJmYWlsIHRvIGluaXQgcGxhbmUsIGNoPSVkXG4iLCBrcGxhbmUtPmNoKTsKIAkJcmV0dXJu
IHJldDsKIAl9CiAKLQlkcm1fcGxhbmVfaGVscGVyX2FkZCgmYXBsYW5lLT5iYXNlLCAmYWRlX3Bs
YW5lX2hlbHBlcl9mdW5jcyk7CisJZHJtX3BsYW5lX2hlbHBlcl9hZGQoJmtwbGFuZS0+YmFzZSwg
JmFkZV9wbGFuZV9oZWxwZXJfZnVuY3MpOwogCiAJcmV0dXJuIDA7CiB9CkBAIC0xMDA3LDcgKzEw
MDgsNyBAQCBzdGF0aWMgaW50IGFkZV9kcm1faW5pdChzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpw
ZGV2KQogCXN0cnVjdCBhZGVfZGF0YSAqYWRlOwogCXN0cnVjdCBhZGVfaHdfY3R4ICpjdHg7CiAJ
c3RydWN0IGFkZV9jcnRjICphY3J0YzsKLQlzdHJ1Y3QgYWRlX3BsYW5lICphcGxhbmU7CisJc3Ry
dWN0IGtpcmluX3BsYW5lICprcGxhbmU7CiAJZW51bSBkcm1fcGxhbmVfdHlwZSB0eXBlOwogCWlu
dCByZXQ7CiAJaW50IGk7CkBAIC0xMDMzLDE5ICsxMDM0LDE5IEBAIHN0YXRpYyBpbnQgYWRlX2Ry
bV9pbml0KHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAJICogbmVlZCB0byBkby4KIAkg
Ki8KIAlmb3IgKGkgPSAwOyBpIDwgQURFX0NIX05VTTsgaSsrKSB7Ci0JCWFwbGFuZSA9ICZhZGUt
PmFwbGFuZVtpXTsKLQkJYXBsYW5lLT5jaCA9IGk7Ci0JCWFwbGFuZS0+Y3R4ID0gY3R4OworCQlr
cGxhbmUgPSAmYWRlLT5wbGFuZXNbaV07CisJCWtwbGFuZS0+Y2ggPSBpOworCQlrcGxhbmUtPmh3
X2N0eCA9IGN0eDsKIAkJdHlwZSA9IGkgPT0gUFJJTUFSWV9DSCA/IERSTV9QTEFORV9UWVBFX1BS
SU1BUlkgOgogCQkJRFJNX1BMQU5FX1RZUEVfT1ZFUkxBWTsKIAotCQlyZXQgPSBhZGVfcGxhbmVf
aW5pdChkZXYsIGFwbGFuZSwgdHlwZSk7CisJCXJldCA9IGFkZV9wbGFuZV9pbml0KGRldiwga3Bs
YW5lLCB0eXBlKTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7CiAJfQogCiAJLyogY3J0YyBp
bml0ICovCi0JcmV0ID0gYWRlX2NydGNfaW5pdChkZXYsICZhY3J0Yy0+YmFzZSwgJmFkZS0+YXBs
YW5lW1BSSU1BUllfQ0hdLmJhc2UpOworCXJldCA9IGFkZV9jcnRjX2luaXQoZGV2LCAmYWNydGMt
PmJhc2UsICZhZGUtPnBsYW5lc1tQUklNQVJZX0NIXS5iYXNlKTsKIAlpZiAocmV0KQogCQlyZXR1
cm4gcmV0OwogCi0tIAoyLjE3LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVk
ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv
L2RyaS1kZXZlbA==