Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756110AbdDMGud (ORCPT ); Thu, 13 Apr 2017 02:50:33 -0400 Received: from mail-io0-f170.google.com ([209.85.223.170]:32837 "EHLO mail-io0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756069AbdDMGua (ORCPT ); Thu, 13 Apr 2017 02:50:30 -0400 MIME-Version: 1.0 In-Reply-To: <1492057130-1194-1-git-send-email-minghsiu.tsai@mediatek.com> References: <1492057130-1194-1-git-send-email-minghsiu.tsai@mediatek.com> From: =?UTF-8?B?V3UtQ2hlbmcgTGkgKOadjuWLmeiqoCk=?= Date: Thu, 13 Apr 2017 14:50:08 +0800 Message-ID: Subject: Re: [PATCH] [media] mtk-mdp: Fix g_/s_selection capture/compose logic To: Minghsiu Tsai Cc: Hans Verkuil , Daniel Thompson , Rob Herring , Mauro Carvalho Chehab , Matthias Brugger , Daniel Kurtz , Pawel Osciak , Houlong Wei , srv_heupstream@mediatek.com, Eddie Huang , Yingjoe Chen , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2807 Lines: 67 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 > > --- > 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 >