Re: [PATCH] drm/mediatek: Find the cursor plane instead of hard coding it

Evan Benn
2020-02-07T04:52:36Z

Apologies for the confusing thread. Please apply the above patch:
'drm/mediatek: Find the cursor plane instead of hard coding it'
before Sean Paul's original patch:
'drm/mediatek: Ensure the cursor plane is on top of other overlays'

This way authorship is correctly preserved, but we do not introduce the bug.

Thanks

On Fri, Feb 7, 2020 at 3:23 PM Evan Benn <evanbenn@chromium.org> wrote:
>
> The cursor and primary planes were hard coded.
> Now search for them for passing to drm_crtc_init_with_planes
>
> Signed-off-by: Evan Benn <evanbenn@chromium.org>
> ---
>
> drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 18 ++++++++++++------
> 1 file changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> index 7b392d6c71cc..935652990afa 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> @@ -658,10 +658,18 @@ static const struct drm_crtc_helper_funcs mtk_crtc_helper_funcs = {
>
> static int mtk_drm_crtc_init(struct drm_device *drm,
> struct mtk_drm_crtc *mtk_crtc,
> - struct drm_plane *primary,
> - struct drm_plane *cursor, unsigned int pipe)
> + unsigned int pipe)
> {
> - int ret;
> + struct drm_plane *primary = NULL;
> + struct drm_plane *cursor = NULL;
> + int i, ret;
> +
> + for (i = 0; i < mtk_crtc->layer_nr; i++) {
> + if (mtk_crtc->planes[i].type == DRM_PLANE_TYPE_PRIMARY)
> + primary = &mtk_crtc->planes[i];
> + else if (mtk_crtc->planes[i].type == DRM_PLANE_TYPE_CURSOR)
> + cursor = &mtk_crtc->planes[i];
> + }
>
> ret = drm_crtc_init_with_planes(drm, &mtk_crtc->base, primary, cursor,
> &mtk_crtc_funcs, NULL);
> @@ -830,9 +838,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
> return ret;
> }
>
> - ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, &mtk_crtc->planes[0],
> - mtk_crtc->layer_nr > 1 ? &mtk_crtc->planes[1] :
> - NULL, pipe);
> + ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, pipe);
> if (ret < 0)
> return ret;
>
> --
> 2.25.0.341.g760bfbb309-goog
>