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 ECEA4C19759 for ; Thu, 1 Aug 2019 03:45:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B4DD321773 for ; Thu, 1 Aug 2019 03:45:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="UumO8T4U" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730240AbfHADpV (ORCPT ); Wed, 31 Jul 2019 23:45:21 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:38107 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730095AbfHADpL (ORCPT ); Wed, 31 Jul 2019 23:45:11 -0400 Received: by mail-pg1-f195.google.com with SMTP id f5so24455538pgu.5 for ; Wed, 31 Jul 2019 20:45: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=565VaDK+D7HMx0tprEDJj/7+3RMbouv2sqfsU1m6AlI=; b=UumO8T4UFAhCGi2wV38MNxrxfoIXcvUhLIo+UDwQbHXJpPiR1UpNWfYhB56019xFWv omPeb7ZqVe6yVp2nQPcZ6ApLQuQP1OSiGXWpFkVVlcdbk6Cq07J2GzD46js/3ly8+xKv srjdVWGisDzNusPt2Uh2q0Ac+6ctEDx/QnIay++h5EihedQ/M/mEscL8pYbF8lbrUnpa I1tCZh+FL1GAVGLbG7zfNrvVd6tkPg7bT2qDqe3sDyjKnY9YGuKlhpcKhkYVlB2y2Xdf IGFLZpZU6+n0khrwqrwxZYIHFYm25OTwJ57mZSoMJz8esPYKZ6RcX8wC7VYsDaqBezDq pMtQ== 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=565VaDK+D7HMx0tprEDJj/7+3RMbouv2sqfsU1m6AlI=; b=jH+Yf6g7LHT/OBWn5cGgdqvtmNHZwSzPbgl6LMdZjEWFXxg434APplk66tl9txDjw1 8JqLnMgmG7RcoRryxMvzfFzsc/2mbv6dTAK8ZhqiSbs3BzuhSyBFxfVZeNhuyviB0aPz l/cArwc3sNo0vl6dZGPuij3x6YlZJQ86mOvZ8y5c1+wDsuFLRu2Oq9C9hDMtlEubVF9p l4Aat7tu5/UXMQcdK8b7Mknm58PiNwZsnqpmOYY8M5VMXY6dUncoWMQ3KGGijkztWiGJ LSC7iFycXRh4+bBc+TI+d/ka1JpQoHHEDml8OzG2ulaP7dbwU1QdOBC97Lc1EVUeZmkG vieA== X-Gm-Message-State: APjAAAW5mFT5yKzPBvlFruOWeP4p4fBvwOLWPXpQylAG6O6NQB+5z57e uPic8q2tgTyd+Z6wcxl8dk9lOJm8rHo= X-Google-Smtp-Source: APXvYqwGXw9jt9IUIQGF91k5z+BPfxgzP6NG+ZKR5TjWGB9fSyX1i6ISydNH+lA0AFfhosDJiT66CQ== X-Received: by 2002:a62:1515:: with SMTP id 21mr52131943pfv.100.1564631110569; Wed, 31 Jul 2019 20:45:10 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id h70sm64775674pgc.36.2019.07.31.20.45.09 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 20:45:09 -0700 (PDT) From: John Stultz To: lkml Cc: Xu YiPing , Rongrong Zou , David Airlie , Daniel Vetter , dri-devel , Sam Ravnborg , John Stultz Subject: [PATCH v3 16/26] drm: kirin: Move mode config function to driver_data Date: Thu, 1 Aug 2019 03:44:29 +0000 Message-Id: <20190801034439.98227-17-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190801034439.98227-1-john.stultz@linaro.org> References: <20190801034439.98227-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: David Airlie Cc: Daniel Vetter Cc: dri-devel Cc: Sam Ravnborg 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 99dfd15af771..bca080e14009 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 60c164623f56..bf1e601fb367 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c @@ -39,12 +39,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; @@ -53,7 +47,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 v3 16/26] drm: kirin: Move mode config function to driver_data Date: Thu, 1 Aug 2019 03:44:29 +0000 Message-ID: <20190801034439.98227-17-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-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) by gabe.freedesktop.org (Postfix) with ESMTPS id B58336E34A for ; Thu, 1 Aug 2019 03:45:11 +0000 (UTC) Received: by mail-pg1-x544.google.com with SMTP id t132so33262569pgb.9 for ; Wed, 31 Jul 2019 20:45:11 -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 d2FyZSByZXZpc2lvbnMsIHRoaXMgcGF0Y2ggbW92ZXMgdGhlIG1vZGUgY29uZmlnCmluaXRpYWxp emF0aW9uIHZhbHVlcyBpbnRvIHRoZSBraXJpbl9kcm1fZGF0YSBzdHJ1Y3R1cmUuCgpUaGlzIHdp bGwgbWFrZSBpdCBlYXNpZXIgdG8gYWRkIHN1cHBvcnQgZm9yIG5ldyBkZXZpY2VzCnZpYSBhIG5l dyBraXJpbl9kcm1fZGF0YSBzdHJ1Y3R1cmUuCgpDYzogUm9uZ3JvbmcgWm91IDx6b3Vyb25ncm9u Z0BnbWFpbC5jb20+CkNjOiBEYXZpZCBBaXJsaWUgPGFpcmxpZWRAbGludXguaWU+CkNjOiBEYW5p ZWwgVmV0dGVyIDxkYW5pZWxAZmZ3bGwuY2g+CkNjOiBkcmktZGV2ZWwgPGRyaS1kZXZlbEBsaXN0 cy5mcmVlZGVza3RvcC5vcmc+CkNjOiBTYW0gUmF2bmJvcmcgPHNhbUByYXZuYm9yZy5vcmc+ClJl dmlld2VkLWJ5OiBTYW0gUmF2bmJvcmcgPHNhbUByYXZuYm9yZy5vcmc+ClNpZ25lZC1vZmYtYnk6 IFh1IFlpUGluZyA8eHV5aXBpbmdAaGlzaWxpY29uLmNvbT4KU2lnbmVkLW9mZi1ieTogSm9obiBT dHVsdHogPGpvaG4uc3R1bHR6QGxpbmFyby5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2hpc2ls aWNvbi9raXJpbi9raXJpbl9kcm1fYWRlLmMgfCAxMCArKysrKysrKysrCiBkcml2ZXJzL2dwdS9k cm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9kcnYuYyB8ICA4ICstLS0tLS0tCiBkcml2ZXJz L2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9kcnYuaCB8ICAyICstCiAzIGZpbGVz IGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fYWRlLmMgYi9kcml2ZXJz L2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9hZGUuYwppbmRleCA5OWRmZDE1YWY3 NzEuLmJjYTA4MGUxNDAwOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9r aXJpbi9raXJpbl9kcm1fYWRlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJp bi9raXJpbl9kcm1fYWRlLmMKQEAgLTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlIDxkcm0vZHJtX2dl bV9jbWFfaGVscGVyLmg+CiAjaW5jbHVkZSA8ZHJtL2RybV9wbGFuZV9oZWxwZXIuaD4KICNpbmNs dWRlIDxkcm0vZHJtX3Byb2JlX2hlbHBlci5oPgorI2luY2x1ZGUgPGRybS9kcm1fZ2VtX2ZyYW1l YnVmZmVyX2hlbHBlci5oPgogCiAjaW5jbHVkZSAia2lyaW5fZHJtX2Rydi5oIgogI2luY2x1ZGUg ImtpcmluX2FkZV9yZWcuaCIKQEAgLTEwMzgsNiArMTAzOSwxMyBAQCBzdGF0aWMgdm9pZCBhZGVf ZHJtX2NsZWFudXAoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIHsKIH0KIAorc3RhdGlj IGNvbnN0IHN0cnVjdCBkcm1fbW9kZV9jb25maWdfZnVuY3MgYWRlX21vZGVfY29uZmlnX2Z1bmNz ID0geworCS5mYl9jcmVhdGUgPSBkcm1fZ2VtX2ZiX2NyZWF0ZSwKKwkuYXRvbWljX2NoZWNrID0g ZHJtX2F0b21pY19oZWxwZXJfY2hlY2ssCisJLmF0b21pY19jb21taXQgPSBkcm1fYXRvbWljX2hl bHBlcl9jb21taXQsCisKK307CisKIHN0cnVjdCBraXJpbl9kcm1fZGF0YSBhZGVfZHJpdmVyX2Rh dGEgPSB7CiAJLmNoYW5uZWxfZm9ybWF0cyA9IGNoYW5uZWxfZm9ybWF0cywKIAkuY2hhbm5lbF9m b3JtYXRzX2NudCA9IEFSUkFZX1NJWkUoY2hhbm5lbF9mb3JtYXRzKSwKQEAgLTEwNDUsNiArMTA1 Myw4IEBAIHN0cnVjdCBraXJpbl9kcm1fZGF0YSBhZGVfZHJpdmVyX2RhdGEgPSB7CiAJLmNydGNf ZnVuY3MgPSAmYWRlX2NydGNfZnVuY3MsCiAJLnBsYW5lX2hlbHBlcl9mdW5jcyA9ICZhZGVfcGxh bmVfaGVscGVyX2Z1bmNzLAogCS5wbGFuZV9mdW5jcyA9ICZhZGVfcGxhbmVfZnVuY3MsCisJLm1v ZGVfY29uZmlnX2Z1bmNzID0gJmFkZV9tb2RlX2NvbmZpZ19mdW5jcywKKwogCS5pbml0ID0gYWRl X2RybV9pbml0LAogCS5jbGVhbnVwID0gYWRlX2RybV9jbGVhbnVwCiB9OwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fZHJ2LmMgYi9kcml2ZXJz L2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9kcnYuYwppbmRleCA2MGMxNjQ2MjNm NTYuLmJmMWU2MDFmYjM2NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9r aXJpbi9raXJpbl9kcm1fZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJp bi9raXJpbl9kcm1fZHJ2LmMKQEAgLTM5LDEyICszOSw2IEBAIHN0YXRpYyBpbnQga2lyaW5fZHJt X2ttc19jbGVhbnVwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJcmV0dXJuIDA7CiB9CiAKLXN0 YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX21vZGVfY29uZmlnX2Z1bmNzIGtpcmluX2RybV9tb2RlX2Nv bmZpZ19mdW5jcyA9IHsKLQkuZmJfY3JlYXRlID0gZHJtX2dlbV9mYl9jcmVhdGUsCi0JLmF0b21p Y19jaGVjayA9IGRybV9hdG9taWNfaGVscGVyX2NoZWNrLAotCS5hdG9taWNfY29tbWl0ID0gZHJt X2F0b21pY19oZWxwZXJfY29tbWl0LAotfTsKLQogc3RhdGljIHZvaWQga2lyaW5fZHJtX21vZGVf Y29uZmlnX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIHsKIAlkZXYtPm1vZGVfY29uZmln Lm1pbl93aWR0aCA9IDA7CkBAIC01Myw3ICs0Nyw3IEBAIHN0YXRpYyB2b2lkIGtpcmluX2RybV9t b2RlX2NvbmZpZ19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJZGV2LT5tb2RlX2NvbmZp Zy5tYXhfd2lkdGggPSAyMDQ4OwogCWRldi0+bW9kZV9jb25maWcubWF4X2hlaWdodCA9IDIwNDg7 CiAKLQlkZXYtPm1vZGVfY29uZmlnLmZ1bmNzID0gJmtpcmluX2RybV9tb2RlX2NvbmZpZ19mdW5j czsKKwlkZXYtPm1vZGVfY29uZmlnLmZ1bmNzID0gZHJpdmVyX2RhdGEtPm1vZGVfY29uZmlnX2Z1 bmNzOwogfQogCiBzdGF0aWMgaW50IGtpcmluX2RybV9rbXNfaW5pdChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJp bl9kcm1fZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmluL2tpcmluX2RybV9k cnYuaAppbmRleCA2NjkxNjUwMmE5ZTYuLmNlOWRkY2NjNjdhOCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fZHJ2LmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2hpc2lsaWNvbi9raXJpbi9raXJpbl9kcm1fZHJ2LmgKQEAgLTQyLDcgKzQyLDcgQEAg c3RydWN0IGtpcmluX2RybV9kYXRhIHsKIAljb25zdCBzdHJ1Y3QgZHJtX2NydGNfZnVuY3MgKmNy dGNfZnVuY3M7CiAJY29uc3Qgc3RydWN0IGRybV9wbGFuZV9oZWxwZXJfZnVuY3MgKnBsYW5lX2hl bHBlcl9mdW5jczsKIAljb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX2Z1bmNzICAqcGxhbmVfZnVuY3M7 Ci0KKwljb25zdCBzdHJ1Y3QgZHJtX21vZGVfY29uZmlnX2Z1bmNzICptb2RlX2NvbmZpZ19mdW5j czsKIAlpbnQgKCppbml0KShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KTsKIAl2b2lkICgq Y2xlYW51cCkoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldik7CiB9OwotLSAKMi4xNy4xCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwg bWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=