Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162014AbdD0GMR (ORCPT ); Thu, 27 Apr 2017 02:12:17 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:38817 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S932866AbdD0GMG (ORCPT ); Thu, 27 Apr 2017 02:12:06 -0400 Message-ID: <1493273512.8340.4.camel@mhfsdcap03> Subject: Re: [PATCH] [media] mtk-mdp: Fix g_/s_selection capture/compose logic From: houlong wei To: Wu-Cheng Li =?UTF-8?Q?=28=E6=9D=8E=E5=8B=99=E8=AA=A0=29?= CC: Minghsiu Tsai , Hans Verkuil , Daniel Thompson , "Rob Herring" , Mauro Carvalho Chehab , Matthias Brugger , Daniel Kurtz , Pawel Osciak , , Eddie Huang , Yingjoe Chen , , , , , Date: Thu, 27 Apr 2017 14:11:52 +0800 In-Reply-To: References: <1492057130-1194-1-git-send-email-minghsiu.tsai@mediatek.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.3-0ubuntu6 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 X-MTK: N Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3056 Lines: 70 On Thu, 2017-04-13 at 14:50 +0800, Wu-Cheng Li (李務誠) wrote: > Reviewed-by: Wu-Cheng Li > > On Thu, Apr 13, 2017 at 12:18 PM, Minghsiu Tsai > wrote: > > From: Daniel Kurtz > > > > 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 > > Signed-off-by: Minghsiu Tsai Acked-by:Houlong Wei > > > > --- > > 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 > >