diff mbox

[media] mtk-mdp: Fix g_/s_selection capture/compose logic

Message ID 1492057130-1194-1-git-send-email-minghsiu.tsai@mediatek.com (mailing list archive)
State New, archived
Headers show

Commit Message

Minghsiu Tsai April 13, 2017, 4:18 a.m. UTC 
From: Daniel Kurtz <djkurtz@chromium.org>

Experiments show that the:
 (1) mtk-mdp uses the _MPLANE form of CAPTURE/OUTPUT
 (2) CAPTURE types use CROP targets, and OUTPUT types use COMPOSE targets

Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Signed-off-by: Minghsiu Tsai <minghsiu.tsai@mediatek.com>

---
 drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

Comments

Wu-Cheng Li (李務誠) April 13, 2017, 6:50 a.m. UTC | #1 
Reviewed-by: Wu-Cheng Li <wuchengli@chromium.org>

On Thu, Apr 13, 2017 at 12:18 PM, Minghsiu Tsai
<minghsiu.tsai@mediatek.com> wrote:
> From: Daniel Kurtz <djkurtz@chromium.org>
>
> Experiments show that the:
>  (1) mtk-mdp uses the _MPLANE form of CAPTURE/OUTPUT
>  (2) CAPTURE types use CROP targets, and OUTPUT types use COMPOSE targets
>
> Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
> Signed-off-by: Minghsiu Tsai <minghsiu.tsai@mediatek.com>
>
> ---
>  drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c b/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
> index 13afe48..8ab7ca0 100644
> --- a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
> +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
> @@ -837,12 +837,12 @@ static int mtk_mdp_m2m_g_selection(struct file *file, void *fh,
>         struct mtk_mdp_ctx *ctx = fh_to_ctx(fh);
>         bool valid = false;
>
> -       if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
> -               if (mtk_mdp_is_target_compose(s->target))
> -                       valid = true;
> -       } else if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
> +       if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
>                 if (mtk_mdp_is_target_crop(s->target))
>                         valid = true;
> +       } else if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
> +               if (mtk_mdp_is_target_compose(s->target))
> +                       valid = true;
>         }
>         if (!valid) {
>                 mtk_mdp_dbg(1, "[%d] invalid type:%d,%u", ctx->id, s->type,
> @@ -907,12 +907,12 @@ static int mtk_mdp_m2m_s_selection(struct file *file, void *fh,
>         int ret;
>         bool valid = false;
>
> -       if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
> -               if (s->target == V4L2_SEL_TGT_COMPOSE)
> -                       valid = true;
> -       } else if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
> +       if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
>                 if (s->target == V4L2_SEL_TGT_CROP)
>                         valid = true;
> +       } else if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
> +               if (s->target == V4L2_SEL_TGT_COMPOSE)
> +                       valid = true;
>         }
>         if (!valid) {
>                 mtk_mdp_dbg(1, "[%d] invalid type:%d,%u", ctx->id, s->type,
> @@ -925,7 +925,7 @@ static int mtk_mdp_m2m_s_selection(struct file *file, void *fh,
>         if (ret)
>                 return ret;
>
> -       if (mtk_mdp_is_target_crop(s->target))
> +       if (mtk_mdp_is_target_compose(s->target))
>                 frame = &ctx->s_frame;
>         else
>                 frame = &ctx->d_frame;
> --
> 1.9.1
>
houlong.wei April 27, 2017, 6:11 a.m. UTC | #2 
On Thu, 2017-04-13 at 14:50 +0800, Wu-Cheng Li (李務誠) wrote:
> Reviewed-by: Wu-Cheng Li <wuchengli@chromium.org>
> 
> On Thu, Apr 13, 2017 at 12:18 PM, Minghsiu Tsai
> <minghsiu.tsai@mediatek.com> wrote:
> > From: Daniel Kurtz <djkurtz@chromium.org>
> >
> > Experiments show that the:
> >  (1) mtk-mdp uses the _MPLANE form of CAPTURE/OUTPUT
> >  (2) CAPTURE types use CROP targets, and OUTPUT types use COMPOSE targets
> >
> > Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
> > Signed-off-by: Minghsiu Tsai <minghsiu.tsai@mediatek.com>
Acked-by:Houlong Wei <houlong.wei@mediatek.com>
> >
> > ---
> >  drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 18 +++++++++---------
> >  1 file changed, 9 insertions(+), 9 deletions(-)
> >
> > diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c b/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
> > index 13afe48..8ab7ca0 100644
> > --- a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
> > +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
> > @@ -837,12 +837,12 @@ static int mtk_mdp_m2m_g_selection(struct file *file, void *fh,
> >         struct mtk_mdp_ctx *ctx = fh_to_ctx(fh);
> >         bool valid = false;
> >
> > -       if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
> > -               if (mtk_mdp_is_target_compose(s->target))
> > -                       valid = true;
> > -       } else if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
> > +       if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
> >                 if (mtk_mdp_is_target_crop(s->target))
> >                         valid = true;
> > +       } else if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
> > +               if (mtk_mdp_is_target_compose(s->target))
> > +                       valid = true;
> >         }
> >         if (!valid) {
> >                 mtk_mdp_dbg(1, "[%d] invalid type:%d,%u", ctx->id, s->type,
> > @@ -907,12 +907,12 @@ static int mtk_mdp_m2m_s_selection(struct file *file, void *fh,
> >         int ret;
> >         bool valid = false;
> >
> > -       if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
> > -               if (s->target == V4L2_SEL_TGT_COMPOSE)
> > -                       valid = true;
> > -       } else if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
> > +       if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
> >                 if (s->target == V4L2_SEL_TGT_CROP)
> >                         valid = true;
> > +       } else if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
> > +               if (s->target == V4L2_SEL_TGT_COMPOSE)
> > +                       valid = true;
> >         }
> >         if (!valid) {
> >                 mtk_mdp_dbg(1, "[%d] invalid type:%d,%u", ctx->id, s->type,
> > @@ -925,7 +925,7 @@ static int mtk_mdp_m2m_s_selection(struct file *file, void *fh,
> >         if (ret)
> >                 return ret;
> >
> > -       if (mtk_mdp_is_target_crop(s->target))
> > +       if (mtk_mdp_is_target_compose(s->target))
> >                 frame = &ctx->s_frame;
> >         else
> >                 frame = &ctx->d_frame;
> > --
> > 1.9.1
> >
Stanimir Varbanov April 27, 2017, 2:42 p.m. UTC | #3 
Hi,

On 04/13/2017 07:18 AM, Minghsiu Tsai wrote:
> From: Daniel Kurtz <djkurtz@chromium.org>
> 
> Experiments show that the:
>  (1) mtk-mdp uses the _MPLANE form of CAPTURE/OUTPUT
>  (2) CAPTURE types use CROP targets, and OUTPUT types use COMPOSE targets
> 
> Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
> Signed-off-by: Minghsiu Tsai <minghsiu.tsai@mediatek.com>
> 
> ---
>  drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c b/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
> index 13afe48..8ab7ca0 100644
> --- a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
> +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
> @@ -837,12 +837,12 @@ static int mtk_mdp_m2m_g_selection(struct file *file, void *fh,
>  	struct mtk_mdp_ctx *ctx = fh_to_ctx(fh);
>  	bool valid = false;
>  
> -	if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
> -		if (mtk_mdp_is_target_compose(s->target))
> -			valid = true;
> -	} else if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
> +	if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
>  		if (mtk_mdp_is_target_crop(s->target))
>  			valid = true;
> +	} else if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
> +		if (mtk_mdp_is_target_compose(s->target))
> +			valid = true;
>  	}

Using MPLANE formats in g/s_selection violates the v4l2 spec. See [1].

<snip>
Minghsiu Tsai June 8, 2017, 3:22 a.m. UTC | #4 
Hi, Stanimir Varbanov,

I have upload patch v2. 
https://patchwork.kernel.org/patch/9723463/

Could you review it? Thanks


On Thu, 2017-04-27 at 17:42 +0300, Stanimir Varbanov wrote:
> Hi,
> 
> On 04/13/2017 07:18 AM, Minghsiu Tsai wrote:
> > From: Daniel Kurtz <djkurtz@chromium.org>
> > 
> > Experiments show that the:
> >  (1) mtk-mdp uses the _MPLANE form of CAPTURE/OUTPUT
> >  (2) CAPTURE types use CROP targets, and OUTPUT types use COMPOSE targets
> > 
> > Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
> > Signed-off-by: Minghsiu Tsai <minghsiu.tsai@mediatek.com>
> > 
> > ---
> >  drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 18 +++++++++---------
> >  1 file changed, 9 insertions(+), 9 deletions(-)
> > 
> > diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c b/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
> > index 13afe48..8ab7ca0 100644
> > --- a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
> > +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
> > @@ -837,12 +837,12 @@ static int mtk_mdp_m2m_g_selection(struct file *file, void *fh,
> >  	struct mtk_mdp_ctx *ctx = fh_to_ctx(fh);
> >  	bool valid = false;
> >  
> > -	if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
> > -		if (mtk_mdp_is_target_compose(s->target))
> > -			valid = true;
> > -	} else if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
> > +	if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
> >  		if (mtk_mdp_is_target_crop(s->target))
> >  			valid = true;
> > +	} else if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
> > +		if (mtk_mdp_is_target_compose(s->target))
> > +			valid = true;
> >  	}
> 
> Using MPLANE formats in g/s_selection violates the v4l2 spec. See [1].
> 
> <snip>
>
diff mbox

Patch

diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c b/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
index 13afe48..8ab7ca0 100644
--- a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
+++ b/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
@@ -837,12 +837,12 @@  static int mtk_mdp_m2m_g_selection(struct file *file, void *fh,
 	struct mtk_mdp_ctx *ctx = fh_to_ctx(fh);
 	bool valid = false;
 
-	if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
-		if (mtk_mdp_is_target_compose(s->target))
-			valid = true;
-	} else if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
+	if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
 		if (mtk_mdp_is_target_crop(s->target))
 			valid = true;
+	} else if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
+		if (mtk_mdp_is_target_compose(s->target))
+			valid = true;
 	}
 	if (!valid) {
 		mtk_mdp_dbg(1, "[%d] invalid type:%d,%u", ctx->id, s->type,
@@ -907,12 +907,12 @@  static int mtk_mdp_m2m_s_selection(struct file *file, void *fh,
 	int ret;
 	bool valid = false;
 
-	if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
-		if (s->target == V4L2_SEL_TGT_COMPOSE)
-			valid = true;
-	} else if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
+	if (s->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
 		if (s->target == V4L2_SEL_TGT_CROP)
 			valid = true;
+	} else if (s->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
+		if (s->target == V4L2_SEL_TGT_COMPOSE)
+			valid = true;
 	}
 	if (!valid) {
 		mtk_mdp_dbg(1, "[%d] invalid type:%d,%u", ctx->id, s->type,
@@ -925,7 +925,7 @@  static int mtk_mdp_m2m_s_selection(struct file *file, void *fh,
 	if (ret)
 		return ret;
 
-	if (mtk_mdp_is_target_crop(s->target))
+	if (mtk_mdp_is_target_compose(s->target))
 		frame = &ctx->s_frame;
 	else
 		frame = &ctx->d_frame;