From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Stultz Subject: [PATCH 07/25] drm: kirin: Rename ade_crtc to kirin_crtc Date: Tue, 23 Apr 2019 16:20:38 -0700 Message-ID: <1556061656-1733-8-git-send-email-john.stultz@linaro.org> References: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4E18489740 for ; Tue, 23 Apr 2019 23:21:11 +0000 (UTC) Received: by mail-pf1-x444.google.com with SMTP id c207so8244801pfc.7 for ; Tue, 23 Apr 2019 16:21:11 -0700 (PDT) In-Reply-To: <1556061656-1733-1-git-send-email-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 , Chen Feng , dri-devel , Xinliang Liu , Xinwei Kong , Rongrong Zou List-Id: dri-devel@lists.freedesktop.org RnJvbTogWHUgWWlQaW5nIDx4dXlpcGluZ0BoaXNpbGljb24uY29tPgoKQXMgcGFydCBvZiByZWZh Y3RvcmluZyB0aGUga2lyaW4gZHJpdmVyIHRvIGJldHRlciBzdXBwb3J0CmRpZmZlcmVudCBoYXJk d2FyZSByZXZpc2lvbnMsIHRoaXMgcGF0Y2ggcmVuYW1lcyB0aGUKc3RydWN0IGFkZV9jcnRjIHRv IGtpcmluX2NydGMuCgpUaGUgc3RydWN0IGtpcmluX2NydGMgd2lsbCBsYXRlciB1c2VkIGJ5IGJv dGgga2lyaW42MjAgYW5kCmZ1dHVyZSBraXJpbjk2MCBkcml2ZXIsIGFuZCB3aWxsIGJlIG1vdmVk IHRvIGEgY29tbW9uCmtpcmluX2RybV9kcnYuaCBpbiBhIGZ1dHVyZSBwYXRjaAoKQ2M6IFhpbmxp YW5nIExpdSA8ei5saXV4aW5saWFuZ0BoaXNpbGljb24uY29tPgpDYzogUm9uZ3JvbmcgWm91IDx6 b3Vyb25ncm9uZ0BnbWFpbC5jb20+CkNjOiBYaW53ZWkgS29uZyA8a29uZy5rb25neGlud2VpQGhp c2lsaWNvbi5jb20+CkNjOiBDaGVuIEZlbmcgPHB1Y2suY2hlbkBoaXNpbGljb24uY29tPgpDYzog RGF2aWQgQWlybGllIDxhaXJsaWVkQGxpbnV4LmllPgpDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVs QGZmd2xsLmNoPgpDYzogZHJpLWRldmVsIDxkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn PgpTaWduZWQtb2ZmLWJ5OiBYdSBZaVBpbmcgPHh1eWlwaW5nQGhpc2lsaWNvbi5jb20+Cltqc3R1 bHR6OiByZXdvcmRlZCBjb21taXQgbWVzc2FnZV0KU2lnbmVkLW9mZi1ieTogSm9obiBTdHVsdHog PGpvaG4uc3R1bHR6QGxpbmFyby5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9r aXJpbi9raXJpbl9kcm1fYWRlLmMgfCA3NCArKysrKysrKysrKystLS0tLS0tLS0tLS0tCiAxIGZp bGUgY2hhbmdlZCwgMzcgaW5zZXJ0aW9ucygrKSwgMzcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fYWRlLmMgYi9kcml2 ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9hZGUuYwppbmRleCBhMjI5ZGE5 Li5jMjljYTc1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tp cmluX2RybV9hZGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmlu X2RybV9hZGUuYwpAQCAtMzgsOCArMzgsOCBAQAogI2RlZmluZSBPVVRfT1ZMWQlBREVfT1ZMWTIg Lyogb3V0cHV0IG92ZXJsYXkgY29tcG9zaXRvciAqLwogI2RlZmluZSBBREVfREVCVUcJMQogCi0j ZGVmaW5lIHRvX2FkZV9jcnRjKGNydGMpIFwKLQljb250YWluZXJfb2YoY3J0Yywgc3RydWN0IGFk ZV9jcnRjLCBiYXNlKQorI2RlZmluZSB0b19raXJpbl9jcnRjKGNydGMpIFwKKwljb250YWluZXJf b2YoY3J0Yywgc3RydWN0IGtpcmluX2NydGMsIGJhc2UpCiAKICNkZWZpbmUgdG9fa2lyaW5fcGxh bmUocGxhbmUpIFwKIAljb250YWluZXJfb2YocGxhbmUsIHN0cnVjdCBraXJpbl9wbGFuZSwgYmFz ZSkKQEAgLTU2LDkgKzU2LDkgQEAgc3RydWN0IGFkZV9od19jdHggewogCWludCBpcnE7CiB9Owog Ci1zdHJ1Y3QgYWRlX2NydGMgeworc3RydWN0IGtpcmluX2NydGMgewogCXN0cnVjdCBkcm1fY3J0 YyBiYXNlOwotCXN0cnVjdCBhZGVfaHdfY3R4ICpjdHg7CisJdm9pZCAqaHdfY3R4OwogCXN0cnVj dCB3b3JrX3N0cnVjdCBkcm1fZGV2aWNlX3dxOwogCWJvb2wgZW5hYmxlOwogfTsKQEAgLTcwLDcg KzcwLDcgQEAgc3RydWN0IGtpcmluX3BsYW5lIHsKIH07CiAKIHN0cnVjdCBhZGVfZGF0YSB7Ci0J c3RydWN0IGFkZV9jcnRjIGFjcnRjOworCXN0cnVjdCBraXJpbl9jcnRjIGNydGM7CiAJc3RydWN0 IGtpcmluX3BsYW5lIHBsYW5lc1tBREVfQ0hfTlVNXTsKIAlzdHJ1Y3QgYWRlX2h3X2N0eCBjdHg7 CiB9OwpAQCAtMTg0LDggKzE4NCw4IEBAIHN0YXRpYyBib29sIGFkZV9jcnRjX21vZGVfZml4dXAo c3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJCWNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2Rl ICptb2RlLAogCQkJCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICphZGp1c3RlZF9tb2RlKQogewot CXN0cnVjdCBhZGVfY3J0YyAqYWNydGMgPSB0b19hZGVfY3J0YyhjcnRjKTsKLQlzdHJ1Y3QgYWRl X2h3X2N0eCAqY3R4ID0gYWNydGMtPmN0eDsKKwlzdHJ1Y3Qga2lyaW5fY3J0YyAqa2NydGMgPSB0 b19raXJpbl9jcnRjKGNydGMpOworCXN0cnVjdCBhZGVfaHdfY3R4ICpjdHggPSBrY3J0Yy0+aHdf Y3R4OwogCiAJYWRqdXN0ZWRfbW9kZS0+Y2xvY2sgPQogCQljbGtfcm91bmRfcmF0ZShjdHgtPmFk ZV9waXhfY2xrLCBtb2RlLT5jbG9jayAqIDEwMDApIC8gMTAwMDsKQEAgLTMxNyw4ICszMTcsOCBA QCBzdGF0aWMgdm9pZCBhZGVfc2V0X21lZGlhbm9jX3FvcyhzdHJ1Y3QgYWRlX2h3X2N0eCAqY3R4 KQogCiBzdGF0aWMgaW50IGFkZV9jcnRjX2VuYWJsZV92Ymxhbmsoc3RydWN0IGRybV9jcnRjICpj cnRjKQogewotCXN0cnVjdCBhZGVfY3J0YyAqYWNydGMgPSB0b19hZGVfY3J0YyhjcnRjKTsKLQlz dHJ1Y3QgYWRlX2h3X2N0eCAqY3R4ID0gYWNydGMtPmN0eDsKKwlzdHJ1Y3Qga2lyaW5fY3J0YyAq a2NydGMgPSB0b19raXJpbl9jcnRjKGNydGMpOworCXN0cnVjdCBhZGVfaHdfY3R4ICpjdHggPSBr Y3J0Yy0+aHdfY3R4OwogCXZvaWQgX19pb21lbSAqYmFzZSA9IGN0eC0+YmFzZTsKIAogCWlmICgh Y3R4LT5wb3dlcl9vbikKQEAgLTMzMiw4ICszMzIsOCBAQCBzdGF0aWMgaW50IGFkZV9jcnRjX2Vu YWJsZV92Ymxhbmsoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCiBzdGF0aWMgdm9pZCBhZGVfY3J0 Y19kaXNhYmxlX3ZibGFuayhzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiB7Ci0Jc3RydWN0IGFkZV9j cnRjICphY3J0YyA9IHRvX2FkZV9jcnRjKGNydGMpOwotCXN0cnVjdCBhZGVfaHdfY3R4ICpjdHgg PSBhY3J0Yy0+Y3R4OworCXN0cnVjdCBraXJpbl9jcnRjICprY3J0YyA9IHRvX2tpcmluX2NydGMo Y3J0Yyk7CisJc3RydWN0IGFkZV9od19jdHggKmN0eCA9IGtjcnRjLT5od19jdHg7CiAJdm9pZCBf X2lvbWVtICpiYXNlID0gY3R4LT5iYXNlOwogCiAJaWYgKCFjdHgtPnBvd2VyX29uKSB7CkBAIC0z NDcsNyArMzQ3LDcgQEAgc3RhdGljIHZvaWQgYWRlX2NydGNfZGlzYWJsZV92Ymxhbmsoc3RydWN0 IGRybV9jcnRjICpjcnRjKQogCiBzdGF0aWMgdm9pZCBkcm1fdW5kZXJmbG93X3dxKHN0cnVjdCB3 b3JrX3N0cnVjdCAqd29yaykKIHsKLQlzdHJ1Y3QgYWRlX2NydGMgKmFjcnRjID0gY29udGFpbmVy X29mKHdvcmssIHN0cnVjdCBhZGVfY3J0YywKKwlzdHJ1Y3Qga2lyaW5fY3J0YyAqYWNydGMgPSBj b250YWluZXJfb2Yod29yaywgc3RydWN0IGtpcmluX2NydGMsCiAJCQkJCSAgICAgIGRybV9kZXZp Y2Vfd3EpOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkcm1fZGV2ID0gKCZhY3J0Yy0+YmFzZSktPmRl djsKIAlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGU7CkBAIC0zNTgsOSArMzU4LDkgQEAg c3RhdGljIHZvaWQgZHJtX3VuZGVyZmxvd193cShzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiAK IHN0YXRpYyBpcnFyZXR1cm5fdCBhZGVfaXJxX2hhbmRsZXIoaW50IGlycSwgdm9pZCAqZGF0YSkK IHsKLQlzdHJ1Y3QgYWRlX2NydGMgKmFjcnRjID0gZGF0YTsKLQlzdHJ1Y3QgYWRlX2h3X2N0eCAq Y3R4ID0gYWNydGMtPmN0eDsKLQlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSAmYWNydGMtPmJhc2U7 CisJc3RydWN0IGtpcmluX2NydGMgKmtjcnRjID0gZGF0YTsKKwlzdHJ1Y3QgYWRlX2h3X2N0eCAq Y3R4ID0ga2NydGMtPmh3X2N0eDsKKwlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSAma2NydGMtPmJh c2U7CiAJdm9pZCBfX2lvbWVtICpiYXNlID0gY3R4LT5iYXNlOwogCXUzMiBzdGF0dXM7CiAKQEAg LTM3Nyw3ICszNzcsNyBAQCBzdGF0aWMgaXJxcmV0dXJuX3QgYWRlX2lycV9oYW5kbGVyKGludCBp cnEsIHZvaWQgKmRhdGEpCiAJCWFkZV91cGRhdGVfYml0cyhiYXNlICsgTERJX0lOVF9DTFIsIFVO REVSRkxPV19JTlRfRU5fT0ZTVCwKIAkJCQlNQVNLKDEpLCAxKTsKIAkJRFJNX0VSUk9SKCJMREkg dW5kZXJmbG93ISIpOwotCQlzY2hlZHVsZV93b3JrKCZhY3J0Yy0+ZHJtX2RldmljZV93cSk7CisJ CXNjaGVkdWxlX3dvcmsoJmtjcnRjLT5kcm1fZGV2aWNlX3dxKTsKIAl9CiAKIAlyZXR1cm4gSVJR X0hBTkRMRUQ7CkBAIC00OTksMTEgKzQ5OSwxMSBAQCBzdGF0aWMgdm9pZCBhZGVfZHVtcF9yZWdz KHZvaWQgX19pb21lbSAqYmFzZSkgeyB9CiBzdGF0aWMgdm9pZCBhZGVfY3J0Y19hdG9taWNfZW5h YmxlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCQkgICBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUg Km9sZF9zdGF0ZSkKIHsKLQlzdHJ1Y3QgYWRlX2NydGMgKmFjcnRjID0gdG9fYWRlX2NydGMoY3J0 Yyk7Ci0Jc3RydWN0IGFkZV9od19jdHggKmN0eCA9IGFjcnRjLT5jdHg7CisJc3RydWN0IGtpcmlu X2NydGMgKmtjcnRjID0gdG9fa2lyaW5fY3J0YyhjcnRjKTsKKwlzdHJ1Y3QgYWRlX2h3X2N0eCAq Y3R4ID0ga2NydGMtPmh3X2N0eDsKIAlpbnQgcmV0OwogCi0JaWYgKGFjcnRjLT5lbmFibGUpCisJ aWYgKGtjcnRjLT5lbmFibGUpCiAJCXJldHVybjsKIAogCWlmICghY3R4LT5wb3dlcl9vbikgewpA QCAtNTE2LDI3ICs1MTYsMjcgQEAgc3RhdGljIHZvaWQgYWRlX2NydGNfYXRvbWljX2VuYWJsZShz dHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJYWRlX2Rpc3BsYXlfZW5hYmxlKGN0eCk7CiAJYWRlX2R1 bXBfcmVncyhjdHgtPmJhc2UpOwogCWRybV9jcnRjX3ZibGFua19vbihjcnRjKTsKLQlhY3J0Yy0+ ZW5hYmxlID0gdHJ1ZTsKKwlrY3J0Yy0+ZW5hYmxlID0gdHJ1ZTsKIH0KIAogc3RhdGljIHZvaWQg YWRlX2NydGNfYXRvbWljX2Rpc2FibGUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJCSAgICBz dHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm9sZF9zdGF0ZSkKIHsKLQlzdHJ1Y3QgYWRlX2NydGMgKmFj cnRjID0gdG9fYWRlX2NydGMoY3J0Yyk7Ci0Jc3RydWN0IGFkZV9od19jdHggKmN0eCA9IGFjcnRj LT5jdHg7CisJc3RydWN0IGtpcmluX2NydGMgKmtjcnRjID0gdG9fa2lyaW5fY3J0YyhjcnRjKTsK KwlzdHJ1Y3QgYWRlX2h3X2N0eCAqY3R4ID0ga2NydGMtPmh3X2N0eDsKIAotCWlmICghYWNydGMt PmVuYWJsZSkKKwlpZiAoIWtjcnRjLT5lbmFibGUpCiAJCXJldHVybjsKIAogCWRybV9jcnRjX3Zi bGFua19vZmYoY3J0Yyk7CiAJYWRlX3Bvd2VyX2Rvd24oY3R4KTsKLQlhY3J0Yy0+ZW5hYmxlID0g ZmFsc2U7CisJa2NydGMtPmVuYWJsZSA9IGZhbHNlOwogfQogCiBzdGF0aWMgdm9pZCBhZGVfY3J0 Y19tb2RlX3NldF9ub2ZiKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIHsKLQlzdHJ1Y3QgYWRlX2Ny dGMgKmFjcnRjID0gdG9fYWRlX2NydGMoY3J0Yyk7Ci0Jc3RydWN0IGFkZV9od19jdHggKmN0eCA9 IGFjcnRjLT5jdHg7CisJc3RydWN0IGtpcmluX2NydGMgKmtjcnRjID0gdG9fa2lyaW5fY3J0Yyhj cnRjKTsKKwlzdHJ1Y3QgYWRlX2h3X2N0eCAqY3R4ID0ga2NydGMtPmh3X2N0eDsKIAlzdHJ1Y3Qg ZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSA9ICZjcnRjLT5zdGF0ZS0+bW9kZTsKIAlzdHJ1Y3QgZHJt X2Rpc3BsYXlfbW9kZSAqYWRqX21vZGUgPSAmY3J0Yy0+c3RhdGUtPmFkanVzdGVkX21vZGU7CiAK QEAgLTU0OCw4ICs1NDgsOCBAQCBzdGF0aWMgdm9pZCBhZGVfY3J0Y19tb2RlX3NldF9ub2ZiKHN0 cnVjdCBkcm1fY3J0YyAqY3J0YykKIHN0YXRpYyB2b2lkIGFkZV9jcnRjX2F0b21pY19iZWdpbihz dHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkJICBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKm9sZF9z dGF0ZSkKIHsKLQlzdHJ1Y3QgYWRlX2NydGMgKmFjcnRjID0gdG9fYWRlX2NydGMoY3J0Yyk7Ci0J c3RydWN0IGFkZV9od19jdHggKmN0eCA9IGFjcnRjLT5jdHg7CisJc3RydWN0IGtpcmluX2NydGMg KmtjcnRjID0gdG9fa2lyaW5fY3J0YyhjcnRjKTsKKwlzdHJ1Y3QgYWRlX2h3X2N0eCAqY3R4ID0g a2NydGMtPmh3X2N0eDsKIAlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSA9ICZjcnRjLT5z dGF0ZS0+bW9kZTsKIAlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqYWRqX21vZGUgPSAmY3J0Yy0+ c3RhdGUtPmFkanVzdGVkX21vZGU7CiAKQEAgLTU2MiwxMyArNTYyLDEzIEBAIHN0YXRpYyB2b2lk IGFkZV9jcnRjX2F0b21pY19mbHVzaChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCQkJICBzdHJ1 Y3QgZHJtX2NydGNfc3RhdGUgKm9sZF9zdGF0ZSkKIAogewotCXN0cnVjdCBhZGVfY3J0YyAqYWNy dGMgPSB0b19hZGVfY3J0YyhjcnRjKTsKLQlzdHJ1Y3QgYWRlX2h3X2N0eCAqY3R4ID0gYWNydGMt PmN0eDsKKwlzdHJ1Y3Qga2lyaW5fY3J0YyAqa2NydGMgPSB0b19raXJpbl9jcnRjKGNydGMpOwor CXN0cnVjdCBhZGVfaHdfY3R4ICpjdHggPSBrY3J0Yy0+aHdfY3R4OwogCXN0cnVjdCBkcm1fcGVu ZGluZ192YmxhbmtfZXZlbnQgKmV2ZW50ID0gY3J0Yy0+c3RhdGUtPmV2ZW50OwogCXZvaWQgX19p b21lbSAqYmFzZSA9IGN0eC0+YmFzZTsKIAogCS8qIG9ubHkgY3J0YyBpcyBlbmFibGVkIHJlZ3Mg dGFrZSBlZmZlY3QgKi8KLQlpZiAoYWNydGMtPmVuYWJsZSkgeworCWlmIChrY3J0Yy0+ZW5hYmxl KSB7CiAJCWFkZV9kdW1wX3JlZ3MoYmFzZSk7CiAJCS8qIGZsdXNoIGFkZSByZWdpc3RlcnMgKi8K IAkJd3JpdGVsKEFERV9FTkFCTEUsIGJhc2UgKyBBREVfRU4pOwpAQCAtMTAwNyw3ICsxMDA3LDcg QEAgc3RhdGljIGludCBhZGVfZHJtX2luaXQoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikK IAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gcGxhdGZvcm1fZ2V0X2RydmRhdGEocGRldik7CiAJ c3RydWN0IGFkZV9kYXRhICphZGU7CiAJc3RydWN0IGFkZV9od19jdHggKmN0eDsKLQlzdHJ1Y3Qg YWRlX2NydGMgKmFjcnRjOworCXN0cnVjdCBraXJpbl9jcnRjICprY3J0YzsKIAlzdHJ1Y3Qga2ly aW5fcGxhbmUgKmtwbGFuZTsKIAllbnVtIGRybV9wbGFuZV90eXBlIHR5cGU7CiAJaW50IHJldDsK QEAgLTEwMjEsOCArMTAyMSw4IEBAIHN0YXRpYyBpbnQgYWRlX2RybV9pbml0KHN0cnVjdCBwbGF0 Zm9ybV9kZXZpY2UgKnBkZXYpCiAJcGxhdGZvcm1fc2V0X2RydmRhdGEocGRldiwgYWRlKTsKIAog CWN0eCA9ICZhZGUtPmN0eDsKLQlhY3J0YyA9ICZhZGUtPmFjcnRjOwotCWFjcnRjLT5jdHggPSBj dHg7CisJa2NydGMgPSAmYWRlLT5jcnRjOworCWtjcnRjLT5od19jdHggPSBjdHg7CiAKIAlyZXQg PSBhZGVfZHRzX3BhcnNlKHBkZXYsIGN0eCk7CiAJaWYgKHJldCkKQEAgLTEwNDYsMTUgKzEwNDYs MTUgQEAgc3RhdGljIGludCBhZGVfZHJtX2luaXQoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRl dikKIAl9CiAKIAkvKiBjcnRjIGluaXQgKi8KLQlyZXQgPSBhZGVfY3J0Y19pbml0KGRldiwgJmFj cnRjLT5iYXNlLCAmYWRlLT5wbGFuZXNbUFJJTUFSWV9DSF0uYmFzZSk7CisJcmV0ID0gYWRlX2Ny dGNfaW5pdChkZXYsICZrY3J0Yy0+YmFzZSwgJmFkZS0+cGxhbmVzW1BSSU1BUllfQ0hdLmJhc2Up OwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKIAkvKiB2YmxhbmsgaXJxIGluaXQgKi8KIAly ZXQgPSBkZXZtX3JlcXVlc3RfaXJxKGRldi0+ZGV2LCBjdHgtPmlycSwgYWRlX2lycV9oYW5kbGVy LAotCQkJICAgICAgIElSUUZfU0hBUkVELCBkZXYtPmRyaXZlci0+bmFtZSwgYWNydGMpOworCQkJ ICAgICAgIElSUUZfU0hBUkVELCBkZXYtPmRyaXZlci0+bmFtZSwga2NydGMpOwogCi0JSU5JVF9X T1JLKCZhY3J0Yy0+ZHJtX2RldmljZV93cSwgZHJtX3VuZGVyZmxvd193cSk7CisJSU5JVF9XT1JL KCZrY3J0Yy0+ZHJtX2RldmljZV93cSwgZHJtX3VuZGVyZmxvd193cSk7CiAKIAlpZiAocmV0KQog CQlyZXR1cm4gcmV0OwotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2RyaS1kZXZlbA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8141EC10F03 for ; Tue, 23 Apr 2019 23:22:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3EBBC218EA for ; Tue, 23 Apr 2019 23:22:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="mNrrWoqn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729266AbfDWXWw (ORCPT ); Tue, 23 Apr 2019 19:22:52 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:42373 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728703AbfDWXVM (ORCPT ); Tue, 23 Apr 2019 19:21:12 -0400 Received: by mail-pg1-f193.google.com with SMTP id p6so8353829pgh.9 for ; Tue, 23 Apr 2019 16:21:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=C2Of27sjsVd0ORjTyF+gAiuy1lvWfZZrKjZ9JKI5ILg=; b=mNrrWoqnEM1ruztqKaXfuhFtumiBcgRZliUpxg8b7+y5eRAP9btg54IP9NQK1De/+m 9DIzVZAn3sD1OZHHoN1sVwQBaRMazsa3NNpk/AAxxZXRpWRrJyeLevFa/bo5EKr6UUlT iPEquBtvyrLk1unX1ZYgfDp53qC9WmNVSH2LZWyAi8Js5S2Q5mYYy/+qSnJZAGAN2M8x nOYzuhKdGER4UuRaoLW3oVn6DqLWJqF5g8bjtAVj1WQFsKcwHzQnYvnyq+jZy5fI0Q/t OuQaV/+fMgzyPUBRll+/bGqkjb0veFV3LoEIiAUJgLXltwgbrkRtZbZ4iMFn1MJWzZbj 5eFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=C2Of27sjsVd0ORjTyF+gAiuy1lvWfZZrKjZ9JKI5ILg=; b=CIwXLq0Zpj0XTjlMxdYalEVbpOzhnIxZO9T+uEsnk4c4pau31QpaL4ES9iep8txRiY XfGNfJB99qXBWUO41tDXCBx5lbcStrlDMwXAgh+xXDEgYDme0TFQIGcnm9gMfeALjejc oVn1AputUysRNw3FJZLQmzqVt+XeSXz6S+wcPqp/mYDXLXTmpuuv7t/Xxqb3VcvzRMJP DdSEzchH56rsNzyL+g2oL6fLXw2DkrEy6jxYYIaSoCjPaqt9eHDI+oJiGla4yTSNLrp/ nOZU2ZuLkpoPBeHsmoUwn94ynTA8wI9UozW0y5kuMUFMVPcMrrtSmW6j1NxK1jOi2byp kACA== X-Gm-Message-State: APjAAAUlzWTb+7VwbTnUUhQXNGK/K0niRj5KN6Xh4gA1gqIxKkhopO+Q JQgJ/JEZu3rFM7+ZN4lDRSChrjG7udo= X-Google-Smtp-Source: APXvYqzKw7zS0EAy8qbNtzZzV53lfdRumIR/g1abofkw90uzoBOhtz6+KSCIx/k+nNLuBlJLxdFrKA== X-Received: by 2002:a62:70c6:: with SMTP id l189mr29822449pfc.139.1556061670711; Tue, 23 Apr 2019 16:21:10 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id c28sm6984235pgm.42.2019.04.23.16.21.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 16:21:09 -0700 (PDT) From: John Stultz To: lkml Cc: Xu YiPing , Xinliang Liu , Rongrong Zou , Xinwei Kong , Chen Feng , David Airlie , Daniel Vetter , dri-devel , John Stultz Subject: [PATCH 07/25] drm: kirin: Rename ade_crtc to kirin_crtc Date: Tue, 23 Apr 2019 16:20:38 -0700 Message-Id: <1556061656-1733-8-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> References: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xu YiPing As part of refactoring the kirin driver to better support different hardware revisions, this patch renames the struct ade_crtc to kirin_crtc. The struct kirin_crtc will later used by both kirin620 and future kirin960 driver, and will be moved to a common kirin_drm_drv.h in a future patch Cc: Xinliang Liu Cc: Rongrong Zou Cc: Xinwei Kong Cc: Chen Feng Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel Signed-off-by: Xu YiPing [jstultz: reworded commit message] Signed-off-by: John Stultz --- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 74 ++++++++++++------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index a229da9..c29ca75 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -38,8 +38,8 @@ #define OUT_OVLY ADE_OVLY2 /* output overlay compositor */ #define ADE_DEBUG 1 -#define to_ade_crtc(crtc) \ - container_of(crtc, struct ade_crtc, base) +#define to_kirin_crtc(crtc) \ + container_of(crtc, struct kirin_crtc, base) #define to_kirin_plane(plane) \ container_of(plane, struct kirin_plane, base) @@ -56,9 +56,9 @@ struct ade_hw_ctx { int irq; }; -struct ade_crtc { +struct kirin_crtc { struct drm_crtc base; - struct ade_hw_ctx *ctx; + void *hw_ctx; struct work_struct drm_device_wq; bool enable; }; @@ -70,7 +70,7 @@ struct kirin_plane { }; struct ade_data { - struct ade_crtc acrtc; + struct kirin_crtc crtc; struct kirin_plane planes[ADE_CH_NUM]; struct ade_hw_ctx ctx; }; @@ -184,8 +184,8 @@ static bool ade_crtc_mode_fixup(struct drm_crtc *crtc, const struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode) { - struct ade_crtc *acrtc = to_ade_crtc(crtc); - struct ade_hw_ctx *ctx = acrtc->ctx; + struct kirin_crtc *kcrtc = to_kirin_crtc(crtc); + struct ade_hw_ctx *ctx = kcrtc->hw_ctx; adjusted_mode->clock = clk_round_rate(ctx->ade_pix_clk, mode->clock * 1000) / 1000; @@ -317,8 +317,8 @@ static void ade_set_medianoc_qos(struct ade_hw_ctx *ctx) static int ade_crtc_enable_vblank(struct drm_crtc *crtc) { - struct ade_crtc *acrtc = to_ade_crtc(crtc); - struct ade_hw_ctx *ctx = acrtc->ctx; + struct kirin_crtc *kcrtc = to_kirin_crtc(crtc); + struct ade_hw_ctx *ctx = kcrtc->hw_ctx; void __iomem *base = ctx->base; if (!ctx->power_on) @@ -332,8 +332,8 @@ static int ade_crtc_enable_vblank(struct drm_crtc *crtc) static void ade_crtc_disable_vblank(struct drm_crtc *crtc) { - struct ade_crtc *acrtc = to_ade_crtc(crtc); - struct ade_hw_ctx *ctx = acrtc->ctx; + struct kirin_crtc *kcrtc = to_kirin_crtc(crtc); + struct ade_hw_ctx *ctx = kcrtc->hw_ctx; void __iomem *base = ctx->base; if (!ctx->power_on) { @@ -347,7 +347,7 @@ static void ade_crtc_disable_vblank(struct drm_crtc *crtc) static void drm_underflow_wq(struct work_struct *work) { - struct ade_crtc *acrtc = container_of(work, struct ade_crtc, + struct kirin_crtc *acrtc = container_of(work, struct kirin_crtc, drm_device_wq); struct drm_device *drm_dev = (&acrtc->base)->dev; struct drm_atomic_state *state; @@ -358,9 +358,9 @@ static void drm_underflow_wq(struct work_struct *work) static irqreturn_t ade_irq_handler(int irq, void *data) { - struct ade_crtc *acrtc = data; - struct ade_hw_ctx *ctx = acrtc->ctx; - struct drm_crtc *crtc = &acrtc->base; + struct kirin_crtc *kcrtc = data; + struct ade_hw_ctx *ctx = kcrtc->hw_ctx; + struct drm_crtc *crtc = &kcrtc->base; void __iomem *base = ctx->base; u32 status; @@ -377,7 +377,7 @@ static irqreturn_t ade_irq_handler(int irq, void *data) ade_update_bits(base + LDI_INT_CLR, UNDERFLOW_INT_EN_OFST, MASK(1), 1); DRM_ERROR("LDI underflow!"); - schedule_work(&acrtc->drm_device_wq); + schedule_work(&kcrtc->drm_device_wq); } return IRQ_HANDLED; @@ -499,11 +499,11 @@ static void ade_dump_regs(void __iomem *base) { } static void ade_crtc_atomic_enable(struct drm_crtc *crtc, struct drm_crtc_state *old_state) { - struct ade_crtc *acrtc = to_ade_crtc(crtc); - struct ade_hw_ctx *ctx = acrtc->ctx; + struct kirin_crtc *kcrtc = to_kirin_crtc(crtc); + struct ade_hw_ctx *ctx = kcrtc->hw_ctx; int ret; - if (acrtc->enable) + if (kcrtc->enable) return; if (!ctx->power_on) { @@ -516,27 +516,27 @@ static void ade_crtc_atomic_enable(struct drm_crtc *crtc, ade_display_enable(ctx); ade_dump_regs(ctx->base); drm_crtc_vblank_on(crtc); - acrtc->enable = true; + kcrtc->enable = true; } static void ade_crtc_atomic_disable(struct drm_crtc *crtc, struct drm_crtc_state *old_state) { - struct ade_crtc *acrtc = to_ade_crtc(crtc); - struct ade_hw_ctx *ctx = acrtc->ctx; + struct kirin_crtc *kcrtc = to_kirin_crtc(crtc); + struct ade_hw_ctx *ctx = kcrtc->hw_ctx; - if (!acrtc->enable) + if (!kcrtc->enable) return; drm_crtc_vblank_off(crtc); ade_power_down(ctx); - acrtc->enable = false; + kcrtc->enable = false; } static void ade_crtc_mode_set_nofb(struct drm_crtc *crtc) { - struct ade_crtc *acrtc = to_ade_crtc(crtc); - struct ade_hw_ctx *ctx = acrtc->ctx; + struct kirin_crtc *kcrtc = to_kirin_crtc(crtc); + struct ade_hw_ctx *ctx = kcrtc->hw_ctx; struct drm_display_mode *mode = &crtc->state->mode; struct drm_display_mode *adj_mode = &crtc->state->adjusted_mode; @@ -548,8 +548,8 @@ static void ade_crtc_mode_set_nofb(struct drm_crtc *crtc) static void ade_crtc_atomic_begin(struct drm_crtc *crtc, struct drm_crtc_state *old_state) { - struct ade_crtc *acrtc = to_ade_crtc(crtc); - struct ade_hw_ctx *ctx = acrtc->ctx; + struct kirin_crtc *kcrtc = to_kirin_crtc(crtc); + struct ade_hw_ctx *ctx = kcrtc->hw_ctx; struct drm_display_mode *mode = &crtc->state->mode; struct drm_display_mode *adj_mode = &crtc->state->adjusted_mode; @@ -562,13 +562,13 @@ static void ade_crtc_atomic_flush(struct drm_crtc *crtc, struct drm_crtc_state *old_state) { - struct ade_crtc *acrtc = to_ade_crtc(crtc); - struct ade_hw_ctx *ctx = acrtc->ctx; + struct kirin_crtc *kcrtc = to_kirin_crtc(crtc); + struct ade_hw_ctx *ctx = kcrtc->hw_ctx; struct drm_pending_vblank_event *event = crtc->state->event; void __iomem *base = ctx->base; /* only crtc is enabled regs take effect */ - if (acrtc->enable) { + if (kcrtc->enable) { ade_dump_regs(base); /* flush ade registers */ writel(ADE_ENABLE, base + ADE_EN); @@ -1007,7 +1007,7 @@ static int ade_drm_init(struct platform_device *pdev) struct drm_device *dev = platform_get_drvdata(pdev); struct ade_data *ade; struct ade_hw_ctx *ctx; - struct ade_crtc *acrtc; + struct kirin_crtc *kcrtc; struct kirin_plane *kplane; enum drm_plane_type type; int ret; @@ -1021,8 +1021,8 @@ static int ade_drm_init(struct platform_device *pdev) platform_set_drvdata(pdev, ade); ctx = &ade->ctx; - acrtc = &ade->acrtc; - acrtc->ctx = ctx; + kcrtc = &ade->crtc; + kcrtc->hw_ctx = ctx; ret = ade_dts_parse(pdev, ctx); if (ret) @@ -1046,15 +1046,15 @@ static int ade_drm_init(struct platform_device *pdev) } /* crtc init */ - ret = ade_crtc_init(dev, &acrtc->base, &ade->planes[PRIMARY_CH].base); + ret = ade_crtc_init(dev, &kcrtc->base, &ade->planes[PRIMARY_CH].base); if (ret) return ret; /* vblank irq init */ ret = devm_request_irq(dev->dev, ctx->irq, ade_irq_handler, - IRQF_SHARED, dev->driver->name, acrtc); + IRQF_SHARED, dev->driver->name, kcrtc); - INIT_WORK(&acrtc->drm_device_wq, drm_underflow_wq); + INIT_WORK(&kcrtc->drm_device_wq, drm_underflow_wq); if (ret) return ret; -- 2.7.4