* [PATCH] drm/mediatek: Ensure the cursor plane is on top of other overlays
@ 2020-01-30 19:24 Sean Paul
2020-01-31 3:27 ` CK Hu
0 siblings, 1 reply; 14+ messages in thread
From: Sean Paul @ 2020-01-30 19:24 UTC (permalink / raw)
To: dri-devel
Cc: dcastagna, Matthias Brugger, Sean Paul, Philipp Zabel, CK Hu,
linux-mediatek, linux-arm-kernel
From: Sean Paul <seanpaul@chromium.org>
Currently the cursor is placed on the first overlay plane, which means
it will be at the bottom of the stack when the hw does the compositing
with anything other than primary plane. Since mtk doesn't support plane
zpos, change the cursor location to the top-most plane.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
---
drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index 0dfcd1787e651..4ac76b9613926 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -689,11 +689,12 @@ static int mtk_drm_crtc_num_comp_planes(struct mtk_drm_crtc *mtk_crtc,
}
static inline
-enum drm_plane_type mtk_drm_crtc_plane_type(unsigned int plane_idx)
+enum drm_plane_type mtk_drm_crtc_plane_type(unsigned int plane_idx,
+ unsigned int num_planes)
{
if (plane_idx == 0)
return DRM_PLANE_TYPE_PRIMARY;
- else if (plane_idx == 1)
+ else if (plane_idx == (num_planes - 1))
return DRM_PLANE_TYPE_CURSOR;
else
return DRM_PLANE_TYPE_OVERLAY;
@@ -712,7 +713,8 @@ static int mtk_drm_crtc_init_comp_planes(struct drm_device *drm_dev,
ret = mtk_plane_init(drm_dev,
&mtk_crtc->planes[mtk_crtc->layer_nr],
BIT(pipe),
- mtk_drm_crtc_plane_type(mtk_crtc->layer_nr),
+ mtk_drm_crtc_plane_type(mtk_crtc->layer_nr,
+ num_planes),
mtk_ddp_comp_supported_rotations(comp));
if (ret)
return ret;
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH] drm/mediatek: Ensure the cursor plane is on top of other overlays
2020-01-30 19:24 [PATCH] drm/mediatek: Ensure the cursor plane is on top of other overlays Sean Paul
@ 2020-01-31 3:27 ` CK Hu
2020-02-06 6:59 ` evanbenn
2020-02-10 2:51 ` [PATCH] drm/mediatek: Ensure the cursor plane is on top of other overlays CK Hu
0 siblings, 2 replies; 14+ messages in thread
From: CK Hu @ 2020-01-31 3:27 UTC (permalink / raw)
To: Sean Paul
Cc: dcastagna, dri-devel, Sean Paul, Philipp Zabel, Matthias Brugger,
linux-mediatek, linux-arm-kernel
Hi, Sean:
On Thu, 2020-01-30 at 14:24 -0500, Sean Paul wrote:
> From: Sean Paul <seanpaul@chromium.org>
>
> Currently the cursor is placed on the first overlay plane, which means
> it will be at the bottom of the stack when the hw does the compositing
> with anything other than primary plane. Since mtk doesn't support plane
> zpos, change the cursor location to the top-most plane.
>
Reviewed-by: CK Hu <ck.hu@mediatek.com>
> Signed-off-by: Sean Paul <seanpaul@chromium.org>
> ---
> drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> index 0dfcd1787e651..4ac76b9613926 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> @@ -689,11 +689,12 @@ static int mtk_drm_crtc_num_comp_planes(struct mtk_drm_crtc *mtk_crtc,
> }
>
> static inline
> -enum drm_plane_type mtk_drm_crtc_plane_type(unsigned int plane_idx)
> +enum drm_plane_type mtk_drm_crtc_plane_type(unsigned int plane_idx,
> + unsigned int num_planes)
> {
> if (plane_idx == 0)
> return DRM_PLANE_TYPE_PRIMARY;
> - else if (plane_idx == 1)
> + else if (plane_idx == (num_planes - 1))
> return DRM_PLANE_TYPE_CURSOR;
> else
> return DRM_PLANE_TYPE_OVERLAY;
> @@ -712,7 +713,8 @@ static int mtk_drm_crtc_init_comp_planes(struct drm_device *drm_dev,
> ret = mtk_plane_init(drm_dev,
> &mtk_crtc->planes[mtk_crtc->layer_nr],
> BIT(pipe),
> - mtk_drm_crtc_plane_type(mtk_crtc->layer_nr),
> + mtk_drm_crtc_plane_type(mtk_crtc->layer_nr,
> + num_planes),
> mtk_ddp_comp_supported_rotations(comp));
> if (ret)
> return ret;
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] drm/mediatek: Ensure the cursor plane is on top of other overlays
2020-01-31 3:27 ` CK Hu
@ 2020-02-06 6:59 ` evanbenn
2020-02-06 7:04 ` Evan Benn
` (2 more replies)
2020-02-10 2:51 ` [PATCH] drm/mediatek: Ensure the cursor plane is on top of other overlays CK Hu
1 sibling, 3 replies; 14+ messages in thread
From: evanbenn @ 2020-02-06 6:59 UTC (permalink / raw)
To: ck.hu
Cc: dcastagna, evanbenn, evanbenn, evanbenn, dri-devel,
linux-mediatek, p.zabel, matthias.bgg, seanpaul, sean,
linux-arm-kernel
From: Sean Paul <seanpaul@chromium.org>
Currently the cursor is placed on the first overlay plane, which means
it will be at the bottom of the stack when the hw does the compositing
with anything other than primary plane. Since mtk doesn't support plane
zpos, change the cursor location to the top-most plane.
Signed-off-by: Evan Benn <evanbenn@chromium.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
---
drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 29 +++++++++++++++++--------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index 7b392d6c71cc..d4078c2089e0 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -658,10 +658,21 @@ 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;
+ int i, ret;
+
+ struct drm_plane *primary = NULL;
+ struct drm_plane *cursor = NULL;
+
+ for (i = 0; i < mtk_crtc->layer_nr; ++i) {
+ if (!primary && mtk_crtc->planes[i].type ==
+ DRM_PLANE_TYPE_PRIMARY)
+ primary = &mtk_crtc->planes[i];
+ if (!cursor && 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);
@@ -711,11 +722,12 @@ static int mtk_drm_crtc_num_comp_planes(struct mtk_drm_crtc *mtk_crtc,
}
static inline
-enum drm_plane_type mtk_drm_crtc_plane_type(unsigned int plane_idx)
+enum drm_plane_type mtk_drm_crtc_plane_type(unsigned int plane_idx,
+ unsigned int num_planes)
{
if (plane_idx == 0)
return DRM_PLANE_TYPE_PRIMARY;
- else if (plane_idx == 1)
+ else if (plane_idx == (num_planes - 1))
return DRM_PLANE_TYPE_CURSOR;
else
return DRM_PLANE_TYPE_OVERLAY;
@@ -734,7 +746,8 @@ static int mtk_drm_crtc_init_comp_planes(struct drm_device *drm_dev,
ret = mtk_plane_init(drm_dev,
&mtk_crtc->planes[mtk_crtc->layer_nr],
BIT(pipe),
- mtk_drm_crtc_plane_type(mtk_crtc->layer_nr),
+ mtk_drm_crtc_plane_type(mtk_crtc->layer_nr,
+ num_planes),
mtk_ddp_comp_supported_rotations(comp));
if (ret)
return ret;
@@ -830,9 +843,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
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH] drm/mediatek: Ensure the cursor plane is on top of other overlays
2020-02-06 6:59 ` evanbenn
@ 2020-02-06 7:04 ` Evan Benn
2020-02-06 7:16 ` CK Hu
2020-02-06 14:01 ` Sean Paul
2 siblings, 0 replies; 14+ messages in thread
From: Evan Benn @ 2020-02-06 7:04 UTC (permalink / raw)
To: ck.hu
Cc: dcastagna, evanbenn, evanbenn, dri-devel, linux-mediatek,
p.zabel, matthias.bgg, seanpaul, sean, linux-arm-kernel
Apologies if I have formatted this wrong / sent to the wrong place!
The patch posted had an issue, another place in the driver was
assuming planes[1] still referred to the cursor.
Now search for the cursor before sending (as the plane cannot be
hard-coded, some devices have different numbers of planes).
Thanks
Evan Benn
On Thu, Feb 6, 2020 at 6:00 PM <evanbenn@google.com> wrote:
>
> From: Sean Paul <seanpaul@chromium.org>
>
> Currently the cursor is placed on the first overlay plane, which means
> it will be at the bottom of the stack when the hw does the compositing
> with anything other than primary plane. Since mtk doesn't support plane
> zpos, change the cursor location to the top-most plane.
>
> Signed-off-by: Evan Benn <evanbenn@chromium.org>
> Signed-off-by: Sean Paul <seanpaul@chromium.org>
> ---
> drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 29 +++++++++++++++++--------
> 1 file changed, 20 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> index 7b392d6c71cc..d4078c2089e0 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> @@ -658,10 +658,21 @@ 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;
> + int i, ret;
> +
> + struct drm_plane *primary = NULL;
> + struct drm_plane *cursor = NULL;
> +
> + for (i = 0; i < mtk_crtc->layer_nr; ++i) {
> + if (!primary && mtk_crtc->planes[i].type ==
> + DRM_PLANE_TYPE_PRIMARY)
> + primary = &mtk_crtc->planes[i];
> + if (!cursor && 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);
> @@ -711,11 +722,12 @@ static int mtk_drm_crtc_num_comp_planes(struct mtk_drm_crtc *mtk_crtc,
> }
>
> static inline
> -enum drm_plane_type mtk_drm_crtc_plane_type(unsigned int plane_idx)
> +enum drm_plane_type mtk_drm_crtc_plane_type(unsigned int plane_idx,
> + unsigned int num_planes)
> {
> if (plane_idx == 0)
> return DRM_PLANE_TYPE_PRIMARY;
> - else if (plane_idx == 1)
> + else if (plane_idx == (num_planes - 1))
> return DRM_PLANE_TYPE_CURSOR;
> else
> return DRM_PLANE_TYPE_OVERLAY;
> @@ -734,7 +746,8 @@ static int mtk_drm_crtc_init_comp_planes(struct drm_device *drm_dev,
> ret = mtk_plane_init(drm_dev,
> &mtk_crtc->planes[mtk_crtc->layer_nr],
> BIT(pipe),
> - mtk_drm_crtc_plane_type(mtk_crtc->layer_nr),
> + mtk_drm_crtc_plane_type(mtk_crtc->layer_nr,
> + num_planes),
> mtk_ddp_comp_supported_rotations(comp));
> if (ret)
> return ret;
> @@ -830,9 +843,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
>
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] drm/mediatek: Ensure the cursor plane is on top of other overlays
2020-02-06 6:59 ` evanbenn
2020-02-06 7:04 ` Evan Benn
@ 2020-02-06 7:16 ` CK Hu
2020-02-06 14:01 ` Sean Paul
2 siblings, 0 replies; 14+ messages in thread
From: CK Hu @ 2020-02-06 7:16 UTC (permalink / raw)
To: evanbenn
Cc: dcastagna, evanbenn, evanbenn, dri-devel, linux-mediatek,
p.zabel, matthias.bgg, seanpaul, sean, linux-arm-kernel
Hi, Evan:
It looks like Sean's version has some problem. So this version is
Reviewed-by: CK Hu <ck.hu@mediatek.com>
On Thu, 2020-02-06 at 17:59 +1100, evanbenn@google.com wrote:
> From: Sean Paul <seanpaul@chromium.org>
>
> Currently the cursor is placed on the first overlay plane, which means
> it will be at the bottom of the stack when the hw does the compositing
> with anything other than primary plane. Since mtk doesn't support plane
> zpos, change the cursor location to the top-most plane.
>
> Signed-off-by: Evan Benn <evanbenn@chromium.org>
> Signed-off-by: Sean Paul <seanpaul@chromium.org>
> ---
> drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 29 +++++++++++++++++--------
> 1 file changed, 20 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> index 7b392d6c71cc..d4078c2089e0 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> @@ -658,10 +658,21 @@ 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;
> + int i, ret;
> +
> + struct drm_plane *primary = NULL;
> + struct drm_plane *cursor = NULL;
> +
> + for (i = 0; i < mtk_crtc->layer_nr; ++i) {
> + if (!primary && mtk_crtc->planes[i].type ==
> + DRM_PLANE_TYPE_PRIMARY)
> + primary = &mtk_crtc->planes[i];
> + if (!cursor && 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);
> @@ -711,11 +722,12 @@ static int mtk_drm_crtc_num_comp_planes(struct mtk_drm_crtc *mtk_crtc,
> }
>
> static inline
> -enum drm_plane_type mtk_drm_crtc_plane_type(unsigned int plane_idx)
> +enum drm_plane_type mtk_drm_crtc_plane_type(unsigned int plane_idx,
> + unsigned int num_planes)
> {
> if (plane_idx == 0)
> return DRM_PLANE_TYPE_PRIMARY;
> - else if (plane_idx == 1)
> + else if (plane_idx == (num_planes - 1))
> return DRM_PLANE_TYPE_CURSOR;
> else
> return DRM_PLANE_TYPE_OVERLAY;
> @@ -734,7 +746,8 @@ static int mtk_drm_crtc_init_comp_planes(struct drm_device *drm_dev,
> ret = mtk_plane_init(drm_dev,
> &mtk_crtc->planes[mtk_crtc->layer_nr],
> BIT(pipe),
> - mtk_drm_crtc_plane_type(mtk_crtc->layer_nr),
> + mtk_drm_crtc_plane_type(mtk_crtc->layer_nr,
> + num_planes),
> mtk_ddp_comp_supported_rotations(comp));
> if (ret)
> return ret;
> @@ -830,9 +843,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;
>
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] drm/mediatek: Ensure the cursor plane is on top of other overlays
2020-02-06 6:59 ` evanbenn
2020-02-06 7:04 ` Evan Benn
2020-02-06 7:16 ` CK Hu
@ 2020-02-06 14:01 ` Sean Paul
2020-02-07 4:23 ` [PATCH] drm/mediatek: Find the cursor plane instead of hard coding it Evan Benn
2 siblings, 1 reply; 14+ messages in thread
From: Sean Paul @ 2020-02-06 14:01 UTC (permalink / raw)
To: evanbenn
Cc: dcastagna, evanbenn, evanbenn, dri-devel, matthias.bgg,
linux-mediatek, p.zabel, ck.hu, seanpaul, sean, linux-arm-kernel
On Thu, Feb 06, 2020 at 05:59:51PM +1100, evanbenn@google.com wrote:
> From: Sean Paul <seanpaul@chromium.org>
>
> Currently the cursor is placed on the first overlay plane, which means
> it will be at the bottom of the stack when the hw does the compositing
> with anything other than primary plane. Since mtk doesn't support plane
> zpos, change the cursor location to the top-most plane.
>
> Signed-off-by: Evan Benn <evanbenn@chromium.org>
Hi Evan,
Thanks for spotting the issue! I think this should probably be 2 patches, one to
fix crtc init and then the cursor patch on top of that. We generally try to only
do one thing per patch.
A few other nits below..
> Signed-off-by: Sean Paul <seanpaul@chromium.org>
> ---
> drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 29 +++++++++++++++++--------
> 1 file changed, 20 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> index 7b392d6c71cc..d4078c2089e0 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> @@ -658,10 +658,21 @@ 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;
> + int i, ret;
> +
extra line
> + struct drm_plane *primary = NULL;
> + struct drm_plane *cursor = NULL;
These should be on top of the int declaration
> +
> + for (i = 0; i < mtk_crtc->layer_nr; ++i) {
We don't really do pre-increment in kernel for loops
> + if (!primary && mtk_crtc->planes[i].type ==
> + DRM_PLANE_TYPE_PRIMARY)
Line breaks should be around '&&':
if (!primary &&
mtk_crtc->planes[i].type == DRM_PLANE_TYPE_PRIMARY)
> + primary = &mtk_crtc->planes[i];
> + if (!cursor && mtk_crtc->planes[i].type ==
else if?
> + DRM_PLANE_TYPE_CURSOR)
> + cursor = &mtk_crtc->planes[i];
Since we can only have one primary and one cursor, the NULL checks on primary
and cursor are unnecessary, you can just blindly assign them when you hit a
plane of the right type. If the driver creates multiples the behavior is
undefined anyways.
> + }
>
> ret = drm_crtc_init_with_planes(drm, &mtk_crtc->base, primary, cursor,
> &mtk_crtc_funcs, NULL);
> @@ -711,11 +722,12 @@ static int mtk_drm_crtc_num_comp_planes(struct mtk_drm_crtc *mtk_crtc,
> }
>
> static inline
> -enum drm_plane_type mtk_drm_crtc_plane_type(unsigned int plane_idx)
> +enum drm_plane_type mtk_drm_crtc_plane_type(unsigned int plane_idx,
> + unsigned int num_planes)
> {
> if (plane_idx == 0)
> return DRM_PLANE_TYPE_PRIMARY;
> - else if (plane_idx == 1)
> + else if (plane_idx == (num_planes - 1))
> return DRM_PLANE_TYPE_CURSOR;
> else
> return DRM_PLANE_TYPE_OVERLAY;
> @@ -734,7 +746,8 @@ static int mtk_drm_crtc_init_comp_planes(struct drm_device *drm_dev,
> ret = mtk_plane_init(drm_dev,
> &mtk_crtc->planes[mtk_crtc->layer_nr],
> BIT(pipe),
> - mtk_drm_crtc_plane_type(mtk_crtc->layer_nr),
> + mtk_drm_crtc_plane_type(mtk_crtc->layer_nr,
> + num_planes),
> mtk_ddp_comp_supported_rotations(comp));
> if (ret)
> return ret;
> @@ -830,9 +843,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
>
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH] drm/mediatek: Find the cursor plane instead of hard coding it
2020-02-06 14:01 ` Sean Paul
@ 2020-02-07 4:23 ` Evan Benn
2020-02-07 4:52 ` Evan Benn
` (2 more replies)
0 siblings, 3 replies; 14+ messages in thread
From: Evan Benn @ 2020-02-07 4:23 UTC (permalink / raw)
To: dri-devel
Cc: David Airlie, linux-kernel, Matthias Brugger, linux-mediatek,
Philipp Zabel, CK Hu, Evan Benn, linux-arm-kernel
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
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 14+ 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; 14+ messages in thread
From: Evan Benn @ 2020-02-07 4:52 UTC (permalink / raw)
To: dri-devel
Cc: David Airlie, linux-kernel, Matthias Brugger, linux-mediatek,
Philipp Zabel, CK Hu, 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
>
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 14+ 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; 14+ messages in thread
From: CK Hu @ 2020-02-07 8:34 UTC (permalink / raw)
To: Evan Benn
Cc: David Airlie, linux-kernel, dri-devel, linux-mediatek,
Philipp Zabel, Matthias Brugger, 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;
>
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 14+ 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; 14+ messages in thread
From: Sean Paul @ 2020-02-07 17:28 UTC (permalink / raw)
To: Evan Benn
Cc: David Airlie, LKML, dri-devel, Matthias Brugger,
moderated list:ARM/Mediatek SoC support, Philipp Zabel, CK Hu,
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
>
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH] drm/mediatek: Ensure the cursor plane is on top of other overlays
2020-01-31 3:27 ` CK Hu
2020-02-06 6:59 ` evanbenn
@ 2020-02-10 2:51 ` CK Hu
1 sibling, 0 replies; 14+ messages in thread
From: CK Hu @ 2020-02-10 2:51 UTC (permalink / raw)
To: Sean Paul
Cc: dcastagna, dri-devel, Sean Paul, Philipp Zabel, Matthias Brugger,
linux-mediatek, linux-arm-kernel
Hi, Sean:
On Fri, 2020-01-31 at 11:27 +0800, CK Hu wrote:
> Hi, Sean:
>
> On Thu, 2020-01-30 at 14:24 -0500, Sean Paul wrote:
> > From: Sean Paul <seanpaul@chromium.org>
> >
> > Currently the cursor is placed on the first overlay plane, which means
> > it will be at the bottom of the stack when the hw does the compositing
> > with anything other than primary plane. Since mtk doesn't support plane
> > zpos, change the cursor location to the top-most plane.
> >
>
> 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: Sean Paul <seanpaul@chromium.org>
> > ---
> > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 8 +++++---
> > 1 file changed, 5 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> > index 0dfcd1787e651..4ac76b9613926 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> > @@ -689,11 +689,12 @@ static int mtk_drm_crtc_num_comp_planes(struct mtk_drm_crtc *mtk_crtc,
> > }
> >
> > static inline
> > -enum drm_plane_type mtk_drm_crtc_plane_type(unsigned int plane_idx)
> > +enum drm_plane_type mtk_drm_crtc_plane_type(unsigned int plane_idx,
> > + unsigned int num_planes)
> > {
> > if (plane_idx == 0)
> > return DRM_PLANE_TYPE_PRIMARY;
> > - else if (plane_idx == 1)
> > + else if (plane_idx == (num_planes - 1))
> > return DRM_PLANE_TYPE_CURSOR;
> > else
> > return DRM_PLANE_TYPE_OVERLAY;
> > @@ -712,7 +713,8 @@ static int mtk_drm_crtc_init_comp_planes(struct drm_device *drm_dev,
> > ret = mtk_plane_init(drm_dev,
> > &mtk_crtc->planes[mtk_crtc->layer_nr],
> > BIT(pipe),
> > - mtk_drm_crtc_plane_type(mtk_crtc->layer_nr),
> > + mtk_drm_crtc_plane_type(mtk_crtc->layer_nr,
> > + num_planes),
> > mtk_ddp_comp_supported_rotations(comp));
> > if (ret)
> > return ret;
>
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 14+ 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; 14+ messages in thread
From: CK Hu @ 2020-02-10 2:53 UTC (permalink / raw)
To: Evan Benn
Cc: David Airlie, linux-kernel, dri-devel, linux-mediatek,
Philipp Zabel, Matthias Brugger, 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;
> >
>
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 14+ 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; 14+ messages in thread
From: Sean Paul @ 2020-02-10 14:10 UTC (permalink / raw)
To: CK Hu
Cc: David Airlie, LKML, dri-devel,
moderated list:ARM/Mediatek SoC support, Matthias Brugger,
Evan Benn, 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
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 14+ 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; 14+ messages in thread
From: CK Hu @ 2020-02-11 1:19 UTC (permalink / raw)
To: Sean Paul
Cc: David Airlie, LKML, dri-devel,
moderated list:ARM/Mediatek SoC support, Matthias Brugger,
Evan Benn, 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
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2020-02-11 1:19 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-30 19:24 [PATCH] drm/mediatek: Ensure the cursor plane is on top of other overlays Sean Paul
2020-01-31 3:27 ` CK Hu
2020-02-06 6:59 ` evanbenn
2020-02-06 7:04 ` Evan Benn
2020-02-06 7:16 ` CK Hu
2020-02-06 14:01 ` Sean Paul
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-10 14:10 ` Sean Paul
2020-02-11 1:19 ` CK Hu
2020-02-07 17:28 ` Sean Paul
2020-02-10 2:51 ` [PATCH] drm/mediatek: Ensure the cursor plane is on top of other overlays CK Hu
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).