From patchwork Fri Mar 17 03:08:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?WXVuZmVpIERvbmcgKOiRo+S6kemjnik=?= X-Patchwork-Id: 71055 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp119275wrt; Thu, 16 Mar 2023 20:15:53 -0700 (PDT) X-Google-Smtp-Source: AK7set9+sEsj2UJHEhtArylsAGF2WcOp5ujT9U5k4/cWf9gB6VmXKqzB+S5QR6yURBXq2alR/a7C X-Received: by 2002:a17:903:1247:b0:1a0:5d0b:c31e with SMTP id u7-20020a170903124700b001a05d0bc31emr7062335plh.44.1679022953470; Thu, 16 Mar 2023 20:15:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679022953; cv=none; d=google.com; s=arc-20160816; b=cN3OJVEt8JlOjWW6Au+ict2nIoF4XuRM52rLqY2Y0VK6qSNVQoxZLuZrRqG9Sfjs/V 2RcCNUMEfEz04clEO5D0l2yX3tLkmrKXC/FYD9upXzvOviIH7X28/lhpp7Byx3r/jDVT GCDVRaQqVRvM0nN2SdauwKxiqlmV23GMDXTFj02vurlzXUcaUSLpMWSJCSwXZTSBYY9Q E6etqltb6xpWLWyFwmMGJf7Yjt18Dtm7t7AIC6MnEBC8GfioUgUTqCuv7ngxvTPucLgg IUEuRIj7V27xEaZ9YtrKenWFpnBbXxr8ujM6hjnOOx8Tlw6RY41o/Qn3rqlcc3I2Caoq MsSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=PfXejbSJ+gESzqPGGzxv/i7SYXG7tkTWKaOyZexlqSg=; b=w96+V+X9e12VFrEIzRxaOZ5YA+bIhoFBqT+xj8Z8QNawqrPdQZYVusX1uYUfBFRCSB rkXRwy1qoItsyp47yS9R4a9ObhmkZ96BnGYqsQcJAv6qKqKcSfFyotBgpJLFaGF4gTqa M3Rvt1NtyX9NeP8f+2/YFA0NEyMlZl3RQs3fBmYx3t3SZVdNjOudPj8BM9xUVtBr34UL YwyfTsEHpzsbPecfaGsQxJJ8fy04C8J4wNHVGa5zZ5j0sfTmSBuy9igpVxuU1ZIk+pNt o9vwu4eL8hk/X+fmVzuf8l1p0U7pNH3ONyKywcBkCLmMzhBeiRxHgMF4J8e7LAyAxVCQ WFkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=EqgsDojp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t14-20020a63224e000000b0050be4f9909bsi1047646pgm.695.2023.03.16.20.15.39; Thu, 16 Mar 2023 20:15:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=EqgsDojp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230027AbjCQDLJ (ORCPT + 99 others); Thu, 16 Mar 2023 23:11:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230011AbjCQDKe (ORCPT ); Thu, 16 Mar 2023 23:10:34 -0400 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E31C2B53E3; Thu, 16 Mar 2023 20:08:40 -0700 (PDT) X-UUID: 021f80cac47111edbd2e61cc88cc8f98-20230317 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject:CC:To:From; bh=PfXejbSJ+gESzqPGGzxv/i7SYXG7tkTWKaOyZexlqSg=; b=EqgsDojpIPBRC7w8bLKpdnG/8WHPUn607318amHvYk8p30G5hzP/TsB1VMqjcUPdVyxTNp1YsI8TE6+GKaHR4wNzV63GBJsZT1rgT/SYI09WElt5tz5kU5qiRkmVcPzl8xUfIg+4C7bwWBCxhJRrFis1AJmqTjGipbZ9vwN4r4M=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.21,REQID:b9035c24-516f-48d1-a1b6-deb5aa288657,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:83295aa,CLOUDID:b01a11f6-ddba-41c3-91d9-10eeade8eac7,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-UUID: 021f80cac47111edbd2e61cc88cc8f98-20230317 Received: from mtkmbs13n2.mediatek.inc [(172.21.101.108)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 306452056; Fri, 17 Mar 2023 11:08:36 +0800 Received: from mtkmbs13n2.mediatek.inc (172.21.101.108) by mtkmbs13n2.mediatek.inc (172.21.101.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.25; Fri, 17 Mar 2023 11:08:35 +0800 Received: from mhfsdcap04.gcn.mediatek.inc (10.17.3.154) by mtkmbs13n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.25 via Frontend Transport; Fri, 17 Mar 2023 11:08:34 +0800 From: Yunfei Dong To: Yunfei Dong , Chen-Yu Tsai , Nicolas Dufresne , Hans Verkuil , AngeloGioacchino Del Regno , Benjamin Gaignard , =?utf-8?q?N=C3=ADcolas?= =?utf-8?q?_F_=2E_R_=2E_A_=2E_Prado?= CC: Matthias Brugger , Hsin-Yi Wang , Fritz Koenig , Daniel Vetter , Steve Cho , , , , , , Subject: [PATCH v4,1/2] media: mediatek: vcodec: Force capture queue format to MM21 Date: Fri, 17 Mar 2023 11:08:32 +0800 Message-ID: <20230317030833.16836-1-yunfei.dong@mediatek.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-MTK: N X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760583172157653758?= X-GMAIL-MSGID: =?utf-8?q?1760583172157653758?= While the decoder can produce frames in both MM21 and MT21C formats, only MM21 is currently supported by userspace tools (like gstreamer and libyuv). In order to ensure userspace keeps working after the SCP firmware is updated to support both MM21 and MT21C formats, force the MM21 format for the capture queue. This is meant as a stopgap solution while dynamic format switching between MM21 and MT21C isn't implemented in the driver. Fixes: 7501edef6b1f ("media: mediatek: vcodec: Different codec using different capture format") Signed-off-by: Yunfei Dong Reviewed-by: AngeloGioacchino Del Regno Reviewed-by: Nícolas F. R. A. Prado Tested-by: Nícolas F. R. A. Prado --- changed with v3: - re-write commit message. - add one new patch to fix v4l2-compliance fail. changed with v2: - re-write commit message. - change the driver flow. changed with v1: - add Fixes tag. --- .../platform/mediatek/vcodec/mtk_vcodec_dec.c | 24 +++---------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c index 641f533c417f..c99705681a03 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c @@ -39,10 +39,9 @@ static bool mtk_vdec_get_cap_fmt(struct mtk_vcodec_ctx *ctx, int format_index) { const struct mtk_vcodec_dec_pdata *dec_pdata = ctx->dev->vdec_pdata; const struct mtk_video_fmt *fmt; - struct mtk_q_data *q_data; int num_frame_count = 0, i; - bool ret = true; + fmt = &dec_pdata->vdec_formats[format_index]; for (i = 0; i < *dec_pdata->num_formats; i++) { if (dec_pdata->vdec_formats[i].type != MTK_FMT_FRAME) continue; @@ -50,27 +49,10 @@ static bool mtk_vdec_get_cap_fmt(struct mtk_vcodec_ctx *ctx, int format_index) num_frame_count++; } - if (num_frame_count == 1) + if (num_frame_count == 1 || fmt->fourcc == V4L2_PIX_FMT_MM21) return true; - fmt = &dec_pdata->vdec_formats[format_index]; - q_data = &ctx->q_data[MTK_Q_DATA_SRC]; - switch (q_data->fmt->fourcc) { - case V4L2_PIX_FMT_VP8_FRAME: - if (fmt->fourcc == V4L2_PIX_FMT_MM21) - ret = true; - break; - case V4L2_PIX_FMT_H264_SLICE: - case V4L2_PIX_FMT_VP9_FRAME: - if (fmt->fourcc == V4L2_PIX_FMT_MM21) - ret = false; - break; - default: - ret = true; - break; - } - - return ret; + return false; } static struct mtk_q_data *mtk_vdec_get_q_data(struct mtk_vcodec_ctx *ctx,