From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Stultz Subject: [PATCH 13/25] drm: kirin: Move ade crtc/plane help functions to driver_data Date: Tue, 23 Apr 2019 16:20:44 -0700 Message-ID: <1556061656-1733-14-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 71BA38975F for ; Tue, 23 Apr 2019 23:21:19 +0000 (UTC) Received: by mail-pl1-x641.google.com with SMTP id f36so8248289plb.5 for ; Tue, 23 Apr 2019 16:21:19 -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 d2FyZSByZXZpc2lvbnMsIHRoaXMgcGF0Y2ggbW92ZXMgdGhlIGNydGMKYW5kIHBsYW5lIGZ1bmNz L2hlbHBlcl9mdW5jcyB0byB0aGUgc3RydWN0IGtpcmluX2RybV9kYXRhLgoKVGhpcyB3aWxsIG1h a2UgaXQgZWFzaWVyIHRvIGFkZCBzdXBwb3J0IGZvciBuZXcgZGV2aWNlcwp2aWEgYSBuZXcga2ly aW5fZHJtX2RhdGEgc3RydWN0dXJlLgoKQ2M6IFhpbmxpYW5nIExpdSA8ei5saXV4aW5saWFuZ0Bo aXNpbGljb24uY29tPgpDYzogUm9uZ3JvbmcgWm91IDx6b3Vyb25ncm9uZ0BnbWFpbC5jb20+CkNj OiBYaW53ZWkgS29uZyA8a29uZy5rb25neGlud2VpQGhpc2lsaWNvbi5jb20+CkNjOiBDaGVuIEZl bmcgPHB1Y2suY2hlbkBoaXNpbGljb24uY29tPgpDYzogRGF2aWQgQWlybGllIDxhaXJsaWVkQGxp bnV4LmllPgpDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVsQGZmd2xsLmNoPgpDYzogZHJpLWRldmVs IDxkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnPgpTaWduZWQtb2ZmLWJ5OiBYdSBZaVBp bmcgPHh1eWlwaW5nQGhpc2lsaWNvbi5jb20+Cltqc3R1bHR6OiByZXdvcmRlZCBjb21taXQgbWVz c2FnZV0KU2lnbmVkLW9mZi1ieTogSm9obiBTdHVsdHogPGpvaG4uc3R1bHR6QGxpbmFyby5vcmc+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fYWRlLmMgfCAx NSArKysrKysrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5f ZHJtX2Rydi5oIHwgIDUgKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwg NSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tp cmluL2tpcmluX2RybV9hZGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2ly aW5fZHJtX2FkZS5jCmluZGV4IDIyMWJmYmIuLjZhYTUyOWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2FkZS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2FkZS5jCkBAIC02MDIsMTMgKzYwMiwxMyBA QCBzdGF0aWMgaW50IGFkZV9jcnRjX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0 IGRybV9jcnRjICpjcnRjLAogCWNydGMtPnBvcnQgPSBwb3J0OwogCiAJcmV0ID0gZHJtX2NydGNf aW5pdF93aXRoX3BsYW5lcyhkZXYsIGNydGMsIHBsYW5lLCBOVUxMLAotCQkJCQkmYWRlX2NydGNf ZnVuY3MsIE5VTEwpOworCQkJCQlhZGVfZHJpdmVyX2RhdGEuY3J0Y19mdW5jcywgTlVMTCk7CiAJ aWYgKHJldCkgewogCQlEUk1fRVJST1IoImZhaWxlZCB0byBpbml0IGNydGMuXG4iKTsKIAkJcmV0 dXJuIHJldDsKIAl9CiAKLQlkcm1fY3J0Y19oZWxwZXJfYWRkKGNydGMsICZhZGVfY3J0Y19oZWxw ZXJfZnVuY3MpOworCWRybV9jcnRjX2hlbHBlcl9hZGQoY3J0YywgYWRlX2RyaXZlcl9kYXRhLmNy dGNfaGVscGVyX2Z1bmNzKTsKIAogCXJldHVybiAwOwogfQpAQCAtOTE3LDE0ICs5MTcsMTUgQEAg c3RhdGljIGludCBhZGVfcGxhbmVfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3Qg a2lyaW5fcGxhbmUgKmtwbGFuZSwKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0JcmV0ID0g ZHJtX3VuaXZlcnNhbF9wbGFuZV9pbml0KGRldiwgJmtwbGFuZS0+YmFzZSwgMSwgJmFkZV9wbGFu ZV9mdW5jcywKLQkJCQkgICAgICAgZm10cywgZm10c19jbnQsIE5VTEwsIHR5cGUsIE5VTEwpOwor CXJldCA9IGRybV91bml2ZXJzYWxfcGxhbmVfaW5pdChkZXYsICZrcGxhbmUtPmJhc2UsIDEsCisJ CQkJCWFkZV9kcml2ZXJfZGF0YS5wbGFuZV9mdW5jcywgZm10cywKKwkJCQkJZm10c19jbnQsIE5V TEwsIHR5cGUsIE5VTEwpOwogCWlmIChyZXQpIHsKIAkJRFJNX0VSUk9SKCJmYWlsIHRvIGluaXQg cGxhbmUsIGNoPSVkXG4iLCBrcGxhbmUtPmNoKTsKIAkJcmV0dXJuIHJldDsKIAl9CiAKLQlkcm1f cGxhbmVfaGVscGVyX2FkZCgma3BsYW5lLT5iYXNlLCAmYWRlX3BsYW5lX2hlbHBlcl9mdW5jcyk7 CisJZHJtX3BsYW5lX2hlbHBlcl9hZGQoJmtwbGFuZS0+YmFzZSwgYWRlX2RyaXZlcl9kYXRhLnBs YW5lX2hlbHBlcl9mdW5jcyk7CiAKIAlyZXR1cm4gMDsKIH0KQEAgLTEwNTYsNiArMTA1NywxMCBA QCBzdGF0aWMgdm9pZCBhZGVfZHJtX2NsZWFudXAoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRl dikKIH0KIAogc3RydWN0IGtpcmluX2RybV9kYXRhIGFkZV9kcml2ZXJfZGF0YSA9IHsKKwkuY3J0 Y19oZWxwZXJfZnVuY3MgPSAmYWRlX2NydGNfaGVscGVyX2Z1bmNzLAorCS5jcnRjX2Z1bmNzID0g JmFkZV9jcnRjX2Z1bmNzLAorCS5wbGFuZV9oZWxwZXJfZnVuY3MgPSAmYWRlX3BsYW5lX2hlbHBl cl9mdW5jcywKKwkucGxhbmVfZnVuY3MgPSAmYWRlX3BsYW5lX2Z1bmNzLAogCS5pbml0ID0gYWRl X2RybV9pbml0LAogCS5jbGVhbnVwID0gYWRlX2RybV9jbGVhbnVwCiB9OwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fZHJ2LmggYi9kcml2ZXJz L2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9kcnYuaAppbmRleCAyNzZiMTU5Li4w NTE2MWZmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmlu X2RybV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2Ry bV9kcnYuaApAQCAtMzksNiArMzksMTEgQEAgc3RydWN0IGtpcmluX3BsYW5lIHsKIAogLyogZGlz cGxheSBjb250cm9sbGVyIGluaXQvY2xlYW51cCBvcHMgKi8KIHN0cnVjdCBraXJpbl9kcm1fZGF0 YSB7CisJY29uc3Qgc3RydWN0IGRybV9jcnRjX2hlbHBlcl9mdW5jcyAqY3J0Y19oZWxwZXJfZnVu Y3M7CisJY29uc3Qgc3RydWN0IGRybV9jcnRjX2Z1bmNzICpjcnRjX2Z1bmNzOworCWNvbnN0IHN0 cnVjdCBkcm1fcGxhbmVfaGVscGVyX2Z1bmNzICpwbGFuZV9oZWxwZXJfZnVuY3M7CisJY29uc3Qg c3RydWN0IGRybV9wbGFuZV9mdW5jcyAgKnBsYW5lX2Z1bmNzOworCiAJaW50ICgqaW5pdCkoc3Ry dWN0IHBsYXRmb3JtX2RldmljZSAqcGRldik7CiAJdm9pZCAoKmNsZWFudXApKHN0cnVjdCBwbGF0 Zm9ybV9kZXZpY2UgKnBkZXYpOwogfTsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZl bEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9kcmktZGV2ZWw= 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 60F3CC10F03 for ; Tue, 23 Apr 2019 23:22:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2435C218EA for ; Tue, 23 Apr 2019 23:22:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="aaCMAzKK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729226AbfDWXW3 (ORCPT ); Tue, 23 Apr 2019 19:22:29 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:44287 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728457AbfDWXVU (ORCPT ); Tue, 23 Apr 2019 19:21:20 -0400 Received: by mail-pl1-f195.google.com with SMTP id y12so5683091plk.11 for ; Tue, 23 Apr 2019 16:21:19 -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=nanMR9WGZAGOt8W9FCJsIT2NdvldMFJeYO2gST1GNm0=; b=aaCMAzKK87Q6UwN6wPqpfWKm4r5h4W2daAKhhs0a/xCwkqMd1/t7RzCSkZgdGoC5JE VS9i7z2Ar4OSACfCAcsHuYKZHPdyhV8p0ipQakZUFPC1Gc7BboDmYHjLbsIIOBOFEC/7 I0o6VV0Vi/JJ7HwoCvocaunOnRsFyrXffVeqj6abGZ4fFc0/lvJXULVa1WL3Mj9bLxb8 G8SMg6onZZKW+7CQlUMuYU18/cH4NFd3Dad6t9Ia9wPOls+G0PpLzAWGwrMUcWO6jSE0 wHyAM9jM7qDS8Ll7wmv7jzwMwSFV12Lg+vw1/LyDzXw2KirEp/cWHudNU9TcvoSnbE8J n76Q== 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=nanMR9WGZAGOt8W9FCJsIT2NdvldMFJeYO2gST1GNm0=; b=O3rpLCfJz1q9aslWT4wR1peT/j3IOp2CjuZfoFT2ZFdF+WWned07NrtBAAY4oeNAMZ ZpEdvJ6E9STCo2UA7WA7qZFAX7a9EzxYeIam65D6+wuNGQwtuJJjB3YYaAIctKLPZXVa 5SZ//jSRfGZqgxawLFzKiBmYuKff9+jXLQOEZBZJiznry/7xJTEXIhFlW9LwbM9doqFq CEldLcD15zqPEHISC0PfwWcRSuElHMEs6sVNqkFK3IqjmavF3asdHP8iyoOzjBx6DPYZ jBFWovyOzxy5G7+FHlSeWnjHfWtJCKgYFFpZIxREgvHQymp90i8+8fMGtBNU7TxY1zWQ bsFA== X-Gm-Message-State: APjAAAWRXKFgrotnLj/HZROZqfN2GqdUMOYnx7KRo99raFD1mQFLvBjp rw905b6gOslGLbjSdHdNpyCJrxoiw2Q= X-Google-Smtp-Source: APXvYqyALxw5aburaoX8Cho1JkZDKW/0Bhym/vqMYkT0zsTkkFhaiQrNR0Zl20E/oAv3pySG0Kta6g== X-Received: by 2002:a17:902:8a8b:: with SMTP id p11mr28494162plo.227.1556061678919; Tue, 23 Apr 2019 16:21:18 -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.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 16:21:18 -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 13/25] drm: kirin: Move ade crtc/plane help functions to driver_data Date: Tue, 23 Apr 2019 16:20:44 -0700 Message-Id: <1556061656-1733-14-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 moves the crtc and plane funcs/helper_funcs to the struct kirin_drm_data. This will make it easier to add support for new devices via a new kirin_drm_data structure. 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 | 15 ++++++++++----- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 5 +++++ 2 files changed, 15 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 221bfbb..6aa529f 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -602,13 +602,13 @@ static int ade_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, crtc->port = port; ret = drm_crtc_init_with_planes(dev, crtc, plane, NULL, - &ade_crtc_funcs, NULL); + ade_driver_data.crtc_funcs, NULL); if (ret) { DRM_ERROR("failed to init crtc.\n"); return ret; } - drm_crtc_helper_add(crtc, &ade_crtc_helper_funcs); + drm_crtc_helper_add(crtc, ade_driver_data.crtc_helper_funcs); return 0; } @@ -917,14 +917,15 @@ static int ade_plane_init(struct drm_device *dev, struct kirin_plane *kplane, if (ret) return ret; - ret = drm_universal_plane_init(dev, &kplane->base, 1, &ade_plane_funcs, - fmts, fmts_cnt, NULL, type, NULL); + ret = drm_universal_plane_init(dev, &kplane->base, 1, + ade_driver_data.plane_funcs, fmts, + fmts_cnt, NULL, type, NULL); if (ret) { DRM_ERROR("fail to init plane, ch=%d\n", kplane->ch); return ret; } - drm_plane_helper_add(&kplane->base, &ade_plane_helper_funcs); + drm_plane_helper_add(&kplane->base, ade_driver_data.plane_helper_funcs); return 0; } @@ -1056,6 +1057,10 @@ static void ade_drm_cleanup(struct platform_device *pdev) } struct kirin_drm_data ade_driver_data = { + .crtc_helper_funcs = &ade_crtc_helper_funcs, + .crtc_funcs = &ade_crtc_funcs, + .plane_helper_funcs = &ade_plane_helper_funcs, + .plane_funcs = &ade_plane_funcs, .init = ade_drm_init, .cleanup = ade_drm_cleanup }; diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h index 276b159..05161ff 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h @@ -39,6 +39,11 @@ struct kirin_plane { /* display controller init/cleanup ops */ struct kirin_drm_data { + const struct drm_crtc_helper_funcs *crtc_helper_funcs; + const struct drm_crtc_funcs *crtc_funcs; + const struct drm_plane_helper_funcs *plane_helper_funcs; + const struct drm_plane_funcs *plane_funcs; + int (*init)(struct platform_device *pdev); void (*cleanup)(struct platform_device *pdev); }; -- 2.7.4