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.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,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 C74DBC3A5A0 for ; Mon, 19 Aug 2019 23:04:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 99F2A23406 for ; Mon, 19 Aug 2019 23:04:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="mIK1wiCG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728913AbfHSXDz (ORCPT ); Mon, 19 Aug 2019 19:03:55 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:34034 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728855AbfHSXDt (ORCPT ); Mon, 19 Aug 2019 19:03:49 -0400 Received: by mail-pg1-f195.google.com with SMTP id n9so2044450pgc.1 for ; Mon, 19 Aug 2019 16:03:48 -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=2NFlgdlfXYiRYG1vxux+gKs5v2QugFjbBoZ8Pynyolg=; b=mIK1wiCGCfCbW9eeYKsjGhEfiwX87TUJabWOr/z7riNobTnag2/wiOzDocjjPydHwk MHz7laeYwFopBqLOhN+pbIqU4csA2GjPSK+tnZ4KyZoz59wWajqDy9W5AkNjXNuIVQuX bjxvFHTVH7cEdxB+a7/i5rxeGf3k6Nxy8P9s3JmIxF/mBOzjXNiwFyTiSowA1cPRXJqC ULqerCtuQtvQjug5pS5mdfYhX0M/m4u7m3z8eZaZVYlrsaCQz53DrklKlBKInbP40o0l 3hAIviRyvG7f+95YRh5I6MEUEkjll7Bh0iKStDESsJABXxXjjFkQA1mn24z7wQYbM2wb 5UTQ== 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=2NFlgdlfXYiRYG1vxux+gKs5v2QugFjbBoZ8Pynyolg=; b=GNvFLf/BOeIL+GUGRWCWB4Ma98Y36hGZ+GL0cw2LyjUw5Jftrs/PVdw1QAk8k+PhTd FldCkb3sIfsRhTejsCucncr2s5mNx2TuBBZluwR4u6pGrANBJHiXOateLJ5Tzyx9EayE mKzwiSvodYRItYIs3OMeGkwXIRo2RxKsYZ+NaiXdb7VoHX6494O9gUTPt1dN1jigPk9H 1pjejkh28DBHs5z75EpCqEKfWJbx3lzO/va+4BHTsHQEpu4hj1Xe8Mkd9lmCB1o6oAAK StLsLBun/raYRz/55qW+ZMcEh0jhVGHDAr+UAjhreV0J6GrDLe2GhogdW42zVN8C0frc hTaQ== X-Gm-Message-State: APjAAAVkpGlSSnDXyvsuFzOcvibVRFPxNCSjbN2SpOtywUXrn3LK1+/9 SBDqyYR9GrPNIZ5DlpTvrT1nv8txWtQ= X-Google-Smtp-Source: APXvYqxGlTATZutwqllpn0Cdq6dR8Gqs5Xkn+OaYXid2MpAdEyXcQQ11zpaOyj6EORGBwrrjFzG+hA== X-Received: by 2002:a17:90a:650c:: with SMTP id i12mr23034754pjj.11.1566255828114; Mon, 19 Aug 2019 16:03:48 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id j15sm17256509pfr.146.2019.08.19.16.03.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2019 16:03:47 -0700 (PDT) From: John Stultz To: lkml Cc: Xu YiPing , Rongrong Zou , Xinliang Liu , David Airlie , Daniel Vetter , dri-devel , Sam Ravnborg , John Stultz Subject: [PATCH v4 15/25] drm: kirin: Move mode config function to driver_data Date: Mon, 19 Aug 2019 23:03:11 +0000 Message-Id: <20190819230321.56480-16-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190819230321.56480-1-john.stultz@linaro.org> References: <20190819230321.56480-1-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 mode config initialization values into the kirin_drm_data structure. This will make it easier to add support for new devices via a new kirin_drm_data structure. Cc: Rongrong Zou Cc: Xinliang Liu Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel Cc: Sam Ravnborg Acked-by: Xinliang Liu Reviewed-by: Sam Ravnborg Signed-off-by: Xu YiPing Signed-off-by: John Stultz --- drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 10 ++++++++++ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 8 +------- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index cf542430a659..4001f060e580 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "kirin_drm_drv.h" #include "kirin_ade_reg.h" @@ -1038,6 +1039,13 @@ static void ade_drm_cleanup(struct platform_device *pdev) { } +static const struct drm_mode_config_funcs ade_mode_config_funcs = { + .fb_create = drm_gem_fb_create, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, + +}; + struct kirin_drm_data ade_driver_data = { .channel_formats = channel_formats, .channel_formats_cnt = ARRAY_SIZE(channel_formats), @@ -1045,6 +1053,8 @@ struct kirin_drm_data ade_driver_data = { .crtc_funcs = &ade_crtc_funcs, .plane_helper_funcs = &ade_plane_helper_funcs, .plane_funcs = &ade_plane_funcs, + .mode_config_funcs = &ade_mode_config_funcs, + .init = ade_drm_init, .cleanup = ade_drm_cleanup }; diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c index 3d22f944a840..25191824b64e 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c @@ -40,12 +40,6 @@ static int kirin_drm_kms_cleanup(struct drm_device *dev) return 0; } -static const struct drm_mode_config_funcs kirin_drm_mode_config_funcs = { - .fb_create = drm_gem_fb_create, - .atomic_check = drm_atomic_helper_check, - .atomic_commit = drm_atomic_helper_commit, -}; - static void kirin_drm_mode_config_init(struct drm_device *dev) { dev->mode_config.min_width = 0; @@ -54,7 +48,7 @@ static void kirin_drm_mode_config_init(struct drm_device *dev) dev->mode_config.max_width = 2048; dev->mode_config.max_height = 2048; - dev->mode_config.funcs = &kirin_drm_mode_config_funcs; + dev->mode_config.funcs = driver_data->mode_config_funcs; } static int kirin_drm_kms_init(struct drm_device *dev) diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h index 66916502a9e6..ce9ddccc67a8 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h @@ -42,7 +42,7 @@ struct kirin_drm_data { const struct drm_crtc_funcs *crtc_funcs; const struct drm_plane_helper_funcs *plane_helper_funcs; const struct drm_plane_funcs *plane_funcs; - + const struct drm_mode_config_funcs *mode_config_funcs; int (*init)(struct platform_device *pdev); void (*cleanup)(struct platform_device *pdev); }; -- 2.17.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Stultz Subject: [PATCH v4 15/25] drm: kirin: Move mode config function to driver_data Date: Mon, 19 Aug 2019 23:03:11 +0000 Message-ID: <20190819230321.56480-16-john.stultz@linaro.org> References: <20190819230321.56480-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-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3BB406E47C for ; Mon, 19 Aug 2019 23:03:49 +0000 (UTC) Received: by mail-pg1-x541.google.com with SMTP id w10so2034060pgj.7 for ; Mon, 19 Aug 2019 16:03:49 -0700 (PDT) In-Reply-To: <20190819230321.56480-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 , Xinliang Liu , Rongrong Zou , Sam Ravnborg List-Id: dri-devel@lists.freedesktop.org RnJvbTogWHUgWWlQaW5nIDx4dXlpcGluZ0BoaXNpbGljb24uY29tPgoKQXMgcGFydCBvZiByZWZh Y3RvcmluZyB0aGUga2lyaW4gZHJpdmVyIHRvIGJldHRlciBzdXBwb3J0CmRpZmZlcmVudCBoYXJk d2FyZSByZXZpc2lvbnMsIHRoaXMgcGF0Y2ggbW92ZXMgdGhlIG1vZGUgY29uZmlnCmluaXRpYWxp emF0aW9uIHZhbHVlcyBpbnRvIHRoZSBraXJpbl9kcm1fZGF0YSBzdHJ1Y3R1cmUuCgpUaGlzIHdp bGwgbWFrZSBpdCBlYXNpZXIgdG8gYWRkIHN1cHBvcnQgZm9yIG5ldyBkZXZpY2VzCnZpYSBhIG5l dyBraXJpbl9kcm1fZGF0YSBzdHJ1Y3R1cmUuCgpDYzogUm9uZ3JvbmcgWm91IDx6b3Vyb25ncm9u Z0BnbWFpbC5jb20+CkNjOiBYaW5saWFuZyBMaXUgPHoubGl1eGlubGlhbmdAaGlzaWxpY29uLmNv bT4KQ2M6IERhdmlkIEFpcmxpZSA8YWlybGllZEBsaW51eC5pZT4KQ2M6IERhbmllbCBWZXR0ZXIg PGRhbmllbEBmZndsbC5jaD4KQ2M6IGRyaS1kZXZlbCA8ZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNr dG9wLm9yZz4KQ2M6IFNhbSBSYXZuYm9yZyA8c2FtQHJhdm5ib3JnLm9yZz4KQWNrZWQtYnk6IFhp bmxpYW5nIExpdSA8ei5saXV4aW5saWFuZ0BoaXNpbGljb24uY29tPgpSZXZpZXdlZC1ieTogU2Ft IFJhdm5ib3JnIDxzYW1AcmF2bmJvcmcub3JnPgpTaWduZWQtb2ZmLWJ5OiBYdSBZaVBpbmcgPHh1 eWlwaW5nQGhpc2lsaWNvbi5jb20+ClNpZ25lZC1vZmYtYnk6IEpvaG4gU3R1bHR6IDxqb2huLnN0 dWx0ekBsaW5hcm8ub3JnPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2ly aW5fZHJtX2FkZS5jIHwgMTAgKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9r aXJpbi9raXJpbl9kcm1fZHJ2LmMgfCAgOCArLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2hpc2ls aWNvbi9raXJpbi9raXJpbl9kcm1fZHJ2LmggfCAgMiArLQogMyBmaWxlcyBjaGFuZ2VkLCAxMiBp bnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2FkZS5jIGIvZHJpdmVycy9ncHUvZHJtL2hpc2ls aWNvbi9raXJpbi9raXJpbl9kcm1fYWRlLmMKaW5kZXggY2Y1NDI0MzBhNjU5Li40MDAxZjA2MGU1 ODAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJt X2FkZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2Fk ZS5jCkBAIC0zMCw2ICszMCw3IEBACiAjaW5jbHVkZSA8ZHJtL2RybV9wbGFuZV9oZWxwZXIuaD4K ICNpbmNsdWRlIDxkcm0vZHJtX3Byb2JlX2hlbHBlci5oPgogI2luY2x1ZGUgPGRybS9kcm1fdmJs YW5rLmg+CisjaW5jbHVkZSA8ZHJtL2RybV9nZW1fZnJhbWVidWZmZXJfaGVscGVyLmg+CiAKICNp bmNsdWRlICJraXJpbl9kcm1fZHJ2LmgiCiAjaW5jbHVkZSAia2lyaW5fYWRlX3JlZy5oIgpAQCAt MTAzOCw2ICsxMDM5LDEzIEBAIHN0YXRpYyB2b2lkIGFkZV9kcm1fY2xlYW51cChzdHJ1Y3QgcGxh dGZvcm1fZGV2aWNlICpwZGV2KQogewogfQogCitzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9tb2Rl X2NvbmZpZ19mdW5jcyBhZGVfbW9kZV9jb25maWdfZnVuY3MgPSB7CisJLmZiX2NyZWF0ZSA9IGRy bV9nZW1fZmJfY3JlYXRlLAorCS5hdG9taWNfY2hlY2sgPSBkcm1fYXRvbWljX2hlbHBlcl9jaGVj aywKKwkuYXRvbWljX2NvbW1pdCA9IGRybV9hdG9taWNfaGVscGVyX2NvbW1pdCwKKworfTsKKwog c3RydWN0IGtpcmluX2RybV9kYXRhIGFkZV9kcml2ZXJfZGF0YSA9IHsKIAkuY2hhbm5lbF9mb3Jt YXRzID0gY2hhbm5lbF9mb3JtYXRzLAogCS5jaGFubmVsX2Zvcm1hdHNfY250ID0gQVJSQVlfU0la RShjaGFubmVsX2Zvcm1hdHMpLApAQCAtMTA0NSw2ICsxMDUzLDggQEAgc3RydWN0IGtpcmluX2Ry bV9kYXRhIGFkZV9kcml2ZXJfZGF0YSA9IHsKIAkuY3J0Y19mdW5jcyA9ICZhZGVfY3J0Y19mdW5j cywKIAkucGxhbmVfaGVscGVyX2Z1bmNzID0gJmFkZV9wbGFuZV9oZWxwZXJfZnVuY3MsCiAJLnBs YW5lX2Z1bmNzID0gJmFkZV9wbGFuZV9mdW5jcywKKwkubW9kZV9jb25maWdfZnVuY3MgPSAmYWRl X21vZGVfY29uZmlnX2Z1bmNzLAorCiAJLmluaXQgPSBhZGVfZHJtX2luaXQsCiAJLmNsZWFudXAg PSBhZGVfZHJtX2NsZWFudXAKIH07CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaGlzaWxp Y29uL2tpcmluL2tpcmluX2RybV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2ly aW4va2lyaW5fZHJtX2Rydi5jCmluZGV4IDNkMjJmOTQ0YTg0MC4uMjUxOTE4MjRiNjRlIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9kcnYuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9kcnYuYwpAQCAt NDAsMTIgKzQwLDYgQEAgc3RhdGljIGludCBraXJpbl9kcm1fa21zX2NsZWFudXAoc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1f bW9kZV9jb25maWdfZnVuY3Mga2lyaW5fZHJtX21vZGVfY29uZmlnX2Z1bmNzID0gewotCS5mYl9j cmVhdGUgPSBkcm1fZ2VtX2ZiX2NyZWF0ZSwKLQkuYXRvbWljX2NoZWNrID0gZHJtX2F0b21pY19o ZWxwZXJfY2hlY2ssCi0JLmF0b21pY19jb21taXQgPSBkcm1fYXRvbWljX2hlbHBlcl9jb21taXQs Ci19OwotCiBzdGF0aWMgdm9pZCBraXJpbl9kcm1fbW9kZV9jb25maWdfaW5pdChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogewogCWRldi0+bW9kZV9jb25maWcubWluX3dpZHRoID0gMDsKQEAgLTU0 LDcgKzQ4LDcgQEAgc3RhdGljIHZvaWQga2lyaW5fZHJtX21vZGVfY29uZmlnX2luaXQoc3RydWN0 IGRybV9kZXZpY2UgKmRldikKIAlkZXYtPm1vZGVfY29uZmlnLm1heF93aWR0aCA9IDIwNDg7CiAJ ZGV2LT5tb2RlX2NvbmZpZy5tYXhfaGVpZ2h0ID0gMjA0ODsKIAotCWRldi0+bW9kZV9jb25maWcu ZnVuY3MgPSAma2lyaW5fZHJtX21vZGVfY29uZmlnX2Z1bmNzOworCWRldi0+bW9kZV9jb25maWcu ZnVuY3MgPSBkcml2ZXJfZGF0YS0+bW9kZV9jb25maWdfZnVuY3M7CiB9CiAKIHN0YXRpYyBpbnQg a2lyaW5fZHJtX2ttc19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9kcnYuaCBiL2RyaXZlcnMv Z3B1L2RybS9oaXNpbGljb24va2lyaW4va2lyaW5fZHJtX2Rydi5oCmluZGV4IDY2OTE2NTAyYTll Ni4uY2U5ZGRjY2M2N2E4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tp cmluL2tpcmluX2RybV9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmlu L2tpcmluX2RybV9kcnYuaApAQCAtNDIsNyArNDIsNyBAQCBzdHJ1Y3Qga2lyaW5fZHJtX2RhdGEg ewogCWNvbnN0IHN0cnVjdCBkcm1fY3J0Y19mdW5jcyAqY3J0Y19mdW5jczsKIAljb25zdCBzdHJ1 Y3QgZHJtX3BsYW5lX2hlbHBlcl9mdW5jcyAqcGxhbmVfaGVscGVyX2Z1bmNzOwogCWNvbnN0IHN0 cnVjdCBkcm1fcGxhbmVfZnVuY3MgICpwbGFuZV9mdW5jczsKLQorCWNvbnN0IHN0cnVjdCBkcm1f bW9kZV9jb25maWdfZnVuY3MgKm1vZGVfY29uZmlnX2Z1bmNzOwogCWludCAoKmluaXQpKHN0cnVj dCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpOwogCXZvaWQgKCpjbGVhbnVwKShzdHJ1Y3QgcGxhdGZv cm1fZGV2aWNlICpwZGV2KTsKIH07Ci0tIAoyLjE3LjEKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVs QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2RyaS1kZXZlbA==