From nobody Sat Sep 21 22:47:46 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54134C43334 for ; Wed, 6 Jul 2022 08:22:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231634AbiGFIWD (ORCPT ); Wed, 6 Jul 2022 04:22:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231539AbiGFIWA (ORCPT ); Wed, 6 Jul 2022 04:22:00 -0400 Received: from mail-pg1-x529.google.com (mail-pg1-x529.google.com [IPv6:2607:f8b0:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D48723BD0 for ; Wed, 6 Jul 2022 01:22:00 -0700 (PDT) Received: by mail-pg1-x529.google.com with SMTP id i190so842353pge.7 for ; Wed, 06 Jul 2022 01:22:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JwjM4aG2gB9+TdDB98m3vhzsdflSXb4D+/c8i8pKJx0=; b=N7dOOvucEDYkMqhp2ctayX7Z/y+eURq7LldgGQRj+MugzxvffpIXvCfvAIn6/ybvl6 DJKXqzhMUySX352b33U36W/ZPbS30UgaBToh+RKEoeiqlEKezAxBJp/2fLE4yHXp51E9 miuVayU/xVrUZhKUdARWa6siIeedl8mdvDZlU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JwjM4aG2gB9+TdDB98m3vhzsdflSXb4D+/c8i8pKJx0=; b=s4xMzlrjCOGAobsIdXDwtg7XpHVEtshV2e09s3cekEvwbIMYP3B8YdbEdPyiZWzxIC dwWmoln22BmqFiRYy4msPg/kEb7NPE8/QhEZW9UZQaEbjYQjD3lZAAwMnrCQbvLohAm1 5+Q2lTYIraoloQzBO5o6RQZ4g721mWldJzjk09TNxDvSmdkasH/JSKQaf2aQvLrayerS UDyKiK3D61ePoCVRnm6iADl5xZJAL5Zix80aJOh2Iw4JspnY842Ns/m8LVNQosv+HnFv CJdoHEdp80uMSGf6CVApsraQpB8SnQnxH8kPC+46eYj/6n//xTcneb51NwoAwBhPzyJG /IMQ== X-Gm-Message-State: AJIora9cUGLmv7AvNcPOqwFtp4HNKp+Bmofbwkn2RwYRUV6kr2ngukGP E1gxx8WIvIM31d/qAfT47ZP1uA== X-Google-Smtp-Source: AGRyM1vdyg/m1tsExpeqCPFt1V28vkyPJIpq4iabapLc2qReT+Wur6sP+aTdbO3uuzEOUpoqJb9qYw== X-Received: by 2002:a05:6a00:174f:b0:525:518e:71d6 with SMTP id j15-20020a056a00174f00b00525518e71d6mr45951288pfc.68.1657095719919; Wed, 06 Jul 2022 01:21:59 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:74a3:a7a4:af57:d7f]) by smtp.gmail.com with ESMTPSA id rm1-20020a17090b3ec100b001ed27d132c1sm20767040pjb.2.2022.07.06.01.21.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 01:21:59 -0700 (PDT) From: Chen-Yu Tsai To: Tiffany Lin , Andrew-CT Chen , Yunfei Dong , Mauro Carvalho Chehab , Hans Verkuil Cc: Chen-Yu Tsai , linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Nicolas Dufresne , AngeloGioacchino Del Regno , Nicolas Dufresne Subject: [PATCH v2 1/6] media: mediatek: vcodec: decoder: Const-ify stepwise_fhd Date: Wed, 6 Jul 2022 16:21:33 +0800 Message-Id: <20220706082138.2668163-2-wenst@chromium.org> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog In-Reply-To: <20220706082138.2668163-1-wenst@chromium.org> References: <20220706082138.2668163-1-wenst@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" stepwise_fhd is the reference framesize variable, and should not be altered. Make it constant. Fixes: ("76250b48de79 media: mediatek: vcodec: Getting supported decoder fo= rmat types") Signed-off-by: Chen-Yu Tsai Tested-by: AngeloGioacchino Del Regno --- .../media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateles= s.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c index 16d55785d84b..f1c0276c9026 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c @@ -119,7 +119,7 @@ static struct mtk_video_fmt default_cap_format; static unsigned int num_formats; static unsigned int num_framesizes; =20 -static struct v4l2_frmsize_stepwise stepwise_fhd =3D { +static const struct v4l2_frmsize_stepwise stepwise_fhd =3D { .min_width =3D MTK_VDEC_MIN_W, .max_width =3D MTK_VDEC_MAX_W, .step_width =3D 16, --=20 2.37.0.rc0.161.g10f37bed90-goog From nobody Sat Sep 21 22:47:46 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EB20CCA473 for ; Wed, 6 Jul 2022 08:22:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231861AbiGFIWT (ORCPT ); Wed, 6 Jul 2022 04:22:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231637AbiGFIWE (ORCPT ); Wed, 6 Jul 2022 04:22:04 -0400 Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9271237DF for ; Wed, 6 Jul 2022 01:22:02 -0700 (PDT) Received: by mail-pg1-x52c.google.com with SMTP id s206so13461744pgs.3 for ; Wed, 06 Jul 2022 01:22:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Mu0K2f455RiKxumx5vD+/pZBXQChYIagGzSjzSngBm0=; b=IkoTUqFiTmQZXtRFGpGLXQ4ml/3Z6/OBUz2WSlHak9MOD3hgcxye6EFaXNayZrAqrD DL4w3r4d5R16hnZEiRzcpl55Yl71jz0rLwHdPu3psiEANvb4Ak8I8a9b7vGQul864/v+ uK8Nm/r9LKUBqk/NQBwElbsdhHk/454R/QlVg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Mu0K2f455RiKxumx5vD+/pZBXQChYIagGzSjzSngBm0=; b=enmwmauJXnLg+B6W/zAz+FSa134xGfA8Wmau/zsFEjTfqOekBwsDjhDAebmCjYpNUi 7XJlEDF9MoG4uFCktG+UtpWfYty2dnGndOemua1b0/OCYaiEFf0L0K1gYFfIrgGkUKS4 EGyE2l+wMj5+jDP3nLvLmwkmvivl5S1vmhSARjbPZfNgKqbiW2YumbIdju/cPHrs0yqM hV4zc5EFyjtL5Y3BWiB86UGKvS4YKUNu5CqQqoEqO+mJPvWIxpFI+RKheppM16eNMaVF iuRDR5UMyXdeP/fMvfDOwKvy+Uk8bP1zIxPLUXB/qcyPvdoDF06owLTWmC+GsfW2SnHD DXmA== X-Gm-Message-State: AJIora82cB+5bZAsj18AV11tal2dtjeOR4QbGz3jqgKZDde4FbtmUyo0 VnhDSXoaZXMcYztv1xfBslp8hA== X-Google-Smtp-Source: AGRyM1vHLjJtUAAMKtGVRWIY3QAluyKTCS5Lmqxp1AvtumrW0o/Cqy6NG/Xj5zwHDstMtEEaF4H9qg== X-Received: by 2002:a63:6984:0:b0:40d:9ebe:5733 with SMTP id e126-20020a636984000000b0040d9ebe5733mr33885451pgc.170.1657095722163; Wed, 06 Jul 2022 01:22:02 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:74a3:a7a4:af57:d7f]) by smtp.gmail.com with ESMTPSA id rm1-20020a17090b3ec100b001ed27d132c1sm20767040pjb.2.2022.07.06.01.22.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 01:22:01 -0700 (PDT) From: Chen-Yu Tsai To: Tiffany Lin , Andrew-CT Chen , Yunfei Dong , Mauro Carvalho Chehab , Hans Verkuil Cc: Chen-Yu Tsai , linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Nicolas Dufresne , AngeloGioacchino Del Regno , Nicolas Dufresne Subject: [PATCH v2 2/6] media: mediatek: vcodec: decoder: Fix 4K frame size enumeration Date: Wed, 6 Jul 2022 16:21:34 +0800 Message-Id: <20220706082138.2668163-3-wenst@chromium.org> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog In-Reply-To: <20220706082138.2668163-1-wenst@chromium.org> References: <20220706082138.2668163-1-wenst@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This partially reverts commit b018be06f3c7 ("media: mediatek: vcodec: Read max resolution from dec_capability"). In this commit, the maximum resolution ended up being a function of both the firmware capability and the current set format. However, frame size enumeration for output (coded) formats should not depend on the format set, but should return supported resolutions for the format requested by userspace. Fix this so that the driver returns the supported resolutions correctly, even if the instance only has default settings, or if the output format is currently set to VP8F, which does not support 4K. This adds an copy of special casing for !VP8 and 4K support. The other existing copy will be removed when .max_{width,height} are removed from |struct mtk_vcodec_ctx| in a subsequent patch. Fixes: b018be06f3c7 ("media: mediatek: vcodec: Read max resolution from dec= _capability") Signed-off-by: Chen-Yu Tsai Tested-by: AngeloGioacchino Del Regno --- drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c | 2 -- .../platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c b/driv= ers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c index 5d6fdf18c3a6..fcb4b8131c49 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c @@ -595,8 +595,6 @@ static int vidioc_enum_framesizes(struct file *file, vo= id *priv, fsize->type =3D V4L2_FRMSIZE_TYPE_STEPWISE; fsize->stepwise =3D dec_pdata->vdec_framesizes[i].stepwise; =20 - fsize->stepwise.max_width =3D ctx->max_width; - fsize->stepwise.max_height =3D ctx->max_height; mtk_v4l2_debug(1, "%x, %d %d %d %d %d %d", ctx->dev->dec_capability, fsize->stepwise.min_width, diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateles= s.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c index f1c0276c9026..5da9901e93a3 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c @@ -360,6 +360,13 @@ static void mtk_vcodec_add_formats(unsigned int fourcc, =20 mtk_vdec_framesizes[count_framesizes].fourcc =3D fourcc; mtk_vdec_framesizes[count_framesizes].stepwise =3D stepwise_fhd; + if (!(ctx->dev->dec_capability & VCODEC_CAPABILITY_4K_DISABLED) && + fourcc !=3D V4L2_PIX_FMT_VP8_FRAME) { + mtk_vdec_framesizes[count_framesizes].stepwise.max_width =3D + VCODEC_DEC_4K_CODED_WIDTH; + mtk_vdec_framesizes[count_framesizes].stepwise.max_height =3D + VCODEC_DEC_4K_CODED_HEIGHT; + } num_framesizes++; break; case V4L2_PIX_FMT_MM21: --=20 2.37.0.rc0.161.g10f37bed90-goog From nobody Sat Sep 21 22:47:46 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9AF48C43334 for ; Wed, 6 Jul 2022 08:22:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231725AbiGFIWc (ORCPT ); Wed, 6 Jul 2022 04:22:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231161AbiGFIWG (ORCPT ); Wed, 6 Jul 2022 04:22:06 -0400 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03100237FA for ; Wed, 6 Jul 2022 01:22:05 -0700 (PDT) Received: by mail-pl1-x62f.google.com with SMTP id y18so5043556plb.2 for ; Wed, 06 Jul 2022 01:22:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tF4dHXue6VAthDO8rjRCUAqbIs0qxhJRHcU9wI4358E=; b=ZrQU0PrLMmbvxDBU2iEokT3gZ1VJwzUYnGZoo1MKx6gO6KZtoRwqLz13RzQGoaCh89 W11Q1Q9Pp2QciYnlTxHqQj2PlHWSJpQ8fmCDVwQ2FuH6/lcS8tkrwOUVK4yRim08o/tG FKuXDrZ0u3emEEGWUDGE32QQB1ALVrI2O7nWY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tF4dHXue6VAthDO8rjRCUAqbIs0qxhJRHcU9wI4358E=; b=CIqBPoqQFD9ZIofVdcctrZo0NJ/xeXIYJx/pG9Bf8+aUr5Z+bQMcaaMO/Yxs7SvDBY owrZc6rCSRYECvS75BpwOR21aePwsj2dHx7fyMn2hQATNsAuPTPVLmm/jSut4v98Bd7g +BGBBP/f9FsJGK+FiWWj9BoYSJpo6FmMH54ZAoOPP5xiLvh+N/AKu/rvcFbEJTyBnHNK c4oeMCim4bnWziyHKiMTP4IYoftUo44tCvttYuEYCzrZxmXaICr6n/Xi/VteeAArVBcS Ygs+wJwGxcPdSgFLDsUQZ9+mM0c7iNbe96EHKyRI5TmAUkzeQmeegoPLwMhb4CDk36wG kPSQ== X-Gm-Message-State: AJIora8fzCQrk33lFU/1MBXPo+faUJ3V+9ikqVDuByfKpLoRRK7E1lKi HhIR4f5sub2R0JS8C3n/MRBi/g== X-Google-Smtp-Source: AGRyM1vXb+lAKa3a12GtkthhfA4R8Yn7YU0ba2/ue2KUfpCm0R7dPGik1fSM9nymwNvDSjjdrtoP8A== X-Received: by 2002:a17:902:cccf:b0:168:c4c3:e8ca with SMTP id z15-20020a170902cccf00b00168c4c3e8camr48217740ple.40.1657095724545; Wed, 06 Jul 2022 01:22:04 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:74a3:a7a4:af57:d7f]) by smtp.gmail.com with ESMTPSA id rm1-20020a17090b3ec100b001ed27d132c1sm20767040pjb.2.2022.07.06.01.22.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 01:22:04 -0700 (PDT) From: Chen-Yu Tsai To: Tiffany Lin , Andrew-CT Chen , Yunfei Dong , Mauro Carvalho Chehab , Hans Verkuil Cc: Chen-Yu Tsai , linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Nicolas Dufresne , AngeloGioacchino Del Regno , Nicolas Dufresne Subject: [PATCH v2 3/6] media: mediatek: vcodec: decoder: Skip alignment for default resolution Date: Wed, 6 Jul 2022 16:21:35 +0800 Message-Id: <20220706082138.2668163-4-wenst@chromium.org> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog In-Reply-To: <20220706082138.2668163-1-wenst@chromium.org> References: <20220706082138.2668163-1-wenst@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The default resolution of 64x64 is already aligned, according to the call to v4l_bound_align_image() in mtk_vcodec_dec_set_default_params(). Drop the redundant v4l_bound_align_image() call. This also removes one usage of ctx->max_{width,height}. Signed-off-by: Chen-Yu Tsai Tested-by: AngeloGioacchino Del Regno --- drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c b/driv= ers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c index fcb4b8131c49..4a64877bcd8f 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c @@ -180,13 +180,6 @@ void mtk_vcodec_dec_set_default_params(struct mtk_vcod= ec_ctx *ctx) ctx->max_width =3D MTK_VDEC_MAX_W; ctx->max_height =3D MTK_VDEC_MAX_H; =20 - v4l_bound_align_image(&q_data->coded_width, - MTK_VDEC_MIN_W, - ctx->max_width, 4, - &q_data->coded_height, - MTK_VDEC_MIN_H, - ctx->max_height, 5, 6); - q_data->sizeimage[0] =3D q_data->coded_width * q_data->coded_height; q_data->bytesperline[0] =3D q_data->coded_width; q_data->sizeimage[1] =3D q_data->sizeimage[0] / 2; --=20 2.37.0.rc0.161.g10f37bed90-goog From nobody Sat Sep 21 22:47:46 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95B5BCCA47C for ; Wed, 6 Jul 2022 08:22:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231656AbiGFIW2 (ORCPT ); Wed, 6 Jul 2022 04:22:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231644AbiGFIWM (ORCPT ); Wed, 6 Jul 2022 04:22:12 -0400 Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B8DE23BE4 for ; Wed, 6 Jul 2022 01:22:07 -0700 (PDT) Received: by mail-pg1-x536.google.com with SMTP id o18so12263507pgu.9 for ; Wed, 06 Jul 2022 01:22:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GvRRDYqEkMGUNjOmIJGO6n6V02vc9/KKxf+1pjh9Zs8=; b=mMNHROOZvx/4+XvWmilhnTi0zkXfcba1Cb96RUkWD+EOI3g5HwO8zv8RCVWas0rI4e pnSTPuUxcDYyuyAMu8fstIKi6V+HabyrvPeP5HRhU8On4vyKryKb0Rbbj9yrZnuPBwdn 4s57NqnP97/im14QDQ/ZxUpriE3z+gc9StARA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GvRRDYqEkMGUNjOmIJGO6n6V02vc9/KKxf+1pjh9Zs8=; b=KF+OGHeuf6JT+uuVuSiBFNPTFI9wKF77J/8wvb5aDSaDt2faTlm4gCgdnqUArUWXaN JtByYb8CHsVtFUiHMhekMCZQLG1oVWZiFc0W5xT6kgclaHqyfg30D9Ibdfg78nHpDJ+b /pY466NFcJ0CO82IiqiGdbUIw6HljTb4Jzl8orMb7FYRIqOYyhNctO8/5pV4j5NhxL6M ejnO9zxzSYHEIsEI/fPQYtl7Gx0clqWnlsix3/6Z/CwV7wMCxMqfTmvq7/sUrgbhWubU 7jt1+1zo7HNxikQLL9go3olg+g4jQJiM0DGSYYVoCODg2cA3akFa/lkQScypk0mcqC7d qtxA== X-Gm-Message-State: AJIora8PYmEQQ7KHe1uK6Rvnut1tEtInNEOKSt5z/kBbfOyhGM/qkdVS aTHqZK+s5Jddoz+lzK2+Kn5E6A== X-Google-Smtp-Source: AGRyM1vNdPQJg7xronj1vBrOljaWiZtr91rqWTVN0G7OMmVPrmO+T5ZPNpjfodcW+lSrp+a6pTNHjA== X-Received: by 2002:a62:1508:0:b0:528:be70:2f69 with SMTP id 8-20020a621508000000b00528be702f69mr1173866pfv.42.1657095726798; Wed, 06 Jul 2022 01:22:06 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:74a3:a7a4:af57:d7f]) by smtp.gmail.com with ESMTPSA id rm1-20020a17090b3ec100b001ed27d132c1sm20767040pjb.2.2022.07.06.01.22.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 01:22:06 -0700 (PDT) From: Chen-Yu Tsai To: Tiffany Lin , Andrew-CT Chen , Yunfei Dong , Mauro Carvalho Chehab , Hans Verkuil Cc: Chen-Yu Tsai , linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Nicolas Dufresne , AngeloGioacchino Del Regno , Nicolas Dufresne Subject: [PATCH v2 4/6] media: mediatek: vcodec: decoder: Fix resolution clamping in TRY_FMT Date: Wed, 6 Jul 2022 16:21:36 +0800 Message-Id: <20220706082138.2668163-5-wenst@chromium.org> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog In-Reply-To: <20220706082138.2668163-1-wenst@chromium.org> References: <20220706082138.2668163-1-wenst@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In commit b018be06f3c7 ("media: mediatek: vcodec: Read max resolution from dec_capability"), TRY_FMT clamps the resolution to the maximum that was previously set either by default 1080p or the limit set by a previous S_FMT call. This does not make sense when doing TRY_FMT for the output side, which may have different capabilities. Instead, for the output side, find the maximum resolution based on the pixel format requested. For the capture side, find the maximum resolution based on the currently set output format. The maximum resolution is found from the list of per-format frame sizes, so the patch "media: mediatek: vcodec: dec: Fix 4K frame size enumeration" is needed. Fixes: b018be06f3c7 ("media: mediatek: vcodec: Read max resolution from dec= _capability") Signed-off-by: Chen-Yu Tsai Tested-by: AngeloGioacchino Del Regno --- .../platform/mediatek/vcodec/mtk_vcodec_dec.c | 48 ++++++++++++++----- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c b/driv= ers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c index 4a64877bcd8f..cdd07fa612ee 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c @@ -263,17 +263,44 @@ static int vidioc_vdec_subscribe_evt(struct v4l2_fh *= fh, } } =20 +static const struct v4l2_frmsize_stepwise *mtk_vdec_get_frmsize(struct mtk= _vcodec_ctx *ctx, + u32 pixfmt) +{ + const struct mtk_vcodec_dec_pdata *dec_pdata =3D ctx->dev->vdec_pdata; + int i; + + for (i =3D 0; i < *dec_pdata->num_framesizes; ++i) + if (pixfmt =3D=3D dec_pdata->vdec_framesizes[i].fourcc) + return &dec_pdata->vdec_framesizes[i].stepwise; + + /* + * This should never happen since vidioc_try_fmt_vid_out_mplane() + * always passes through a valid format for the output side, and + * for the capture side, a valid output format should already have + * been set. + */ + WARN_ONCE(1, "Unsupported format requested.\n"); + return &dec_pdata->vdec_framesizes[0].stepwise; +} + static int vidioc_try_fmt(struct mtk_vcodec_ctx *ctx, struct v4l2_format *= f, const struct mtk_video_fmt *fmt) { struct v4l2_pix_format_mplane *pix_fmt_mp =3D &f->fmt.pix_mp; + const struct v4l2_frmsize_stepwise *frmsize; + u32 fourcc; =20 pix_fmt_mp->field =3D V4L2_FIELD_NONE; =20 - pix_fmt_mp->width =3D - clamp(pix_fmt_mp->width, MTK_VDEC_MIN_W, ctx->max_width); - pix_fmt_mp->height =3D - clamp(pix_fmt_mp->height, MTK_VDEC_MIN_H, ctx->max_height); + /* Always apply frame size constraints from the coded side */ + if (V4L2_TYPE_IS_OUTPUT(f->type)) + fourcc =3D f->fmt.pix_mp.pixelformat; + else + fourcc =3D ctx->q_data[MTK_Q_DATA_SRC].fmt->fourcc; + + frmsize =3D mtk_vdec_get_frmsize(ctx, fourcc); + pix_fmt_mp->width =3D clamp(pix_fmt_mp->width, MTK_VDEC_MIN_W, frmsize->m= ax_width); + pix_fmt_mp->height =3D clamp(pix_fmt_mp->height, MTK_VDEC_MIN_H, frmsize-= >max_height); =20 if (f->type =3D=3D V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { pix_fmt_mp->num_planes =3D 1; @@ -289,18 +316,15 @@ static int vidioc_try_fmt(struct mtk_vcodec_ctx *ctx,= struct v4l2_format *f, */ tmp_w =3D pix_fmt_mp->width; tmp_h =3D pix_fmt_mp->height; - v4l_bound_align_image(&pix_fmt_mp->width, - MTK_VDEC_MIN_W, - ctx->max_width, 6, - &pix_fmt_mp->height, - MTK_VDEC_MIN_H, - ctx->max_height, 6, 9); + v4l_bound_align_image(&pix_fmt_mp->width, MTK_VDEC_MIN_W, frmsize->max_w= idth, 6, + &pix_fmt_mp->height, MTK_VDEC_MIN_H, frmsize->max_height, 6, + 9); =20 if (pix_fmt_mp->width < tmp_w && - (pix_fmt_mp->width + 64) <=3D ctx->max_width) + (pix_fmt_mp->width + 64) <=3D frmsize->max_width) pix_fmt_mp->width +=3D 64; if (pix_fmt_mp->height < tmp_h && - (pix_fmt_mp->height + 64) <=3D ctx->max_height) + (pix_fmt_mp->height + 64) <=3D frmsize->max_height) pix_fmt_mp->height +=3D 64; =20 mtk_v4l2_debug(0, --=20 2.37.0.rc0.161.g10f37bed90-goog From nobody Sat Sep 21 22:47:46 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E511C433EF for ; Wed, 6 Jul 2022 08:22:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231882AbiGFIWl (ORCPT ); Wed, 6 Jul 2022 04:22:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231670AbiGFIWN (ORCPT ); Wed, 6 Jul 2022 04:22:13 -0400 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE98D23BEF for ; Wed, 6 Jul 2022 01:22:09 -0700 (PDT) Received: by mail-pj1-x1032.google.com with SMTP id v4-20020a17090abb8400b001ef966652a3so5136348pjr.4 for ; Wed, 06 Jul 2022 01:22:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EDZsBKJCrPvrRed10JTTLn5RY5HzOJYgNfc59ZsTy1o=; b=BG33RCKbSZjiCGlqGQwuXJB4QMtQuJ7poldXwAhU5R2EBuTZJsWxFs/9j0HX0ebrrE Musc2wXQ/Faa2gc25JxI+ZQNzyi27DPVm/JxnTfKz9VAhLczwQxc2pOmWo6i586+H3XX +sA9CCVEEmJu4mdI272CRC6MAu8UH9CzMtcao= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EDZsBKJCrPvrRed10JTTLn5RY5HzOJYgNfc59ZsTy1o=; b=EfZAcmJC+oYJ57Ryj5VwzuFfUV1v/2gFkSIVvb8LBX701iXUQczKWdvRg+pYWd9Jbs ThHJanVYytrtlr9EbVRh6bcGWfSj5JZD/IIMwfHG+Ojuh8NpkKUnF6BNirY2kR7F3YRb vidPJaFLUbgo3TSjB3j4PP/K4f4dETcm90ct5F1oSMqPYRMz2CzTSBfasYkbfFPUQ2rb fIWB1yNUKncxzD6TBJc4iw+qniJWV0OzTySv/EyFhGQAg5BdJ9Tkv9yDLBIOOQ89dJX+ OkIL5PbnB6n2xJ5EThzcjOB86tiFPZfSs5uqpYz/xndGkmNGYKEzKtUZ1mp5AaLqHxEf 8p7Q== X-Gm-Message-State: AJIora+5o2OK4BOgOb7pRIG1tr+gVzJlb0PixD3qKpZbTmbtkxHvd8LX kAFbBDBmZvi88pZGC9pa0IWqOQ== X-Google-Smtp-Source: AGRyM1u8CxD0ORsdxHN8AhIq+XV1uXWF78ZIBZA3x9laIWEkb3wQRviHyBH0bTlGFY6NfylpUhWjiw== X-Received: by 2002:a17:902:ab1b:b0:16b:e155:f32c with SMTP id ik27-20020a170902ab1b00b0016be155f32cmr17034027plb.104.1657095729035; Wed, 06 Jul 2022 01:22:09 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:74a3:a7a4:af57:d7f]) by smtp.gmail.com with ESMTPSA id rm1-20020a17090b3ec100b001ed27d132c1sm20767040pjb.2.2022.07.06.01.22.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 01:22:08 -0700 (PDT) From: Chen-Yu Tsai To: Tiffany Lin , Andrew-CT Chen , Yunfei Dong , Mauro Carvalho Chehab , Hans Verkuil Cc: Chen-Yu Tsai , linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Nicolas Dufresne , AngeloGioacchino Del Regno , Nicolas Dufresne Subject: [PATCH v2 5/6] media: mediatek: vcodec: decoder: Drop max_{width,height} from mtk_vcodec_ctx Date: Wed, 6 Jul 2022 16:21:37 +0800 Message-Id: <20220706082138.2668163-6-wenst@chromium.org> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog In-Reply-To: <20220706082138.2668163-1-wenst@chromium.org> References: <20220706082138.2668163-1-wenst@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This partially reverts commit b018be06f3c7 ("media: mediatek: vcodec: Read max resolution from dec_capability"). After the previous patches: - media: mediatek: vcodec: decoder: Fix 4K frame size enumeration - media: mediatek: vcodec: decoder: Skip alignment for default resolution - media: mediatek: vcodec: decoder: Fix resolution clamping in TRY_FMT the max_{width,height} fields in |struct mtk_vcodec_ctx| no longer have any real users. Remove them. Fixes: b018be06f3c7 ("media: mediatek: vcodec: Read max resolution from dec= _capability") Signed-off-by: Chen-Yu Tsai Tested-by: AngeloGioacchino Del Regno --- drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c | 9 --------- drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h | 4 ---- 2 files changed, 13 deletions(-) diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c b/driv= ers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c index cdd07fa612ee..2d370e8041c1 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c @@ -177,8 +177,6 @@ void mtk_vcodec_dec_set_default_params(struct mtk_vcode= c_ctx *ctx) q_data->coded_height =3D DFT_CFG_HEIGHT; q_data->fmt =3D ctx->dev->vdec_pdata->default_cap_fmt; q_data->field =3D V4L2_FIELD_NONE; - ctx->max_width =3D MTK_VDEC_MAX_W; - ctx->max_height =3D MTK_VDEC_MAX_H; =20 q_data->sizeimage[0] =3D q_data->coded_width * q_data->coded_height; q_data->bytesperline[0] =3D q_data->coded_width; @@ -514,13 +512,6 @@ static int vidioc_vdec_s_fmt(struct file *file, void *= priv, if (fmt =3D=3D NULL) return -EINVAL; =20 - if (!(ctx->dev->dec_capability & VCODEC_CAPABILITY_4K_DISABLED) && - fmt->fourcc !=3D V4L2_PIX_FMT_VP8_FRAME) { - mtk_v4l2_debug(3, "4K is enabled"); - ctx->max_width =3D VCODEC_DEC_4K_CODED_WIDTH; - ctx->max_height =3D VCODEC_DEC_4K_CODED_HEIGHT; - } - q_data->fmt =3D fmt; vidioc_try_fmt(ctx, f, q_data->fmt); if (f->type =3D=3D V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) { diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h b/driv= ers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h index 4140b4dd85bf..4f15f5f60e40 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h @@ -286,8 +286,6 @@ struct vdec_pic_info { * mtk_video_dec_buf. * @hw_id: hardware index used to identify different hardware. * - * @max_width: hardware supported max width - * @max_height: hardware supported max height * @msg_queue: msg queue used to store lat buffer information. */ struct mtk_vcodec_ctx { @@ -334,8 +332,6 @@ struct mtk_vcodec_ctx { struct mutex lock; int hw_id; =20 - unsigned int max_width; - unsigned int max_height; struct vdec_msg_queue msg_queue; }; =20 --=20 2.37.0.rc0.161.g10f37bed90-goog From nobody Sat Sep 21 22:47:46 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53AF4C43334 for ; Wed, 6 Jul 2022 08:22:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231689AbiGFIWg (ORCPT ); Wed, 6 Jul 2022 04:22:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231758AbiGFIWQ (ORCPT ); Wed, 6 Jul 2022 04:22:16 -0400 Received: from mail-pg1-x529.google.com (mail-pg1-x529.google.com [IPv6:2607:f8b0:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0951A24088 for ; Wed, 6 Jul 2022 01:22:12 -0700 (PDT) Received: by mail-pg1-x529.google.com with SMTP id j184so2802377pge.10 for ; Wed, 06 Jul 2022 01:22:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tzsTUPer+0o5JrSvbM00/ftmdSn3qVjH8yi2nWJbM/w=; b=mqSndZ96uiMn4f1N/DcFpXyIdIuKuFdag/D803aO8dhJJ0Z+hvsSZr3/qyuDyIADlS OR2yPiQveew7sSh+e3802h+bxPReta3hMAeAQg1qGktG/IZU8HqJTaKQHNm3H9J+vBCq S9YtfNZnFtpk+nwoqmCOzdoa0RTnRWps5CH5U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tzsTUPer+0o5JrSvbM00/ftmdSn3qVjH8yi2nWJbM/w=; b=1ZHJNYVSE66A3rEOxvC60rJkZudSARk3BoJA99IWkByQZypQgCRs3SlADxODPdZuWy CqGRV/0byXEJye4GaXIVDeCdQHgxMX8AyFhEuT2yAQAHfz/qGWc5xKzgrlY6H5oqABte 0RC6UnOUMdtGZVjNhNm6ofb9tafz/waE9gWVl5TZ5pGcvgAXgCJB0HMUE+bkBFGCDrA9 YmFpk8cdjceWoMosLEiB0y85WcNean/7ya51Gb7emXrXNN+N5Npzz5kl/oJx/j7hkMFS +X9hwgw6+6ApFOon2lGWyVYtnSpCepChHSBWv3oUkRYN1QM3zn3IzREM/WBeambjZb0k DnjA== X-Gm-Message-State: AJIora9hHKsxkqO/5FUjMMfuM0nhzikTw9v3HAkz6VMtqUXOGOSj63Xd IFXlnat+wxepMgfoPkoa8UP6kQ== X-Google-Smtp-Source: AGRyM1sRhzOvdaaPebWzk1B4vMT9IkVr/4sM8+UOGncrYbbYX28ekEMRt8Hkp9ZCb9eRECdSOpMZVg== X-Received: by 2002:a65:6048:0:b0:412:73c7:cca9 with SMTP id a8-20020a656048000000b0041273c7cca9mr6240152pgp.257.1657095731316; Wed, 06 Jul 2022 01:22:11 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:74a3:a7a4:af57:d7f]) by smtp.gmail.com with ESMTPSA id rm1-20020a17090b3ec100b001ed27d132c1sm20767040pjb.2.2022.07.06.01.22.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 01:22:11 -0700 (PDT) From: Chen-Yu Tsai To: Tiffany Lin , Andrew-CT Chen , Yunfei Dong , Mauro Carvalho Chehab , Hans Verkuil Cc: Chen-Yu Tsai , linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Nicolas Dufresne , AngeloGioacchino Del Regno , Nicolas Dufresne Subject: [PATCH v2 6/6] media: mediatek: vcodec: decoder: Embed framesize inside mtk_video_fmt Date: Wed, 6 Jul 2022 16:21:38 +0800 Message-Id: <20220706082138.2668163-7-wenst@chromium.org> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog In-Reply-To: <20220706082138.2668163-1-wenst@chromium.org> References: <20220706082138.2668163-1-wenst@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Right now the decoder maintains two separate lists for supported pixel formats and frame sizes. Getting the supported frame sizes for the current set format is a bit convoluted, requiring a search through the separate frame size list. The frame sizes are used to clamp and align requested resolutions. Instead, the frame size structure could be embedded inside the pixel format structure. Getting one also gets the other. And since the the driver already keeps pointers to the current set format, getting the frame sizes becomes straightforward. Do just that. Move v4l2_frmsize_stepwise inside mtk_video_fmt, and get rid of mtk_codec_framesizes. Signed-off-by: Chen-Yu Tsai Tested-by: AngeloGioacchino Del Regno --- .../platform/mediatek/vcodec/mtk_vcodec_dec.c | 36 +++++-------------- .../mediatek/vcodec/mtk_vcodec_dec_stateful.c | 29 ++++----------- .../vcodec/mtk_vcodec_dec_stateless.c | 23 ++++-------- .../platform/mediatek/vcodec/mtk_vcodec_drv.h | 16 +-------- 4 files changed, 22 insertions(+), 82 deletions(-) diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c b/driv= ers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c index 2d370e8041c1..bdcddeaa997c 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec.c @@ -261,42 +261,20 @@ static int vidioc_vdec_subscribe_evt(struct v4l2_fh *= fh, } } =20 -static const struct v4l2_frmsize_stepwise *mtk_vdec_get_frmsize(struct mtk= _vcodec_ctx *ctx, - u32 pixfmt) -{ - const struct mtk_vcodec_dec_pdata *dec_pdata =3D ctx->dev->vdec_pdata; - int i; - - for (i =3D 0; i < *dec_pdata->num_framesizes; ++i) - if (pixfmt =3D=3D dec_pdata->vdec_framesizes[i].fourcc) - return &dec_pdata->vdec_framesizes[i].stepwise; - - /* - * This should never happen since vidioc_try_fmt_vid_out_mplane() - * always passes through a valid format for the output side, and - * for the capture side, a valid output format should already have - * been set. - */ - WARN_ONCE(1, "Unsupported format requested.\n"); - return &dec_pdata->vdec_framesizes[0].stepwise; -} - static int vidioc_try_fmt(struct mtk_vcodec_ctx *ctx, struct v4l2_format *= f, const struct mtk_video_fmt *fmt) { struct v4l2_pix_format_mplane *pix_fmt_mp =3D &f->fmt.pix_mp; const struct v4l2_frmsize_stepwise *frmsize; - u32 fourcc; =20 pix_fmt_mp->field =3D V4L2_FIELD_NONE; =20 /* Always apply frame size constraints from the coded side */ if (V4L2_TYPE_IS_OUTPUT(f->type)) - fourcc =3D f->fmt.pix_mp.pixelformat; + frmsize =3D &fmt->frmsize; else - fourcc =3D ctx->q_data[MTK_Q_DATA_SRC].fmt->fourcc; + frmsize =3D &ctx->q_data[MTK_Q_DATA_SRC].fmt->frmsize; =20 - frmsize =3D mtk_vdec_get_frmsize(ctx, fourcc); pix_fmt_mp->width =3D clamp(pix_fmt_mp->width, MTK_VDEC_MIN_W, frmsize->m= ax_width); pix_fmt_mp->height =3D clamp(pix_fmt_mp->height, MTK_VDEC_MIN_H, frmsize-= >max_height); =20 @@ -596,12 +574,16 @@ static int vidioc_enum_framesizes(struct file *file, = void *priv, if (fsize->index !=3D 0) return -EINVAL; =20 - for (i =3D 0; i < *dec_pdata->num_framesizes; ++i) { - if (fsize->pixel_format !=3D dec_pdata->vdec_framesizes[i].fourcc) + for (i =3D 0; i < *dec_pdata->num_formats; i++) { + if (fsize->pixel_format !=3D dec_pdata->vdec_formats[i].fourcc) continue; =20 + /* Only coded formats have frame sizes set */ + if (!dec_pdata->vdec_formats[i].frmsize.max_width) + return -ENOTTY; + fsize->type =3D V4L2_FRMSIZE_TYPE_STEPWISE; - fsize->stepwise =3D dec_pdata->vdec_framesizes[i].stepwise; + fsize->stepwise =3D dec_pdata->vdec_formats[i].frmsize; =20 mtk_v4l2_debug(1, "%x, %d %d %d %d %d %d", ctx->dev->dec_capability, diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful= .c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c index 9c7e6145cebb..035c86e7809f 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateful.c @@ -17,18 +17,24 @@ static const struct mtk_video_fmt mtk_video_formats[] = =3D { .type =3D MTK_FMT_DEC, .num_planes =3D 1, .flags =3D V4L2_FMT_FLAG_DYN_RESOLUTION, + .frmsize =3D { MTK_VDEC_MIN_W, MTK_VDEC_MAX_W, 16, + MTK_VDEC_MIN_H, MTK_VDEC_MAX_H, 16 }, }, { .fourcc =3D V4L2_PIX_FMT_VP8, .type =3D MTK_FMT_DEC, .num_planes =3D 1, .flags =3D V4L2_FMT_FLAG_DYN_RESOLUTION, + .frmsize =3D { MTK_VDEC_MIN_W, MTK_VDEC_MAX_W, 16, + MTK_VDEC_MIN_H, MTK_VDEC_MAX_H, 16 }, }, { .fourcc =3D V4L2_PIX_FMT_VP9, .type =3D MTK_FMT_DEC, .num_planes =3D 1, .flags =3D V4L2_FMT_FLAG_DYN_RESOLUTION, + .frmsize =3D { MTK_VDEC_MIN_W, MTK_VDEC_MAX_W, 16, + MTK_VDEC_MIN_H, MTK_VDEC_MAX_H, 16 }, }, { .fourcc =3D V4L2_PIX_FMT_MT21C, @@ -43,27 +49,6 @@ static const unsigned int num_supported_formats =3D #define DEFAULT_OUT_FMT_IDX 0 #define DEFAULT_CAP_FMT_IDX 3 =20 -static const struct mtk_codec_framesizes mtk_vdec_framesizes[] =3D { - { - .fourcc =3D V4L2_PIX_FMT_H264, - .stepwise =3D { MTK_VDEC_MIN_W, MTK_VDEC_MAX_W, 16, - MTK_VDEC_MIN_H, MTK_VDEC_MAX_H, 16 }, - }, - { - .fourcc =3D V4L2_PIX_FMT_VP8, - .stepwise =3D { MTK_VDEC_MIN_W, MTK_VDEC_MAX_W, 16, - MTK_VDEC_MIN_H, MTK_VDEC_MAX_H, 16 }, - }, - { - .fourcc =3D V4L2_PIX_FMT_VP9, - .stepwise =3D { MTK_VDEC_MIN_W, MTK_VDEC_MAX_W, 16, - MTK_VDEC_MIN_H, MTK_VDEC_MAX_H, 16 }, - }, -}; - -static const unsigned int num_supported_framesize =3D - ARRAY_SIZE(mtk_vdec_framesizes); - /* * This function tries to clean all display buffers, the buffers will retu= rn * in display order. @@ -618,8 +603,6 @@ const struct mtk_vcodec_dec_pdata mtk_vdec_8173_pdata = =3D { .num_formats =3D &num_supported_formats, .default_out_fmt =3D &mtk_video_formats[DEFAULT_OUT_FMT_IDX], .default_cap_fmt =3D &mtk_video_formats[DEFAULT_CAP_FMT_IDX], - .vdec_framesizes =3D mtk_vdec_framesizes, - .num_framesizes =3D &num_supported_framesize, .worker =3D mtk_vdec_worker, .flush_decoder =3D mtk_vdec_flush_decoder, .is_subdev_supported =3D false, diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateles= s.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c index 5da9901e93a3..c45bd2599bb2 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dec_stateless.c @@ -112,12 +112,10 @@ static const struct mtk_stateless_control mtk_statele= ss_controls[] =3D { #define NUM_CTRLS ARRAY_SIZE(mtk_stateless_controls) =20 static struct mtk_video_fmt mtk_video_formats[5]; -static struct mtk_codec_framesizes mtk_vdec_framesizes[3]; =20 static struct mtk_video_fmt default_out_format; static struct mtk_video_fmt default_cap_format; static unsigned int num_formats; -static unsigned int num_framesizes; =20 static const struct v4l2_frmsize_stepwise stepwise_fhd =3D { .min_width =3D MTK_VDEC_MIN_W, @@ -348,7 +346,6 @@ static void mtk_vcodec_add_formats(unsigned int fourcc, struct mtk_vcodec_dev *dev =3D ctx->dev; const struct mtk_vcodec_dec_pdata *pdata =3D dev->vdec_pdata; int count_formats =3D *pdata->num_formats; - int count_framesizes =3D *pdata->num_framesizes; =20 switch (fourcc) { case V4L2_PIX_FMT_H264_SLICE: @@ -357,17 +354,15 @@ static void mtk_vcodec_add_formats(unsigned int fourc= c, mtk_video_formats[count_formats].fourcc =3D fourcc; mtk_video_formats[count_formats].type =3D MTK_FMT_DEC; mtk_video_formats[count_formats].num_planes =3D 1; + mtk_video_formats[count_formats].frmsize =3D stepwise_fhd; =20 - mtk_vdec_framesizes[count_framesizes].fourcc =3D fourcc; - mtk_vdec_framesizes[count_framesizes].stepwise =3D stepwise_fhd; if (!(ctx->dev->dec_capability & VCODEC_CAPABILITY_4K_DISABLED) && fourcc !=3D V4L2_PIX_FMT_VP8_FRAME) { - mtk_vdec_framesizes[count_framesizes].stepwise.max_width =3D + mtk_video_formats[count_formats].frmsize.max_width =3D VCODEC_DEC_4K_CODED_WIDTH; - mtk_vdec_framesizes[count_framesizes].stepwise.max_height =3D + mtk_video_formats[count_formats].frmsize.max_height =3D VCODEC_DEC_4K_CODED_HEIGHT; } - num_framesizes++; break; case V4L2_PIX_FMT_MM21: case V4L2_PIX_FMT_MT21C: @@ -381,15 +376,15 @@ static void mtk_vcodec_add_formats(unsigned int fourc= c, } =20 num_formats++; - mtk_v4l2_debug(3, "num_formats: %d num_frames:%d dec_capability: 0x%x", - count_formats, count_framesizes, ctx->dev->dec_capability); + mtk_v4l2_debug(3, "num_formats: %d dec_capability: 0x%x", + count_formats, ctx->dev->dec_capability); } =20 static void mtk_vcodec_get_supported_formats(struct mtk_vcodec_ctx *ctx) { int cap_format_count =3D 0, out_format_count =3D 0; =20 - if (num_formats && num_framesizes) + if (num_formats) return; =20 if (ctx->dev->dec_capability & MTK_VDEC_FORMAT_MM21) { @@ -468,8 +463,6 @@ const struct mtk_vcodec_dec_pdata mtk_vdec_8183_pdata = =3D { .num_formats =3D &num_formats, .default_out_fmt =3D &default_out_format, .default_cap_fmt =3D &default_cap_format, - .vdec_framesizes =3D mtk_vdec_framesizes, - .num_framesizes =3D &num_framesizes, .uses_stateless_api =3D true, .worker =3D mtk_vdec_worker, .flush_decoder =3D mtk_vdec_flush_decoder, @@ -488,8 +481,6 @@ const struct mtk_vcodec_dec_pdata mtk_lat_sig_core_pdat= a =3D { .num_formats =3D &num_formats, .default_out_fmt =3D &default_out_format, .default_cap_fmt =3D &default_cap_format, - .vdec_framesizes =3D mtk_vdec_framesizes, - .num_framesizes =3D &num_framesizes, .uses_stateless_api =3D true, .worker =3D mtk_vdec_worker, .flush_decoder =3D mtk_vdec_flush_decoder, @@ -507,8 +498,6 @@ const struct mtk_vcodec_dec_pdata mtk_vdec_single_core_= pdata =3D { .num_formats =3D &num_formats, .default_out_fmt =3D &default_out_format, .default_cap_fmt =3D &default_cap_format, - .vdec_framesizes =3D mtk_vdec_framesizes, - .num_framesizes =3D &num_framesizes, .uses_stateless_api =3D true, .worker =3D mtk_vdec_worker, .flush_decoder =3D mtk_vdec_flush_decoder, diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h b/driv= ers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h index 4f15f5f60e40..9c6ae78c346c 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h @@ -126,15 +126,7 @@ struct mtk_video_fmt { enum mtk_fmt_type type; u32 num_planes; u32 flags; -}; - -/* - * struct mtk_codec_framesizes - Structure used to store information about - * framesizes - */ -struct mtk_codec_framesizes { - u32 fourcc; - struct v4l2_frmsize_stepwise stepwise; + struct v4l2_frmsize_stepwise frmsize; }; =20 /* @@ -371,9 +363,6 @@ enum mtk_vdec_format_types { * @default_out_fmt: default output buffer format * @default_cap_fmt: default capture buffer format * - * @vdec_framesizes: supported video decoder frame sizes - * @num_framesizes: count of video decoder frame sizes - * * @hw_arch: hardware arch is used to separate pure_sin_core and lat_sin_c= ore * * @is_subdev_supported: whether support parent-node architecture(subdev) @@ -396,9 +385,6 @@ struct mtk_vcodec_dec_pdata { const struct mtk_video_fmt *default_out_fmt; const struct mtk_video_fmt *default_cap_fmt; =20 - const struct mtk_codec_framesizes *vdec_framesizes; - const int *num_framesizes; - enum mtk_vdec_hw_arch hw_arch; =20 bool is_subdev_supported; --=20 2.37.0.rc0.161.g10f37bed90-goog