From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Stultz Subject: [PATCH v3 07/26] drm: kirin: Rename ade_plane to kirin_plane Date: Thu, 1 Aug 2019 03:44:20 +0000 Message-ID: <20190801034439.98227-8-john.stultz@linaro.org> References: <20190801034439.98227-1-john.stultz@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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 BB5AC6E33E for ; Thu, 1 Aug 2019 03:44:56 +0000 (UTC) Received: by mail-pg1-x542.google.com with SMTP id i18so33272373pgl.11 for ; Wed, 31 Jul 2019 20:44:56 -0700 (PDT) In-Reply-To: <20190801034439.98227-1-john.stultz@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: lkml Cc: Xu YiPing , David Airlie , dri-devel , Rongrong Zou , Sam Ravnborg List-Id: dri-devel@lists.freedesktop.org RnJvbTogWHUgWWlQaW5nIDx4dXlpcGluZ0BoaXNpbGljb24uY29tPgoKQXMgcGFydCBvZiByZWZh Y3RvcmluZyB0aGUga2lyaW4gZHJpdmVyIHRvIGJldHRlciBzdXBwb3J0CmRpZmZlcmVudCBoYXJk d2FyZSByZXZpc2lvbnMsIHRoaXMgcGF0Y2ggcmVuYW1lcyB0aGUKc3RydWN0IGFkZV9wbGFuZSB0 byBraXJpbl9wbGFuZS4KClRoZSBzdHJ1Y3Qga2lyaW5fcGxhbmUgd2lsbCBsYXRlciB1c2VkIGJ5 IGJvdGgga2lyaW42MjAgYW5kCmZ1dHVyZSBraXJpbjk2MCBkcml2ZXIsIGFuZCB3aWxsIGJlIG1v dmVkIHRvIGEgY29tbW9uCmtpcmluX2RybV9kcnYuaCBpbiBhIGZ1dHVyZSBwYXRjaAoKQ2M6IFJv bmdyb25nIFpvdSA8em91cm9uZ3JvbmdAZ21haWwuY29tPgpDYzogRGF2aWQgQWlybGllIDxhaXJs aWVkQGxpbnV4LmllPgpDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVsQGZmd2xsLmNoPgpDYzogZHJp LWRldmVsIDxkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnPgpDYzogU2FtIFJhdm5ib3Jn IDxzYW1AcmF2bmJvcmcub3JnPgpSZXZpZXdlZC1ieTogU2FtIFJhdm5ib3JnIDxzYW1AcmF2bmJv cmcub3JnPgpTaWduZWQtb2ZmLWJ5OiBYdSBZaVBpbmcgPHh1eWlwaW5nQGhpc2lsaWNvbi5jb20+ Cltqc3R1bHR6OiByZXdvcmRlZCBjb21taXQgbWVzc2FnZV0KU2lnbmVkLW9mZi1ieTogSm9obiBT dHVsdHogPGpvaG4uc3R1bHR6QGxpbmFyby5vcmc+Ci0tLQogLi4uL2dwdS9kcm0vaGlzaWxpY29u L2tpcmluL2tpcmluX2RybV9hZGUuYyAgIHwgNTcgKysrKysrKysrKy0tLS0tLS0tLQogMSBmaWxl IGNoYW5nZWQsIDI5IGluc2VydGlvbnMoKyksIDI4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2FkZS5jIGIvZHJpdmVy cy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fYWRlLmMKaW5kZXggNzNkZmYyMWJl ZDZhLi5jMDkwNDA4NzZlNjggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24v a2lyaW4va2lyaW5fZHJtX2FkZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2ly aW4va2lyaW5fZHJtX2FkZS5jCkBAIC00MSw4ICs0MSw5IEBACiAjZGVmaW5lIHRvX2FkZV9jcnRj KGNydGMpIFwKIAljb250YWluZXJfb2YoY3J0Yywgc3RydWN0IGFkZV9jcnRjLCBiYXNlKQogCi0j ZGVmaW5lIHRvX2FkZV9wbGFuZShwbGFuZSkgXAotCWNvbnRhaW5lcl9vZihwbGFuZSwgc3RydWN0 IGFkZV9wbGFuZSwgYmFzZSkKKyNkZWZpbmUgdG9fa2lyaW5fcGxhbmUocGxhbmUpIFwKKwljb250 YWluZXJfb2YocGxhbmUsIHN0cnVjdCBraXJpbl9wbGFuZSwgYmFzZSkKKwogCiBzdHJ1Y3QgYWRl X2h3X2N0eCB7CiAJdm9pZCBfX2lvbWVtICAqYmFzZTsKQEAgLTYyLDE1ICs2MywxNSBAQCBzdHJ1 Y3QgYWRlX2NydGMgewogCWJvb2wgZW5hYmxlOwogfTsKIAotc3RydWN0IGFkZV9wbGFuZSB7Citz dHJ1Y3Qga2lyaW5fcGxhbmUgewogCXN0cnVjdCBkcm1fcGxhbmUgYmFzZTsKLQl2b2lkICpjdHg7 Ci0JdTggY2g7IC8qIGNoYW5uZWwgKi8KKwl2b2lkICpod19jdHg7CisJdTMyIGNoOwogfTsKIAog c3RydWN0IGFkZV9kYXRhIHsKIAlzdHJ1Y3QgYWRlX2NydGMgYWNydGM7Ci0Jc3RydWN0IGFkZV9w bGFuZSBhcGxhbmVbQURFX0NIX05VTV07CisJc3RydWN0IGtpcmluX3BsYW5lIHBsYW5lc1tBREVf Q0hfTlVNXTsKIAlzdHJ1Y3QgYWRlX2h3X2N0eCBjdHg7CiB9OwogCkBAIC03OTUsMTYgKzc5Niwx NiBAQCBzdGF0aWMgdm9pZCBhZGVfY29tcG9zaXRvcl9yb3V0aW5nX2Rpc2FibGUodm9pZCBfX2lv bWVtICpiYXNlLCB1MzIgY2gpCiAvKgogICogVHlwaWNhbHksIGEgY2hhbm5lbCBsb29rcyBsaWtl OiBETUEtLT5jbGlwLS0+c2NhbGUtLT5jdHJhbnMtLT5jb21wb3NpdG9yCiAgKi8KLXN0YXRpYyB2 b2lkIGFkZV91cGRhdGVfY2hhbm5lbChzdHJ1Y3QgYWRlX3BsYW5lICphcGxhbmUsCitzdGF0aWMg dm9pZCBhZGVfdXBkYXRlX2NoYW5uZWwoc3RydWN0IGtpcmluX3BsYW5lICprcGxhbmUsCiAJCQkg ICAgICAgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsIGludCBjcnRjX3gsCiAJCQkgICAgICAg aW50IGNydGNfeSwgdW5zaWduZWQgaW50IGNydGNfdywKIAkJCSAgICAgICB1bnNpZ25lZCBpbnQg Y3J0Y19oLCB1MzIgc3JjX3gsCiAJCQkgICAgICAgdTMyIHNyY195LCB1MzIgc3JjX3csIHUzMiBz cmNfaCkKIHsKLQlzdHJ1Y3QgYWRlX2h3X2N0eCAqY3R4ID0gYXBsYW5lLT5jdHg7CisJc3RydWN0 IGFkZV9od19jdHggKmN0eCA9IGtwbGFuZS0+aHdfY3R4OwogCXZvaWQgX19pb21lbSAqYmFzZSA9 IGN0eC0+YmFzZTsKIAl1MzIgZm10ID0gYWRlX2dldF9mb3JtYXQoZmItPmZvcm1hdC0+Zm9ybWF0 KTsKLQl1MzIgY2ggPSBhcGxhbmUtPmNoOworCXUzMiBjaCA9IGtwbGFuZS0+Y2g7CiAJdTMyIGlu X3c7CiAJdTMyIGluX2g7CiAKQEAgLTgyOCwxMSArODI5LDExIEBAIHN0YXRpYyB2b2lkIGFkZV91 cGRhdGVfY2hhbm5lbChzdHJ1Y3QgYWRlX3BsYW5lICphcGxhbmUsCiAJYWRlX2NvbXBvc2l0b3Jf cm91dGluZ19zZXQoYmFzZSwgY2gsIGNydGNfeCwgY3J0Y195LCBpbl93LCBpbl9oLCBmbXQpOwog fQogCi1zdGF0aWMgdm9pZCBhZGVfZGlzYWJsZV9jaGFubmVsKHN0cnVjdCBhZGVfcGxhbmUgKmFw bGFuZSkKK3N0YXRpYyB2b2lkIGFkZV9kaXNhYmxlX2NoYW5uZWwoc3RydWN0IGtpcmluX3BsYW5l ICprcGxhbmUpCiB7Ci0Jc3RydWN0IGFkZV9od19jdHggKmN0eCA9IGFwbGFuZS0+Y3R4OworCXN0 cnVjdCBhZGVfaHdfY3R4ICpjdHggPSBrcGxhbmUtPmh3X2N0eDsKIAl2b2lkIF9faW9tZW0gKmJh c2UgPSBjdHgtPmJhc2U7Ci0JdTMyIGNoID0gYXBsYW5lLT5jaDsKKwl1MzIgY2ggPSBrcGxhbmUt PmNoOwogCiAJRFJNX0RFQlVHX0RSSVZFUigiZGlzYWJsZSBjaGFubmVsJWRcbiIsIGNoICsgMSk7 CiAKQEAgLTg5NCwxMCArODk1LDEwIEBAIHN0YXRpYyBpbnQgYWRlX3BsYW5lX2F0b21pY19jaGVj ayhzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwKIHN0YXRpYyB2b2lkIGFkZV9wbGFuZV9hdG9taWNf dXBkYXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJCSAgICBzdHJ1Y3QgZHJtX3BsYW5l X3N0YXRlICpvbGRfc3RhdGUpCiB7Ci0Jc3RydWN0IGRybV9wbGFuZV9zdGF0ZQkqc3RhdGUJPSBw bGFuZS0+c3RhdGU7Ci0Jc3RydWN0IGFkZV9wbGFuZSAqYXBsYW5lID0gdG9fYWRlX3BsYW5lKHBs YW5lKTsKKwlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpzdGF0ZSA9IHBsYW5lLT5zdGF0ZTsKKwlz dHJ1Y3Qga2lyaW5fcGxhbmUgKmtwbGFuZSA9IHRvX2tpcmluX3BsYW5lKHBsYW5lKTsKIAotCWFk ZV91cGRhdGVfY2hhbm5lbChhcGxhbmUsIHN0YXRlLT5mYiwgc3RhdGUtPmNydGNfeCwgc3RhdGUt PmNydGNfeSwKKwlhZGVfdXBkYXRlX2NoYW5uZWwoa3BsYW5lLCBzdGF0ZS0+ZmIsIHN0YXRlLT5j cnRjX3gsIHN0YXRlLT5jcnRjX3ksCiAJCQkgICBzdGF0ZS0+Y3J0Y193LCBzdGF0ZS0+Y3J0Y19o LAogCQkJICAgc3RhdGUtPnNyY194ID4+IDE2LCBzdGF0ZS0+c3JjX3kgPj4gMTYsCiAJCQkgICBz dGF0ZS0+c3JjX3cgPj4gMTYsIHN0YXRlLT5zcmNfaCA+PiAxNik7CkBAIC05MDYsOSArOTA3LDkg QEAgc3RhdGljIHZvaWQgYWRlX3BsYW5lX2F0b21pY191cGRhdGUoc3RydWN0IGRybV9wbGFuZSAq cGxhbmUsCiBzdGF0aWMgdm9pZCBhZGVfcGxhbmVfYXRvbWljX2Rpc2FibGUoc3RydWN0IGRybV9w bGFuZSAqcGxhbmUsCiAJCQkJICAgICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpvbGRfc3RhdGUp CiB7Ci0Jc3RydWN0IGFkZV9wbGFuZSAqYXBsYW5lID0gdG9fYWRlX3BsYW5lKHBsYW5lKTsKKwlz dHJ1Y3Qga2lyaW5fcGxhbmUgKmtwbGFuZSA9IHRvX2tpcmluX3BsYW5lKHBsYW5lKTsKIAotCWFk ZV9kaXNhYmxlX2NoYW5uZWwoYXBsYW5lKTsKKwlhZGVfZGlzYWJsZV9jaGFubmVsKGtwbGFuZSk7 CiB9CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2hlbHBlcl9mdW5jcyBhZGVfcGxh bmVfaGVscGVyX2Z1bmNzID0gewpAQCAtOTI2LDcgKzkyNyw3IEBAIHN0YXRpYyBzdHJ1Y3QgZHJt X3BsYW5lX2Z1bmNzIGFkZV9wbGFuZV9mdW5jcyA9IHsKIAkuYXRvbWljX2Rlc3Ryb3lfc3RhdGUg PSBkcm1fYXRvbWljX2hlbHBlcl9wbGFuZV9kZXN0cm95X3N0YXRlLAogfTsKIAotc3RhdGljIGlu dCBhZGVfcGxhbmVfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgYWRlX3BsYW5l ICphcGxhbmUsCitzdGF0aWMgaW50IGFkZV9wbGFuZV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsIHN0cnVjdCBraXJpbl9wbGFuZSAqa3BsYW5lLAogCQkJICBlbnVtIGRybV9wbGFuZV90eXBl IHR5cGUpCiB7CiAJY29uc3QgdTMyICpmbXRzOwpAQCAtOTM0LDE4ICs5MzUsMTggQEAgc3RhdGlj IGludCBhZGVfcGxhbmVfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgYWRlX3Bs YW5lICphcGxhbmUsCiAJaW50IHJldCA9IDA7CiAKIAkvKiBnZXQgIHByb3BlcnRpZXMgKi8KLQlm bXRzX2NudCA9IGFkZV9nZXRfY2hhbm5lbF9mb3JtYXRzKGFwbGFuZS0+Y2gsICZmbXRzKTsKKwlm bXRzX2NudCA9IGFkZV9nZXRfY2hhbm5lbF9mb3JtYXRzKGtwbGFuZS0+Y2gsICZmbXRzKTsKIAlp ZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0JcmV0ID0gZHJtX3VuaXZlcnNhbF9wbGFuZV9pbml0 KGRldiwgJmFwbGFuZS0+YmFzZSwgMSwgJmFkZV9wbGFuZV9mdW5jcywKKwlyZXQgPSBkcm1fdW5p dmVyc2FsX3BsYW5lX2luaXQoZGV2LCAma3BsYW5lLT5iYXNlLCAxLCAmYWRlX3BsYW5lX2Z1bmNz LAogCQkJCSAgICAgICBmbXRzLCBmbXRzX2NudCwgTlVMTCwgdHlwZSwgTlVMTCk7CiAJaWYgKHJl dCkgewotCQlEUk1fRVJST1IoImZhaWwgdG8gaW5pdCBwbGFuZSwgY2g9JWRcbiIsIGFwbGFuZS0+ Y2gpOworCQlEUk1fRVJST1IoImZhaWwgdG8gaW5pdCBwbGFuZSwgY2g9JWRcbiIsIGtwbGFuZS0+ Y2gpOwogCQlyZXR1cm4gcmV0OwogCX0KIAotCWRybV9wbGFuZV9oZWxwZXJfYWRkKCZhcGxhbmUt PmJhc2UsICZhZGVfcGxhbmVfaGVscGVyX2Z1bmNzKTsKKwlkcm1fcGxhbmVfaGVscGVyX2FkZCgm a3BsYW5lLT5iYXNlLCAmYWRlX3BsYW5lX2hlbHBlcl9mdW5jcyk7CiAKIAlyZXR1cm4gMDsKIH0K QEAgLTEwMDcsNyArMTAwOCw3IEBAIHN0YXRpYyBpbnQgYWRlX2RybV9pbml0KHN0cnVjdCBwbGF0 Zm9ybV9kZXZpY2UgKnBkZXYpCiAJc3RydWN0IGFkZV9kYXRhICphZGU7CiAJc3RydWN0IGFkZV9o d19jdHggKmN0eDsKIAlzdHJ1Y3QgYWRlX2NydGMgKmFjcnRjOwotCXN0cnVjdCBhZGVfcGxhbmUg KmFwbGFuZTsKKwlzdHJ1Y3Qga2lyaW5fcGxhbmUgKmtwbGFuZTsKIAllbnVtIGRybV9wbGFuZV90 eXBlIHR5cGU7CiAJaW50IHJldDsKIAlpbnQgaTsKQEAgLTEwMzMsMTkgKzEwMzQsMTkgQEAgc3Rh dGljIGludCBhZGVfZHJtX2luaXQoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAkgKiBu ZWVkIHRvIGRvLgogCSAqLwogCWZvciAoaSA9IDA7IGkgPCBBREVfQ0hfTlVNOyBpKyspIHsKLQkJ YXBsYW5lID0gJmFkZS0+YXBsYW5lW2ldOwotCQlhcGxhbmUtPmNoID0gaTsKLQkJYXBsYW5lLT5j dHggPSBjdHg7CisJCWtwbGFuZSA9ICZhZGUtPnBsYW5lc1tpXTsKKwkJa3BsYW5lLT5jaCA9IGk7 CisJCWtwbGFuZS0+aHdfY3R4ID0gY3R4OwogCQl0eXBlID0gaSA9PSBQUklNQVJZX0NIID8gRFJN X1BMQU5FX1RZUEVfUFJJTUFSWSA6CiAJCQlEUk1fUExBTkVfVFlQRV9PVkVSTEFZOwogCi0JCXJl dCA9IGFkZV9wbGFuZV9pbml0KGRldiwgYXBsYW5lLCB0eXBlKTsKKwkJcmV0ID0gYWRlX3BsYW5l X2luaXQoZGV2LCBrcGxhbmUsIHR5cGUpOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsKIAl9 CiAKIAkvKiBjcnRjIGluaXQgKi8KLQlyZXQgPSBhZGVfY3J0Y19pbml0KGRldiwgJmFjcnRjLT5i YXNlLCAmYWRlLT5hcGxhbmVbUFJJTUFSWV9DSF0uYmFzZSk7CisJcmV0ID0gYWRlX2NydGNfaW5p dChkZXYsICZhY3J0Yy0+YmFzZSwgJmFkZS0+cGxhbmVzW1BSSU1BUllfQ0hdLmJhc2UpOwogCWlm IChyZXQpCiAJCXJldHVybiByZXQ7CiAKLS0gCjIuMTcuMQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2 ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vZHJpLWRldmVs