From: John Stultz <john.stultz@linaro.org>
To: lkml <linux-kernel@vger.kernel.org>
Cc: Xu YiPing <xuyiping@hisilicon.com>,
Rongrong Zou <zourongrong@gmail.com>,
Xinliang Liu <z.liuxinliang@hisilicon.com>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
dri-devel <dri-devel@lists.freedesktop.org>,
Sam Ravnborg <sam@ravnborg.org>,
John Stultz <john.stultz@linaro.org>
Subject: [PATCH v5 14/25] drm: kirin: Move channel formats to driver data
Date: Tue, 20 Aug 2019 23:06:15 +0000 [thread overview]
Message-ID: <20190820230626.23253-15-john.stultz@linaro.org> (raw)
In-Reply-To: <20190820230626.23253-1-john.stultz@linaro.org>
From: Xu YiPing <xuyiping@hisilicon.com>
As part of refactoring the kirin driver to better support
different hardware revisions, this patch moves the channel
format arrays 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 <zourongrong@gmail.com>
Cc: Xinliang Liu <z.liuxinliang@hisilicon.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: dri-devel <dri-devel@lists.freedesktop.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Xinliang Liu <z.liuxinliang@hisilicon.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Xu YiPing <xuyiping@hisilicon.com>
[jstultz: reworded commit message]
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
.../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 30 +++++--------------
.../gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 3 ++
2 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
index a1a79f372bcd..0489b6378e01 100644
--- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
+++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
@@ -76,7 +76,7 @@ static const struct kirin_format ade_formats[] = {
{ DRM_FORMAT_ABGR8888, ADE_ABGR_8888 },
};
-static const u32 channel_formats1[] = {
+static const u32 channel_formats[] = {
/* channel 1,2,3,4 */
DRM_FORMAT_RGB565, DRM_FORMAT_BGR565, DRM_FORMAT_RGB888,
DRM_FORMAT_BGR888, DRM_FORMAT_XRGB8888, DRM_FORMAT_XBGR8888,
@@ -84,19 +84,6 @@ static const u32 channel_formats1[] = {
DRM_FORMAT_ABGR8888
};
-u32 ade_get_channel_formats(u8 ch, const u32 **formats)
-{
- switch (ch) {
- case ADE_CH1:
- *formats = channel_formats1;
- return ARRAY_SIZE(channel_formats1);
- default:
- DRM_ERROR("no this channel %d\n", ch);
- *formats = NULL;
- return 0;
- }
-}
-
/* convert from fourcc format to ade format */
static u32 ade_get_format(u32 pixel_format)
{
@@ -908,18 +895,13 @@ static struct drm_plane_funcs ade_plane_funcs = {
static int ade_plane_init(struct drm_device *dev, struct kirin_plane *kplane,
enum drm_plane_type type)
{
- const u32 *fmts;
- u32 fmts_cnt;
int ret = 0;
- /* get properties */
- fmts_cnt = ade_get_channel_formats(kplane->ch, &fmts);
- if (ret)
- return ret;
-
ret = drm_universal_plane_init(dev, &kplane->base, 1,
- ade_driver_data.plane_funcs, fmts,
- fmts_cnt, NULL, type, NULL);
+ ade_driver_data.plane_funcs,
+ ade_driver_data.channel_formats,
+ ade_driver_data.channel_formats_cnt,
+ NULL, type, NULL);
if (ret) {
DRM_ERROR("fail to init plane, ch=%d\n", kplane->ch);
return ret;
@@ -1057,6 +1039,8 @@ static void ade_drm_cleanup(struct platform_device *pdev)
}
struct kirin_drm_data ade_driver_data = {
+ .channel_formats = channel_formats,
+ .channel_formats_cnt = ARRAY_SIZE(channel_formats),
.crtc_helper_funcs = &ade_crtc_helper_funcs,
.crtc_funcs = &ade_crtc_funcs,
.plane_helper_funcs = &ade_plane_helper_funcs,
diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h
index 70b04e65789c..66916502a9e6 100644
--- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h
+++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h
@@ -35,6 +35,9 @@ struct kirin_plane {
/* display controller init/cleanup ops */
struct kirin_drm_data {
+ const u32 *channel_formats;
+ u32 channel_formats_cnt;
+
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;
--
2.17.1
next prev parent reply other threads:[~2019-08-20 23:07 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-20 23:06 [PATCH v5 00/25] drm: Kirin driver cleanups to prep for Kirin960 support John Stultz
2019-08-20 23:06 ` [PATCH v5 01/25] drm: kirin: Fix for hikey620 display offset problem John Stultz
2019-08-20 23:06 ` [PATCH v5 02/25] drm: kirin: Remove HISI_KIRIN_DW_DSI config option John Stultz
2019-08-20 23:06 ` [PATCH v5 03/25] drm: kirin: Remove unreachable return John Stultz
2019-08-20 23:06 ` [PATCH v5 04/25] drm: kirin: Remove uncessary parameter indirection John Stultz
2019-08-20 23:06 ` [PATCH v5 05/25] drm: kirin: Remove out_format from ade_crtc John Stultz
2019-08-20 23:06 ` [PATCH v5 06/25] drm: kirin: Rename ade_plane to kirin_plane John Stultz
2019-08-20 23:06 ` [PATCH v5 07/25] drm: kirin: Rename ade_crtc to kirin_crtc John Stultz
2019-08-20 23:06 ` [PATCH v5 08/25] drm: kirin: Dynamically allocate the hw_ctx John Stultz
2019-08-20 23:06 ` [PATCH v5 09/25] drm: kirin: Move request irq handle in ade hw ctx alloc John Stultz
2019-08-20 23:06 ` [PATCH v5 10/25] drm: kirin: Move workqueue to ade_hw_ctx structure John Stultz
2019-08-20 23:06 ` [PATCH v5 11/25] drm: kirin: Move kirin_crtc, kirin_plane, kirin_format to kirin_drm_drv.h John Stultz
2019-08-20 23:06 ` [PATCH v5 12/25] drm: kirin: Reanme dc_ops to kirin_drm_data John Stultz
2019-08-20 23:06 ` [PATCH v5 13/25] drm: kirin: Move ade crtc/plane help functions to driver_data John Stultz
2019-08-20 23:06 ` John Stultz [this message]
2019-08-20 23:06 ` [PATCH v5 15/25] drm: kirin: Move mode config function " John Stultz
2019-08-20 23:06 ` [PATCH v5 16/25] drm: kirin: Move plane number and primay plane in driver data John Stultz
2019-08-20 23:06 ` [PATCH v5 17/25] drm: kirin: Move config max_width and max_height to " John Stultz
2019-08-20 23:06 ` [PATCH v5 18/25] drm: kirin: Move drm driver " John Stultz
2019-08-20 23:06 ` [PATCH v5 19/25] drm: kirin: Add register connect helper functions in drm init John Stultz
2020-04-07 8:02 ` Daniel Vetter
2019-08-20 23:06 ` [PATCH v5 20/25] drm: kirin: Rename plane_init and crtc_init John Stultz
2019-08-20 23:06 ` [PATCH v5 21/25] drm: kirin: Fix dev->driver_data setting John Stultz
2019-08-20 23:06 ` [PATCH v5 22/25] drm: kirin: Make driver_data variable non-global John Stultz
2019-08-20 23:06 ` [PATCH v5 23/25] drm: kirin: Add alloc_hw_ctx/clean_hw_ctx ops in driver data John Stultz
2019-08-20 23:06 ` [PATCH v5 24/25] drm: kirin: Pass driver data to crtc init and plane init John Stultz
2019-08-20 23:06 ` [PATCH v5 25/25] drm: kirin: Move ade drm init to kirin drm drv John Stultz
2019-08-21 18:04 ` [PATCH v5 00/25] drm: Kirin driver cleanups to prep for Kirin960 support Sam Ravnborg
2019-08-21 19:13 ` John Stultz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190820230626.23253-15-john.stultz@linaro.org \
--to=john.stultz@linaro.org \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sam@ravnborg.org \
--cc=xuyiping@hisilicon.com \
--cc=z.liuxinliang@hisilicon.com \
--cc=zourongrong@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).