* Re: [PATCH] drm/mediatek: Find the cursor plane instead of hard coding it
2020-02-07 4:23 ` [PATCH] drm/mediatek: Find the cursor plane instead of hard coding it Evan Benn
@ 2020-02-07 4:52 ` Evan Benn
2020-02-07 8:34 ` CK Hu
2020-02-07 17:28 ` Sean Paul
2 siblings, 0 replies; 7+ messages in thread
From: Evan Benn @ 2020-02-07 4:52 UTC (permalink / raw)
To: dri-devel
Cc: CK Hu, Philipp Zabel, linux-kernel, Matthias Brugger,
linux-mediatek, David Airlie, linux-arm-kernel
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
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] drm/mediatek: Find the cursor plane instead of hard coding it
2020-02-07 4:23 ` [PATCH] drm/mediatek: Find the cursor plane instead of hard coding it Evan Benn
2020-02-07 4:52 ` Evan Benn
@ 2020-02-07 8:34 ` CK Hu
2020-02-10 2:53 ` CK Hu
2020-02-07 17:28 ` Sean Paul
2 siblings, 1 reply; 7+ messages in thread
From: CK Hu @ 2020-02-07 8:34 UTC (permalink / raw)
To: Evan Benn
Cc: dri-devel, Philipp Zabel, linux-kernel, Matthias Brugger,
linux-mediatek, David Airlie, linux-arm-kernel
Hi, Evan:
On Fri, 2020-02-07 at 15:23 +1100, Evan Benn wrote:
> The cursor and primary planes were hard coded.
> Now search for them for passing to drm_crtc_init_with_planes
>
Reviewed-by: CK Hu <ck.hu@mediatek.com>
> 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;
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] drm/mediatek: Find the cursor plane instead of hard coding it
2020-02-07 8:34 ` CK Hu
@ 2020-02-10 2:53 ` CK Hu
2020-02-10 14:10 ` Sean Paul
0 siblings, 1 reply; 7+ messages in thread
From: CK Hu @ 2020-02-10 2:53 UTC (permalink / raw)
To: Evan Benn
Cc: dri-devel, Philipp Zabel, linux-kernel, Matthias Brugger,
linux-mediatek, David Airlie, linux-arm-kernel
Hi, Evan:
On Fri, 2020-02-07 at 16:34 +0800, CK Hu wrote:
> Hi, Evan:
>
> On Fri, 2020-02-07 at 15:23 +1100, Evan Benn wrote:
> > The cursor and primary planes were hard coded.
> > Now search for them for passing to drm_crtc_init_with_planes
> >
>
> Reviewed-by: CK Hu <ck.hu@mediatek.com>
Applied to mediatek-drm-fixes-5.6 [1], thanks.
[1]
https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-fixes-5.6
Regards,
CK
>
> > 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;
> >
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] drm/mediatek: Find the cursor plane instead of hard coding it
2020-02-10 2:53 ` CK Hu
@ 2020-02-10 14:10 ` Sean Paul
2020-02-11 1:19 ` CK Hu
0 siblings, 1 reply; 7+ messages in thread
From: Sean Paul @ 2020-02-10 14:10 UTC (permalink / raw)
To: CK Hu
Cc: Evan Benn, David Airlie, LKML, dri-devel,
moderated list:ARM/Mediatek SoC support, Matthias Brugger,
linux-arm-kernel
On Sun, Feb 9, 2020 at 9:53 PM CK Hu <ck.hu@mediatek.com> wrote:
>
> Hi, Evan:
>
> On Fri, 2020-02-07 at 16:34 +0800, CK Hu wrote:
> > Hi, Evan:
> >
> > On Fri, 2020-02-07 at 15:23 +1100, Evan Benn wrote:
> > > The cursor and primary planes were hard coded.
> > > Now search for them for passing to drm_crtc_init_with_planes
> > >
> >
> > Reviewed-by: CK Hu <ck.hu@mediatek.com>
>
> Applied to mediatek-drm-fixes-5.6 [1], thanks.
>
Hi CK,
Thanks for picking this up. Before you send the pull, could you please
reverse the order of these 2 patches? Evan's should come before mine
to prevent a regression.
Sean
> [1]
> https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-fixes-5.6
>
> Regards,
> CK
>
> >
> > > 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;
> > >
> >
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] drm/mediatek: Find the cursor plane instead of hard coding it
2020-02-10 14:10 ` Sean Paul
@ 2020-02-11 1:19 ` CK Hu
0 siblings, 0 replies; 7+ messages in thread
From: CK Hu @ 2020-02-11 1:19 UTC (permalink / raw)
To: Sean Paul
Cc: Evan Benn, David Airlie, LKML, dri-devel,
moderated list:ARM/Mediatek SoC support, Matthias Brugger,
linux-arm-kernel
On Mon, 2020-02-10 at 09:10 -0500, Sean Paul wrote:
> On Sun, Feb 9, 2020 at 9:53 PM CK Hu <ck.hu@mediatek.com> wrote:
> >
> > Hi, Evan:
> >
> > On Fri, 2020-02-07 at 16:34 +0800, CK Hu wrote:
> > > Hi, Evan:
> > >
> > > On Fri, 2020-02-07 at 15:23 +1100, Evan Benn wrote:
> > > > The cursor and primary planes were hard coded.
> > > > Now search for them for passing to drm_crtc_init_with_planes
> > > >
> > >
> > > Reviewed-by: CK Hu <ck.hu@mediatek.com>
> >
> > Applied to mediatek-drm-fixes-5.6 [1], thanks.
> >
>
> Hi CK,
> Thanks for picking this up. Before you send the pull, could you please
> reverse the order of these 2 patches? Evan's should come before mine
> to prevent a regression.
>
> Sean
>
Hi, Sean:
Thanks for your notice. I've reversed the order.
Regards,
CK
> > [1]
> > https://github.com/ckhu-mediatek/linux.git-tags/commits/mediatek-drm-fixes-5.6
> >
> > Regards,
> > CK
> >
> > >
> > > > 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;
> > > >
> > >
> >
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] drm/mediatek: Find the cursor plane instead of hard coding it
2020-02-07 4:23 ` [PATCH] drm/mediatek: Find the cursor plane instead of hard coding it Evan Benn
2020-02-07 4:52 ` Evan Benn
2020-02-07 8:34 ` CK Hu
@ 2020-02-07 17:28 ` Sean Paul
2 siblings, 0 replies; 7+ messages in thread
From: Sean Paul @ 2020-02-07 17:28 UTC (permalink / raw)
To: Evan Benn
Cc: dri-devel, CK Hu, Philipp Zabel, LKML, Matthias Brugger,
moderated list:ARM/Mediatek SoC support, David Airlie,
linux-arm-kernel
On Thu, Feb 6, 2020 at 11:24 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>
I like it!
Reviewed-by: Sean Paul <seanpaul@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
>
^ permalink raw reply [flat|nested] 7+ messages in thread