From patchwork Thu Apr 13 04:18:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Minghsiu Tsai X-Patchwork-Id: 9678723 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 71B7860384 for ; Thu, 13 Apr 2017 04:19:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 60BA928630 for ; Thu, 13 Apr 2017 04:19:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 53ED728633; Thu, 13 Apr 2017 04:19:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1268728630 for ; Thu, 13 Apr 2017 04:19:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=+sT2mCwSPCXU04hjE/QqTiZFbknHOTAAUs8xVYtscNM=; b=BX13xQuqEHzyfS bF7WlbBevIaYv+DNDnwmVV+Hmj1U1rh7am1JL0D5cpemaOyEe6sNId6N/oOJ8ecKasjrqbYFn18j6 7zsVGQORO4oK73a+8lY56oUQQKnuTG8CHTeXw5Q9jEnV+xAwhlZXleq6NmLHRFOhyFCQowyw2z6r1 Og9k/0xR64luDsec83SMDRvY4q62Dq+aPQAbjcpbNN4hMqFvn47tnh3icf/tmUdBn0vUzaGQkGrRi IV8yg8Wkrpwy3FM+o/ZFIl3zIKVl8yFoEjY60eXHc2eiFJztT8TVwA4ENzQokuQoNW1ayUPDKMPk/ BS20ONdKdI4IHfWPzdIA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cyWEQ-0004DQ-2F; Thu, 13 Apr 2017 04:19:42 +0000 Received: from [210.61.82.183] (helo=mailgw01.mediatek.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cyWED-0003wA-U6; Thu, 13 Apr 2017 04:19:31 +0000 Received: from mtkhts09.mediatek.inc [(172.21.101.70)] by mailgw01.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 1314521090; Thu, 13 Apr 2017 12:18:55 +0800 Received: from mtkslt302.mediatek.inc (10.21.14.115) by mtkhts09.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 14.3.266.1; Thu, 13 Apr 2017 12:18:53 +0800 From: Minghsiu Tsai To: Hans Verkuil , , Rob Herring , Mauro Carvalho Chehab , Matthias Brugger , Daniel Kurtz , Pawel Osciak , Houlong Wei Subject: [PATCH] [media] mtk-mdp: Fix g_/s_selection capture/compose logic Date: Thu, 13 Apr 2017 12:18:50 +0800 Message-ID: <1492057130-1194-1-git-send-email-minghsiu.tsai@mediatek.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170412_211930_132337_EA1DDCEA X-CRM114-Status: GOOD ( 11.93 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Minghsiu Tsai , srv_heupstream@mediatek.com, Wu-Cheng Li , linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, Yingjoe Chen , Eddie Huang , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Wu-Cheng Li 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;