[PATCH 2/7] drm/mediatek: plane: Remove plane zpos/index
CK Hu
ck.hu at mediatek.com
Fri Jul 29 10:14:45 UTC 2016
Hi, Bibby:
On Fri, 2016-07-29 at 17:04 +0800, Bibby Hsieh wrote:
> From: Daniel Kurtz <djkurtz at chromium.org>
>
> It is not actually useful to a mtk plane to know its zpos/index, so just
> remove this field.
>
> This let's us completely remove struct mtk_drm_plane in a follow up patch.
'let's us'? My English is not as good as native English speaker.
Otherwise, this patch looks good to me.
>
> Signed-off-by: Daniel Kurtz <djkurtz at chromium.org>
> Signed-off-by: Bibby Hsieh <bibby.hsieh at mediatek.com>
> ---
> drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 2 +-
> drivers/gpu/drm/mediatek/mtk_drm_plane.c | 4 +---
> drivers/gpu/drm/mediatek/mtk_drm_plane.h | 4 +---
> 3 files changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> index 24aa3ba..18211ab 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> @@ -559,7 +559,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
> (zpos == 1) ? DRM_PLANE_TYPE_CURSOR :
> DRM_PLANE_TYPE_OVERLAY;
> ret = mtk_plane_init(drm_dev, &mtk_crtc->planes[zpos],
> - BIT(pipe), type, zpos);
> + BIT(pipe), type);
> if (ret)
> goto unprepare;
> }
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> index 093db07..d28db57 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c
> @@ -189,8 +189,7 @@ static const struct drm_plane_helper_funcs mtk_plane_helper_funcs = {
> };
>
> int mtk_plane_init(struct drm_device *dev, struct mtk_drm_plane *mtk_plane,
> - unsigned long possible_crtcs, enum drm_plane_type type,
> - unsigned int zpos)
> + unsigned long possible_crtcs, enum drm_plane_type type)
> {
> int err;
>
> @@ -203,7 +202,6 @@ int mtk_plane_init(struct drm_device *dev, struct mtk_drm_plane *mtk_plane,
> }
>
> drm_plane_helper_add(&mtk_plane->base, &mtk_plane_helper_funcs);
> - mtk_plane->idx = zpos;
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.h b/drivers/gpu/drm/mediatek/mtk_drm_plane.h
> index 72a7b3e..74dbeda 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.h
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.h
> @@ -20,7 +20,6 @@
>
> struct mtk_drm_plane {
> struct drm_plane base;
> - unsigned int idx;
> };
>
> struct mtk_plane_pending_state {
> @@ -53,7 +52,6 @@ to_mtk_plane_state(struct drm_plane_state *state)
> }
>
> int mtk_plane_init(struct drm_device *dev, struct mtk_drm_plane *mtk_plane,
> - unsigned long possible_crtcs, enum drm_plane_type type,
> - unsigned int zpos);
> + unsigned long possible_crtcs, enum drm_plane_type type);
>
> #endif
Regards,
CK
More information about the dri-devel
mailing list