From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Stultz Subject: [PATCH 20/25] drm: kirin: Rename plane_init and crtc_init Date: Tue, 23 Apr 2019 16:20:51 -0700 Message-ID: <1556061656-1733-21-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-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5547E897AC for ; Tue, 23 Apr 2019 23:21:30 +0000 (UTC) Received: by mail-pl1-x641.google.com with SMTP id f36so8248445plb.5 for ; Tue, 23 Apr 2019 16:21:30 -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 d2FyZSByZXZpc2lvbnMsIHRoaXMgcGF0Y2ggcmVuYW1lcwphZGVfY3J0Yy9wbGFuZV9pbml0IGtp cmluX3BsYW5lL2NydGNfaW5pdCwgYXMgdGhleSB3aWxsIGxhdGVyIGJlCm1vdmVkIHRvIGtpcmlu IGRybSBkcnYgYW5kIHNoYXJlZCB3aXRoIHRoZSBraXJpbjk2MCBoYXJkd2FyZQpzdXBwb3J0LgoK Q2M6IFhpbmxpYW5nIExpdSA8ei5saXV4aW5saWFuZ0BoaXNpbGljb24uY29tPgpDYzogUm9uZ3Jv bmcgWm91IDx6b3Vyb25ncm9uZ0BnbWFpbC5jb20+CkNjOiBYaW53ZWkgS29uZyA8a29uZy5rb25n eGlud2VpQGhpc2lsaWNvbi5jb20+CkNjOiBDaGVuIEZlbmcgPHB1Y2suY2hlbkBoaXNpbGljb24u Y29tPgpDYzogRGF2aWQgQWlybGllIDxhaXJsaWVkQGxpbnV4LmllPgpDYzogRGFuaWVsIFZldHRl ciA8ZGFuaWVsQGZmd2xsLmNoPgpDYzogZHJpLWRldmVsIDxkcmktZGV2ZWxAbGlzdHMuZnJlZWRl c2t0b3Aub3JnPgpTaWduZWQtb2ZmLWJ5OiBYdSBZaVBpbmcgPHh1eWlwaW5nQGhpc2lsaWNvbi5j b20+Cltqc3R1bHR6OiByZXdvcmRlZCBjb21taXQgbWVzc2FnZV0KU2lnbmVkLW9mZi1ieTogSm9o biBTdHVsdHogPGpvaG4uc3R1bHR6QGxpbmFyby5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2hp c2lsaWNvbi9raXJpbi9raXJpbl9kcm1fYWRlLmMgfCAxMSArKysrKystLS0tLQogMSBmaWxlIGNo YW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9hZGUuYyBiL2RyaXZlcnMvZ3B1 L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2FkZS5jCmluZGV4IGZjYzAxYzIuLjIxOTY1 ZWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJt X2FkZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2Fk ZS5jCkBAIC01NzEsNyArNTcxLDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fY3J0Y19mdW5j cyBhZGVfY3J0Y19mdW5jcyA9IHsKIAkuZGlzYWJsZV92YmxhbmsJPSBhZGVfY3J0Y19kaXNhYmxl X3ZibGFuaywKIH07CiAKLXN0YXRpYyBpbnQgYWRlX2NydGNfaW5pdChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCitzdGF0aWMgaW50IGtpcmluX2RybV9jcnRj X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJ IHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lKQogewogCXN0cnVjdCBkZXZpY2Vfbm9kZSAqcG9ydDsK QEAgLTg5Miw4ICs4OTIsOSBAQCBzdGF0aWMgc3RydWN0IGRybV9wbGFuZV9mdW5jcyBhZGVfcGxh bmVfZnVuY3MgPSB7CiAJLmF0b21pY19kZXN0cm95X3N0YXRlID0gZHJtX2F0b21pY19oZWxwZXJf cGxhbmVfZGVzdHJveV9zdGF0ZSwKIH07CiAKLXN0YXRpYyBpbnQgYWRlX3BsYW5lX2luaXQoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGtpcmluX3BsYW5lICprcGxhbmUsCi0JCQkgIGVu dW0gZHJtX3BsYW5lX3R5cGUgdHlwZSkKK3N0YXRpYyBpbnQga2lyaW5fZHJtX3BsYW5lX2luaXQo c3RydWN0IGRybV9kZXZpY2UgKmRldiwKKwkJCQlzdHJ1Y3Qga2lyaW5fcGxhbmUgKmtwbGFuZSwK KwkJCQllbnVtIGRybV9wbGFuZV90eXBlIHR5cGUpCiB7CiAJaW50IHJldCA9IDA7CiAKQEAgLTEw MjQsMTMgKzEwMjUsMTMgQEAgc3RhdGljIGludCBhZGVfZHJtX2luaXQoc3RydWN0IHBsYXRmb3Jt X2RldmljZSAqcGRldikKIAkJZWxzZQogCQkJdHlwZSA9IERSTV9QTEFORV9UWVBFX09WRVJMQVk7 CiAKLQkJcmV0ID0gYWRlX3BsYW5lX2luaXQoZGV2LCBrcGxhbmUsIHR5cGUpOworCQlyZXQgPSBr aXJpbl9kcm1fcGxhbmVfaW5pdChkZXYsIGtwbGFuZSwgdHlwZSk7CiAJCWlmIChyZXQpCiAJCQly ZXR1cm4gcmV0OwogCX0KIAogCS8qIGNydGMgaW5pdCAqLwotCXJldCA9IGFkZV9jcnRjX2luaXQo ZGV2LCAma2NydGMtPmJhc2UsCisJcmV0ID0ga2lyaW5fZHJtX2NydGNfaW5pdChkZXYsICZrY3J0 Yy0+YmFzZSwKIAkJCQkmYWRlLT5wbGFuZXNbYWRlX2RyaXZlcl9kYXRhLnByaW1fcGxhbmVdLmJh c2UpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApk cmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs 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 20584C10F03 for ; Tue, 23 Apr 2019 23:21:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E0358218D2 for ; Tue, 23 Apr 2019 23:21:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="wrbjvLIo" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728979AbfDWXVd (ORCPT ); Tue, 23 Apr 2019 19:21:33 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:45301 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728947AbfDWXVa (ORCPT ); Tue, 23 Apr 2019 19:21:30 -0400 Received: by mail-pl1-f195.google.com with SMTP id o5so3927256pls.12 for ; Tue, 23 Apr 2019 16:21:29 -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=l/4HxndEudHwbox8bYtalM+RzpPcrsQmywphYVO0zYc=; b=wrbjvLIo7S8yefWAy6S+t5N9WVIMTHNi7nErLNj2JKhJMJl251rGYiIplpc1EiXgNM Cm8XYxORSs0TYxOCaR2AWcCv0fIBZy/FXBxGbysMh1iDK/LxOOHFbzsVWfxEq0GbMIk7 GIG3qZDuYuMgTYYPlRATA2pucx+HITzMYtk5WQWPyTDUaQcSqeL37Om9XOS1jjNrFZT2 ikZoyF1PFPXRmNB7xyMmZg7N95Yi0A5MS9w1+RqUKHQYLnNSvpJHsCfRrRJQ2VDLqF6r i7umYS2xIC9MeFswCLO7ecu4e4plaJruFjQwwVxSDXBhpFrgwqO5eVLpfQw78byznb7X f4dA== 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=l/4HxndEudHwbox8bYtalM+RzpPcrsQmywphYVO0zYc=; b=sZVbZwdtk7knNUEOZe/9ptUlGph33Crghd0tnAbqxEy2rY5V0Hb+dR/Ao7A4V96jqe nOz/idb1hdj8HUVWjS/+qpin3q7TLTQ7x3lsxTOj1Otx0LMyAFDYRlGjKXoP5bzZs08a LtDriPpB4XC0ZazWODlztKp/2SruuhjcGg9jh8P/KQoX9WY1cauuBtJ0keMS3BmOxLvy eGkY6zuEPvPqJgVA1JQ0nyGJ2dfpBgJAWYjKkZ0ne7KV7Uc8E3Enkr42zLAJRAXeHYRT v7UOBrKaVRuvCiN1W+c8TzV/7mPWZ2SgeG7Xlzc7Rgr0jQ93aYrI9rbsjJM+9yIFXJPg jNqg== X-Gm-Message-State: APjAAAXySW7IlLzokgib+xYE/l8cDKTOnVVA7QL2vxGyZpslrysrq71G f63qb4k0gqKYoDsncgZIAJp6rf5/HKs= X-Google-Smtp-Source: APXvYqznrvpDjtreESEdxVrYCapvLp99vt28Wwa/eBLgzR4YMg+4MxUeBU80XpmD1fo4NGrxwhOEHA== X-Received: by 2002:a17:902:d701:: with SMTP id w1mr27423947ply.124.1556061688981; Tue, 23 Apr 2019 16:21:28 -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.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 16:21:28 -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 20/25] drm: kirin: Rename plane_init and crtc_init Date: Tue, 23 Apr 2019 16:20:51 -0700 Message-Id: <1556061656-1733-21-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 ade_crtc/plane_init kirin_plane/crtc_init, as they will later be moved to kirin drm drv and shared with the kirin960 hardware support. 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 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index fcc01c2..21965ee 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -571,7 +571,7 @@ static const struct drm_crtc_funcs ade_crtc_funcs = { .disable_vblank = ade_crtc_disable_vblank, }; -static int ade_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, +static int kirin_drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, struct drm_plane *plane) { struct device_node *port; @@ -892,8 +892,9 @@ static struct drm_plane_funcs ade_plane_funcs = { .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, }; -static int ade_plane_init(struct drm_device *dev, struct kirin_plane *kplane, - enum drm_plane_type type) +static int kirin_drm_plane_init(struct drm_device *dev, + struct kirin_plane *kplane, + enum drm_plane_type type) { int ret = 0; @@ -1024,13 +1025,13 @@ static int ade_drm_init(struct platform_device *pdev) else type = DRM_PLANE_TYPE_OVERLAY; - ret = ade_plane_init(dev, kplane, type); + ret = kirin_drm_plane_init(dev, kplane, type); if (ret) return ret; } /* crtc init */ - ret = ade_crtc_init(dev, &kcrtc->base, + ret = kirin_drm_crtc_init(dev, &kcrtc->base, &ade->planes[ade_driver_data.prim_plane].base); if (ret) return ret; -- 2.7.4