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>, 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 v3 25/26] drm: kirin: Pass driver data to crtc init and plane init Date: Thu, 1 Aug 2019 03:44:38 +0000 [thread overview] Message-ID: <20190801034439.98227-26-john.stultz@linaro.org> (raw) In-Reply-To: <20190801034439.98227-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 changes the code via a passed in driver_data pointer, rather than hardcoding them via ade_driver_data variable. This will allow those funcitons to be later moved to the generic kirin_drm_drv.c using alternative driver_data structures that support other hardware. Cc: Rongrong Zou <zourongrong@gmail.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> 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> --- v2: Whitespace fixups, commit message tweaks suggested by Sam. --- .../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index f729a1de6e14..ab0c5d03903d 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -572,7 +572,8 @@ static const struct drm_crtc_funcs ade_crtc_funcs = { }; static int kirin_drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, - struct drm_plane *plane) + struct drm_plane *plane, + const struct kirin_drm_data *driver_data) { struct device_node *port; int ret; @@ -589,13 +590,13 @@ static int kirin_drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, crtc->port = port; ret = drm_crtc_init_with_planes(dev, crtc, plane, NULL, - ade_driver_data.crtc_funcs, NULL); + driver_data->crtc_funcs, NULL); if (ret) { DRM_ERROR("failed to init crtc.\n"); return ret; } - drm_crtc_helper_add(crtc, ade_driver_data.crtc_helper_funcs); + drm_crtc_helper_add(crtc, driver_data->crtc_helper_funcs); return 0; } @@ -894,21 +895,22 @@ static struct drm_plane_funcs ade_plane_funcs = { static int kirin_drm_plane_init(struct drm_device *dev, struct kirin_plane *kplane, - enum drm_plane_type type) + enum drm_plane_type type, + const struct kirin_drm_data *driver_data) { int ret = 0; ret = drm_universal_plane_init(dev, &kplane->base, 1, - ade_driver_data.plane_funcs, - ade_driver_data.channel_formats, - ade_driver_data.channel_formats_cnt, - NULL, type, NULL); + driver_data->plane_funcs, + driver_data->channel_formats, + driver_data->channel_formats_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_driver_data.plane_helper_funcs); + drm_plane_helper_add(&kplane->base, driver_data->plane_helper_funcs); return 0; } @@ -1024,14 +1026,15 @@ static int ade_drm_init(struct platform_device *pdev) else type = DRM_PLANE_TYPE_OVERLAY; - ret = kirin_drm_plane_init(dev, kplane, type); + ret = kirin_drm_plane_init(dev, kplane, type, &ade_driver_data); if (ret) return ret; } /* crtc init */ ret = kirin_drm_crtc_init(dev, &kcrtc->base, - &ade->planes[ade_driver_data.prim_plane].base); + &ade->planes[ade_driver_data.prim_plane].base, + &ade_driver_data); if (ret) return ret; -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: John Stultz <john.stultz@linaro.org> To: lkml <linux-kernel@vger.kernel.org> Cc: Xu YiPing <xuyiping@hisilicon.com>, David Airlie <airlied@linux.ie>, dri-devel <dri-devel@lists.freedesktop.org>, Rongrong Zou <zourongrong@gmail.com>, Sam Ravnborg <sam@ravnborg.org> Subject: [PATCH v3 25/26] drm: kirin: Pass driver data to crtc init and plane init Date: Thu, 1 Aug 2019 03:44:38 +0000 [thread overview] Message-ID: <20190801034439.98227-26-john.stultz@linaro.org> (raw) In-Reply-To: <20190801034439.98227-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 changes the code via a passed in driver_data pointer, rather than hardcoding them via ade_driver_data variable. This will allow those funcitons to be later moved to the generic kirin_drm_drv.c using alternative driver_data structures that support other hardware. Cc: Rongrong Zou <zourongrong@gmail.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> 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> --- v2: Whitespace fixups, commit message tweaks suggested by Sam. --- .../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index f729a1de6e14..ab0c5d03903d 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -572,7 +572,8 @@ static const struct drm_crtc_funcs ade_crtc_funcs = { }; static int kirin_drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, - struct drm_plane *plane) + struct drm_plane *plane, + const struct kirin_drm_data *driver_data) { struct device_node *port; int ret; @@ -589,13 +590,13 @@ static int kirin_drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, crtc->port = port; ret = drm_crtc_init_with_planes(dev, crtc, plane, NULL, - ade_driver_data.crtc_funcs, NULL); + driver_data->crtc_funcs, NULL); if (ret) { DRM_ERROR("failed to init crtc.\n"); return ret; } - drm_crtc_helper_add(crtc, ade_driver_data.crtc_helper_funcs); + drm_crtc_helper_add(crtc, driver_data->crtc_helper_funcs); return 0; } @@ -894,21 +895,22 @@ static struct drm_plane_funcs ade_plane_funcs = { static int kirin_drm_plane_init(struct drm_device *dev, struct kirin_plane *kplane, - enum drm_plane_type type) + enum drm_plane_type type, + const struct kirin_drm_data *driver_data) { int ret = 0; ret = drm_universal_plane_init(dev, &kplane->base, 1, - ade_driver_data.plane_funcs, - ade_driver_data.channel_formats, - ade_driver_data.channel_formats_cnt, - NULL, type, NULL); + driver_data->plane_funcs, + driver_data->channel_formats, + driver_data->channel_formats_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_driver_data.plane_helper_funcs); + drm_plane_helper_add(&kplane->base, driver_data->plane_helper_funcs); return 0; } @@ -1024,14 +1026,15 @@ static int ade_drm_init(struct platform_device *pdev) else type = DRM_PLANE_TYPE_OVERLAY; - ret = kirin_drm_plane_init(dev, kplane, type); + ret = kirin_drm_plane_init(dev, kplane, type, &ade_driver_data); if (ret) return ret; } /* crtc init */ ret = kirin_drm_crtc_init(dev, &kcrtc->base, - &ade->planes[ade_driver_data.prim_plane].base); + &ade->planes[ade_driver_data.prim_plane].base, + &ade_driver_data); if (ret) return ret; -- 2.17.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2019-08-01 3:45 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-01 3:44 [PATCH v3 00/26] drm: Kirin driver cleanups to prep for Kirin960 support John Stultz 2019-08-01 3:44 ` [PATCH v3 01/26] drm: kirin: Fix for hikey620 display offset problem John Stultz 2019-08-01 3:44 ` [PATCH v3 02/26] drm: kirin: Get rid of drmP.h includes John Stultz 2019-08-01 3:44 ` John Stultz 2019-08-01 3:44 ` [PATCH v3 03/26] drm: kirin: Remove HISI_KIRIN_DW_DSI config option John Stultz 2019-08-01 3:44 ` John Stultz 2019-08-01 3:44 ` [PATCH v3 04/26] drm: kirin: Remove unreachable return John Stultz 2019-08-01 3:44 ` John Stultz 2019-08-01 3:44 ` [PATCH v3 05/26] drm: kirin: Remove uncessary parameter indirection John Stultz 2019-08-01 3:44 ` [PATCH v3 06/26] drm: kirin: Remove out_format from ade_crtc John Stultz 2019-08-01 3:44 ` John Stultz 2019-08-01 3:44 ` [PATCH v3 07/26] drm: kirin: Rename ade_plane to kirin_plane John Stultz 2019-08-01 3:44 ` John Stultz 2019-08-01 3:44 ` [PATCH v3 08/26] drm: kirin: Rename ade_crtc to kirin_crtc John Stultz 2019-08-01 3:44 ` [PATCH v3 09/26] drm: kirin: Dynamically allocate the hw_ctx John Stultz 2019-08-01 3:44 ` [PATCH v3 10/26] drm: kirin: Move request irq handle in ade hw ctx alloc John Stultz 2019-08-01 3:44 ` John Stultz 2019-08-01 3:44 ` [PATCH v3 11/26] drm: kirin: Move workqueue to ade_hw_ctx structure John Stultz 2019-08-01 3:44 ` [PATCH v3 12/26] drm: kirin: Move kirin_crtc, kirin_plane, kirin_format to kirin_drm_drv.h John Stultz 2019-08-01 3:44 ` [PATCH v3 13/26] drm: kirin: Reanme dc_ops to kirin_drm_data John Stultz 2019-08-01 3:44 ` John Stultz 2019-08-01 3:44 ` [PATCH v3 14/26] drm: kirin: Move ade crtc/plane help functions to driver_data John Stultz 2019-08-01 3:44 ` [PATCH v3 15/26] drm: kirin: Move channel formats to driver data John Stultz 2019-08-01 3:44 ` [PATCH v3 16/26] drm: kirin: Move mode config function to driver_data John Stultz 2019-08-01 3:44 ` John Stultz 2019-08-01 3:44 ` [PATCH v3 17/26] drm: kirin: Move plane number and primay plane in driver data John Stultz 2019-08-01 3:44 ` John Stultz 2019-08-01 3:44 ` [PATCH v3 18/26] drm: kirin: Move config max_width and max_height to " John Stultz 2019-08-01 3:44 ` John Stultz 2019-08-01 3:44 ` [PATCH v3 19/26] drm: kirin: Move drm driver " John Stultz 2019-08-01 3:44 ` John Stultz 2019-08-01 3:44 ` [PATCH v3 20/26] drm: kirin: Add register connect helper functions in drm init John Stultz 2019-08-01 3:44 ` John Stultz 2019-08-01 3:44 ` [PATCH v3 21/26] drm: kirin: Rename plane_init and crtc_init John Stultz 2019-08-01 3:44 ` John Stultz 2019-08-01 3:44 ` [PATCH v3 22/26] drm: kirin: Fix dev->driver_data setting John Stultz 2019-08-01 3:44 ` John Stultz 2019-08-01 3:44 ` [PATCH v3 23/26] drm: kirin: Make driver_data variable non-global John Stultz 2019-08-01 3:44 ` [PATCH v3 24/26] drm: kirin: Add alloc_hw_ctx/clean_hw_ctx ops in driver data John Stultz 2019-08-01 3:44 ` John Stultz [this message] 2019-08-01 3:44 ` [PATCH v3 25/26] drm: kirin: Pass driver data to crtc init and plane init John Stultz 2019-08-01 3:44 ` [PATCH v3 26/26] drm: kirin: Move ade drm init to kirin drm drv John Stultz 2019-08-03 14:17 ` [PATCH v3 00/26] drm: Kirin driver cleanups to prep for Kirin960 support Sam Ravnborg 2019-08-03 14:17 ` Sam Ravnborg
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=20190801034439.98227-26-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=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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.