From nobody Mon Jun 8 11:02:05 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DE6143E5ED7 for ; Fri, 29 May 2026 14:09:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780063777; cv=none; b=lgpGBdvaMBSFMoE4Uy9TcpB+1djqbm8FDE6a8YQRLlgeYpL/4DGU50q/7aaXk2j/w6z8fjcjGH3Cr2NyEySpWSE8zN6TVYDqhJWjNxiLeMp+Z2wZUQPH/kiGviSLSkgdAHFfgfeAf19Dx+OeC7yl3qdlZvfGlfw/oSRDbxzlPhI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780063777; c=relaxed/simple; bh=NuPUJapUqz3JREo1bH6C6ywL8UN7NzGYySYr7r6IGfc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=kYKfBu1M7FAuURanGrUC9yRBdfPl5ATzLNoSN+qqyO5qZAqZNaGusYWVpGU+I5a64qShBB+polvNL5SoEb0olc3/++g7wV1gg1WlE18auG9OcqbM/dEnFxARlvV+oT5QXMDnlrhPdFiSYDZRvDgc25nv6iHFBZ687QWKZ9KTTS0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=diMl44L8; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=EzBf/Iu0; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="diMl44L8"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="EzBf/Iu0" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64TDKpLX1202095 for ; Fri, 29 May 2026 14:09:30 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=qcppdkim1; bh=c4U/qD3jmzaxRy1VdQtVpb oJpungzw2My8BG7IMbxCY=; b=diMl44L8HrC89mIA+WBgJviq4VQf2l8gsg61UR z0ZvnoEbA3ifpD9ho5lRUlMKWxs8CoS3S8NSMYMzpNj5m5/xOgjTQ01BW/RDIlQM cM1tw0/d7l2h5844q0XJKUEHKvshE/xdAUe1TPAkAKTvsyXCNR9XPMevbnWTCpoq owwzGxrd82DLCLs42d2ZWcHw2yDLoTPeYzMtCHbQhC3kTy4MECZUgpvxqHLZKNKJ x4hBfbl61JjM6/Yxm7uS1QtpIYiZuNTvgXxK/dlnZFFeH+ikbe+WQI4Qh+88VilL pUp15f0NI85oBQHyzYAqQr/PkVCAMBwsDELEc2TWOCMDx10Q== Received: from mail-vk1-f198.google.com (mail-vk1-f198.google.com [209.85.221.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ef3te28mq-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 29 May 2026 14:09:29 +0000 (GMT) Received: by mail-vk1-f198.google.com with SMTP id 71dfb90a1353d-57525c1ed46so10018113e0c.2 for ; Fri, 29 May 2026 07:09:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1780063769; x=1780668569; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=c4U/qD3jmzaxRy1VdQtVpboJpungzw2My8BG7IMbxCY=; b=EzBf/Iu0FmCqkwJwv9qsDhFQNccqtx0Qj6D9tU1K3aTkltvCSi3A7LRd5FTGbSG+rw /xk6VXjQEXZhc8qxBhpnQvaPKISoPIuCx7Dg/5mruclIbnogIQAtVZWy0TUYkd7KNnQn Z5Ik1WcZYLWXxA9gyKWcfdorDEH066/MQlE5k9+I6nrry4JVFKw08sfyudk2h97Z0k9i HjKGWlhjj0bJSpdjwlYQA7lHVNZMtjUfaJMRLhRhR91zRSMIWynFTsc4qt1q+IJs3HS4 TXx1eQNRUtLGl3dlI/y8i4Y09ytOKr57NLTIC2vGDoOVW6r2cZfAwsxNd9KOotcghTj6 2m6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780063769; x=1780668569; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=c4U/qD3jmzaxRy1VdQtVpboJpungzw2My8BG7IMbxCY=; b=ElflZb3oYq98ZXK1ItWH4xBgpw82Jhxu11TtJbb+ouB32YcVfB9nOOph14INfqJGh4 ++2+gm7A6ZWR5dxZtWwl1zw6rBRWTD2ZgE7WYDoCiMOPlH44c0oblQG6bqu1IHIK7wcW ZgHQmQ598a69/jUfC8uL6Wo0ZBTFs3HjNJhio7j4FygHyz0wVeGLmzq4ZluTE+35PoaT vo+DzXbnwRoeC5tLujuriHbJKQkvEaUYbtJVBM4Dd6r/YWmnEWp53fCBlyqPs+6JKyes ZJCktOvAABB3/kr+U4l3/ESfMKZ7Gqj7m079tzisxx4F174NocfJXM05ljXpRnpBMKl4 Y0cw== X-Forwarded-Encrypted: i=1; AFNElJ/bqy2lmDdBxYQgNNBVBKuLWy5tx2hSwoSVr5wYLgcX9xD/4ZjAQSpnHEgVZft4NYPtZtf/PXPq1T8k4X0=@vger.kernel.org X-Gm-Message-State: AOJu0YxFhVHWWONQk2Ty+nK96WU/kBEMsmjCtDXlsTT+PyHA17w+QyN5 jmdOCSsgBiTowyQijrq6So/42kaPnTThu1uPkU8l18tRywa/W2XlUiDHh4YBdLkqNikrmiozZDQ nsZrDEIV3uYL3y8KQLRwPTkCfulB8L57mc7o5bLnqZpOA0gdaUgjM/VtKETeiCHRX8P+ahw3B+D z0gBIg X-Gm-Gg: Acq92OHHA3ftT59b65rou4jLlqmSArUDppg5weuAXsMmh7kxJTFiysDmcq49j1yUH7I KIAF6jEHqWc3BgEAE/AKynR5ppfXm1vJF1U5hCgwIDHTf55jzssPy/8Iy9SocJZLc8zvUH9k8vh ZauDYKlIudtdgh0shD4YzlNwYCJuT8mqouRIzDa+x7fW7c2ZrS5cpELa/2fvo6Z2UG6QbcfRFjv +q1zmTniPCYKxH5vGUcBuD6L6wRmb5oRtlIcj30ZI3jiwLY7Ym+2P6gnqCh/ehigYkW2zau/HlQ BtncTRYPk0J0I8mkXLInGR71QnHb40b+UwEshL56x9P7ZR63PLnFXkTrd6w3fjLZrvoFpAejjiN jVPU3MSB/5E2sTWDUMvpdXrdqHTNkZIiK/Qtgzno5apIvnKBgZS0KGF2g5qT7cbNhr4NipdKT40 QCb8FTPHNWac+rzaWxw8sgkdDJsP0GFo2vjfjw6deG0pYeAw== X-Received: by 2002:a05:6122:e18c:b0:56f:31e3:9445 with SMTP id 71dfb90a1353d-599eaa9a2c1mr1185375e0c.0.1780063768368; Fri, 29 May 2026 07:09:28 -0700 (PDT) X-Received: by 2002:a05:6122:e18c:b0:56f:31e3:9445 with SMTP id 71dfb90a1353d-599eaa9a2c1mr1185295e0c.0.1780063767772; Fri, 29 May 2026 07:09:27 -0700 (PDT) Received: from umbar.lan (2001-14ba-a073-af00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a073:af00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5aa5b78d848sm291663e87.67.2026.05.29.07.09.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2026 07:09:26 -0700 (PDT) From: Dmitry Baryshkov Date: Fri, 29 May 2026 17:09:23 +0300 Subject: [PATCH v6] media: iris: drop struct iris_fmt Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260529-iris-remote-fmts-v6-1-4aa3f004ab3d@oss.qualcomm.com> X-B4-Tracking: v=1; b=H4sIABKeGWoC/33RTW7DIBAF4KtYrEsKw49DVr1H1QXY4wapNglgK 1WUuxc7UuuF3Q3SQ8zHSO9OEkaPiZyqO4k4+eTDUIJ+qUhztsMnUt+WTICBZoJz6qNPNGIfMtK uz4kqIYRuwB2NZaSMXSJ2/raQ7x8ln33KIX4vP0x8vv0HmzjltEXGpJRKOH18CykdrqP9akLfH 8pBZnOCtSM2HCgOto7z2gjHjd5xxMoRbMMRxbGgrTNoGGd8x5F/jmL1hiOLU0NnDYLtwLAdR60 c2NpHzftIw5WsdcNq2HAezxIiXsdSZ342QZxNSOdHPp+qxR3wll8nHMZEf3OZfvwAI3nOFhQCA AA= X-Change-ID: 20260311-iris-remote-fmts-53336c2b89a0 To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=17288; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=NuPUJapUqz3JREo1bH6C6ywL8UN7NzGYySYr7r6IGfc=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqGZ4V5aVgg72YrK4MKEHlwDVxRTJHHr6jnBuG8 IfzREDMIT2JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCahmeFQAKCRCLPIo+Aiko 1SJaCACQHt2fyu9ql3c6lkoysnOGkKsWyjm1REPqRhRnvjNH/acwhjdcS73aPEf+NVZoqsi8YNB JPq8J9nq3lf2MQnij5b4nuBIupDkztm/c4CR9W3WeTc0en6fIR5CECH5saHPDxXWt/DT3mB8y5b nYdyfKZs8HItIPqiQrJy8m8bvbeFTrdAYdUtVxLUeNw6Ocx9UexmDo7z4+/6scCjjfPJ7QJ6Jy+ dsmZ5YiSv1l2cP6m/WbIda9EPTjYKbgcj/jEvxCoK+fgEOz97Ia759S0YdqO/uptqh6Xlj027v0 vWrhTja0/nJQ2/qMovRGwGZS8lEBuqRec8TriPuYTm4JwnUe X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: RbdZ1-nzjlD2qN6Oj9F3VqRx4dvyD7jP X-Proofpoint-GUID: RbdZ1-nzjlD2qN6Oj9F3VqRx4dvyD7jP X-Authority-Analysis: v=2.4 cv=daSwG3Xe c=1 sm=1 tr=0 ts=6a199e19 cx=c_pps a=1Os3MKEOqt8YzSjcPV0cFA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=bC-a23v3AAAA:8 a=EUspDBNiAAAA:8 a=VwQbUJbxAAAA:8 a=5MaIgx6z3_532Kf81nQA:9 a=QEXdDO2ut3YA:10 a=hhpmQAJR8DioWGSBphRh:22 a=FO4_E8m0qiDe52t0p3_H:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTI5MDE0MSBTYWx0ZWRfX0Hl5V/NiGL7K 606Z31uRSkMaCs9vT0cjVmA7biu0N+9DQAetpyzDF8T+DxHqloayKl+M6RQDIxJK/HgM5ktf88N 2EnpeI6TuK0Fh6hcEctRnYpc84qkSpeglZ1J/8hN6bP8Us0YP0way86PKakg4M6euFP2t7CWDid UuMIWyMHRY6qIL+E9amk5P2hVSW3vW8miCj07157xR9Eh7maT4Tv6Jy5+Wrb++1+6GbwSl6/KpU 47MucgkgNnvrUvpZGyz6c8bJu9rhGJsiaIzLxk0ed/8p0XVE2M95Z4l4Gxbz6JlDFlsVaNv+fK9 JUQ2Y4fZDANi2yFWNAfzBkKf6qM0n5c31hbhqV/NagxZxs0pDFqNMFTT6nmAnTGe4EDqqRDOoPa Oaeosq542xx9yXdlKMXpul39FcJcyEA8W/cC/5KLRHvDIrOn9Wkd78XX3G+2GhIStmYfOfZa1Ku kCMyICkstzMNap51AGA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-05-29_04,2026-05-28_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 bulkscore=0 priorityscore=1501 impostorscore=0 suspectscore=0 clxscore=1015 spamscore=0 phishscore=0 lowpriorityscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605210000 definitions=main-2605290141 The struct iris_fmt unites pixfmt with the plane type, however the type from the struct is not actually used. Drop the struct completely and use u32 pixfmt in all the callsites. Reviewed-by: Dikshita Agarwal Signed-off-by: Dmitry Baryshkov --- Changes in v6: - Another rebase, now on Bryan's -next tree, again - Link to v5: https://patch.msgid.link/20260520-iris-remote-fmts-v5-1-a4915= 476c072@oss.qualcomm.com Changes in v5: - Rebased on linux-next tree, dropping the dependencies. - Link to v4: https://patch.msgid.link/20260507-iris-remote-fmts-v4-1-72fa9= e2af290@oss.qualcomm.com Changes in v4: - Rebased on top of Bryan's -next tree, fixing the conflicts. - Link to v3: https://patch.msgid.link/20260330-iris-remote-fmts-v3-1-a26ab= 9e90101@oss.qualcomm.com Changes in v3: - Rebased on top of the 20260227-iris-platform-data-c5c80e84d1a7:v11 (Dikshita) - Link to v2: https://lore.kernel.org/r/20260313-iris-remote-fmts-v2-1-edb1= 1793b196@oss.qualcomm.com Changes in v2: - Made platform_fmts_sm8250_dec const (Dikshita) - Sorted entries in find_format_by_index (Dikshita) - Link to v1: https://lore.kernel.org/r/20260311-iris-remote-fmts-v1-1-de00= 44453b68@oss.qualcomm.com --- drivers/media/platform/qcom/iris/iris_instance.h | 5 - .../platform/qcom/iris/iris_platform_common.h | 2 +- .../media/platform/qcom/iris/iris_platform_vpu2.c | 17 +--- .../media/platform/qcom/iris/iris_platform_vpu3x.c | 22 +---- drivers/media/platform/qcom/iris/iris_vdec.c | 84 +++++++---------- drivers/media/platform/qcom/iris/iris_venc.c | 102 ++++++++---------= ---- 6 files changed, 80 insertions(+), 152 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_instance.h b/drivers/med= ia/platform/qcom/iris/iris_instance.h index 1d8a22ea4809..c54d8ec8562a 100644 --- a/drivers/media/platform/qcom/iris/iris_instance.h +++ b/drivers/media/platform/qcom/iris/iris_instance.h @@ -29,11 +29,6 @@ enum iris_fmt_type_cap { IRIS_FMT_QC08C, }; =20 -struct iris_fmt { - u32 pixfmt; - u32 type; -}; - /** * struct iris_inst - holds per video instance parameters * diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/driv= ers/media/platform/qcom/iris/iris_platform_common.h index 982767faa51c..6d69a1e3dcd3 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -311,7 +311,7 @@ struct iris_platform_data { const char * const *controller_rst_tbl; unsigned int controller_rst_tbl_size; u64 dma_mask; - struct iris_fmt *inst_iris_fmts; + const u32 *inst_iris_fmts; u32 inst_iris_fmts_size; struct platform_inst_caps *inst_caps; const struct tz_cp_config *tz_cp_config_data; diff --git a/drivers/media/platform/qcom/iris/iris_platform_vpu2.c b/driver= s/media/platform/qcom/iris/iris_platform_vpu2.c index 41986af8313b..6e06a32822bb 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_vpu2.c +++ b/drivers/media/platform/qcom/iris/iris_platform_vpu2.c @@ -28,19 +28,10 @@ static const struct iris_firmware_desc iris_vpu20_p4_ge= n1_desc =3D { .fwname =3D "qcom/vpu/vpu20_p4.mbn", }; =20 -static struct iris_fmt iris_fmts_vpu2_dec[] =3D { - [IRIS_FMT_H264] =3D { - .pixfmt =3D V4L2_PIX_FMT_H264, - .type =3D V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, - }, - [IRIS_FMT_HEVC] =3D { - .pixfmt =3D V4L2_PIX_FMT_HEVC, - .type =3D V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, - }, - [IRIS_FMT_VP9] =3D { - .pixfmt =3D V4L2_PIX_FMT_VP9, - .type =3D V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, - }, +static const u32 iris_fmts_vpu2_dec[] =3D { + [IRIS_FMT_H264] =3D V4L2_PIX_FMT_H264, + [IRIS_FMT_HEVC] =3D V4L2_PIX_FMT_HEVC, + [IRIS_FMT_VP9] =3D V4L2_PIX_FMT_VP9, }; =20 static struct platform_inst_caps platform_inst_cap_vpu2 =3D { diff --git a/drivers/media/platform/qcom/iris/iris_platform_vpu3x.c b/drive= rs/media/platform/qcom/iris/iris_platform_vpu3x.c index 541ddc40e3ae..2c63adbc5579 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_vpu3x.c +++ b/drivers/media/platform/qcom/iris/iris_platform_vpu3x.c @@ -48,23 +48,11 @@ static const struct iris_firmware_desc iris_vpu35_p4_ge= n2_desc =3D { .fwname =3D "qcom/vpu/vpu35_p4.mbn", }; =20 -static struct iris_fmt iris_fmts_vpu3x_dec[] =3D { - [IRIS_FMT_H264] =3D { - .pixfmt =3D V4L2_PIX_FMT_H264, - .type =3D V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, - }, - [IRIS_FMT_HEVC] =3D { - .pixfmt =3D V4L2_PIX_FMT_HEVC, - .type =3D V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, - }, - [IRIS_FMT_VP9] =3D { - .pixfmt =3D V4L2_PIX_FMT_VP9, - .type =3D V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, - }, - [IRIS_FMT_AV1] =3D { - .pixfmt =3D V4L2_PIX_FMT_AV1, - .type =3D V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, - }, +static const u32 iris_fmts_vpu3x_dec[] =3D { + [IRIS_FMT_H264] =3D V4L2_PIX_FMT_H264, + [IRIS_FMT_HEVC] =3D V4L2_PIX_FMT_HEVC, + [IRIS_FMT_VP9] =3D V4L2_PIX_FMT_VP9, + [IRIS_FMT_AV1] =3D V4L2_PIX_FMT_AV1, }; =20 static const struct icc_info iris_icc_info_vpu3x[] =3D { diff --git a/drivers/media/platform/qcom/iris/iris_vdec.c b/drivers/media/p= latform/qcom/iris/iris_vdec.c index dc7b051f2d01..75736c67b23a 100644 --- a/drivers/media/platform/qcom/iris/iris_vdec.c +++ b/drivers/media/platform/qcom/iris/iris_vdec.c @@ -62,29 +62,16 @@ int iris_vdec_inst_init(struct iris_inst *inst) return iris_ctrls_init(inst); } =20 -void iris_vdec_inst_deinit(struct iris_inst *inst) -{ - kfree(inst->fmt_dst); - kfree(inst->fmt_src); -} - -static const struct iris_fmt iris_vdec_formats_cap[] =3D { - [IRIS_FMT_NV12] =3D { - .pixfmt =3D V4L2_PIX_FMT_NV12, - .type =3D V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, - }, - [IRIS_FMT_QC08C] =3D { - .pixfmt =3D V4L2_PIX_FMT_QC08C, - .type =3D V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, - }, +static const u32 iris_vdec_formats_cap[] =3D { + [IRIS_FMT_NV12] =3D V4L2_PIX_FMT_NV12, + [IRIS_FMT_QC08C] =3D V4L2_PIX_FMT_QC08C, }; =20 -static const struct iris_fmt * -find_format(struct iris_inst *inst, u32 pixfmt, u32 type) +static bool check_format(struct iris_inst *inst, u32 pixfmt, u32 type) { - const struct iris_fmt *fmt =3D NULL; - unsigned int size =3D 0; - unsigned int i; + unsigned int size, i; + const u32 *fmt; + switch (type) { case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE: fmt =3D inst->core->iris_platform_data->inst_iris_fmts; @@ -95,25 +82,21 @@ find_format(struct iris_inst *inst, u32 pixfmt, u32 typ= e) size =3D ARRAY_SIZE(iris_vdec_formats_cap); break; default: - return NULL; + return false; } =20 for (i =3D 0; i < size; i++) { - if (fmt[i].pixfmt =3D=3D pixfmt) - break; + if (fmt[i] =3D=3D pixfmt) + return true; } =20 - if (i =3D=3D size || fmt[i].type !=3D type) - return NULL; - - return &fmt[i]; + return false; } =20 -static const struct iris_fmt * -find_format_by_index(struct iris_inst *inst, u32 index, u32 type) +static u32 find_format_by_index(struct iris_inst *inst, u32 index, u32 typ= e) { - const struct iris_fmt *fmt =3D NULL; - unsigned int size =3D 0; + unsigned int size; + const u32 *fmt; =20 switch (type) { case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE: @@ -125,18 +108,18 @@ find_format_by_index(struct iris_inst *inst, u32 inde= x, u32 type) size =3D ARRAY_SIZE(iris_vdec_formats_cap); break; default: - return NULL; + return 0; } =20 - if (index >=3D size || fmt[index].type !=3D type) - return NULL; + if (index >=3D size) + return 0; =20 - return &fmt[index]; + return fmt[index]; } =20 int iris_vdec_enum_fmt(struct iris_inst *inst, struct v4l2_fmtdesc *f) { - const struct iris_fmt *fmt; + u32 fmt; =20 switch (f->type) { case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE: @@ -144,14 +127,14 @@ int iris_vdec_enum_fmt(struct iris_inst *inst, struct= v4l2_fmtdesc *f) if (!fmt) return -EINVAL; =20 - f->pixelformat =3D fmt->pixfmt; + f->pixelformat =3D fmt; f->flags =3D V4L2_FMT_FLAG_COMPRESSED | V4L2_FMT_FLAG_DYN_RESOLUTION; break; case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE: fmt =3D find_format_by_index(inst, f->index, f->type); if (!fmt) return -EINVAL; - f->pixelformat =3D fmt->pixfmt; + f->pixelformat =3D fmt; break; default: return -EINVAL; @@ -164,15 +147,15 @@ int iris_vdec_try_fmt(struct iris_inst *inst, struct = v4l2_format *f) { struct v4l2_pix_format_mplane *pixmp =3D &f->fmt.pix_mp; struct v4l2_m2m_ctx *m2m_ctx =3D inst->m2m_ctx; - const struct iris_fmt *fmt; struct v4l2_format *f_inst; struct vb2_queue *src_q; + bool supported; =20 memset(pixmp->reserved, 0, sizeof(pixmp->reserved)); - fmt =3D find_format(inst, pixmp->pixelformat, f->type); + supported =3D check_format(inst, pixmp->pixelformat, f->type); switch (f->type) { case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE: - if (!fmt) { + if (!supported) { f_inst =3D inst->fmt_src; f->fmt.pix_mp.width =3D f_inst->fmt.pix_mp.width; f->fmt.pix_mp.height =3D f_inst->fmt.pix_mp.height; @@ -180,7 +163,7 @@ int iris_vdec_try_fmt(struct iris_inst *inst, struct v4= l2_format *f) } break; case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE: - if (!fmt) { + if (!supported) { f_inst =3D inst->fmt_dst; f->fmt.pix_mp.pixelformat =3D f_inst->fmt.pix_mp.pixelformat; f->fmt.pix_mp.width =3D f_inst->fmt.pix_mp.width; @@ -229,7 +212,7 @@ int iris_vdec_s_fmt(struct iris_inst *inst, struct v4l2= _format *f) =20 switch (f->type) { case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE: - if (!(find_format(inst, f->fmt.pix_mp.pixelformat, f->type))) + if (!check_format(inst, f->fmt.pix_mp.pixelformat, f->type)) return -EINVAL; =20 fmt =3D inst->fmt_src; @@ -268,7 +251,7 @@ int iris_vdec_s_fmt(struct iris_inst *inst, struct v4l2= _format *f) inst->crop.height =3D f->fmt.pix_mp.height; break; case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE: - if (!(find_format(inst, f->fmt.pix_mp.pixelformat, f->type))) + if (!check_format(inst, f->fmt.pix_mp.pixelformat, f->type)) return -EINVAL; =20 fmt =3D inst->fmt_dst; @@ -297,16 +280,13 @@ int iris_vdec_s_fmt(struct iris_inst *inst, struct v4= l2_format *f) =20 int iris_vdec_validate_format(struct iris_inst *inst, u32 pixelformat) { - const struct iris_fmt *fmt =3D NULL; + bool supported; =20 - fmt =3D find_format(inst, pixelformat, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE= ); - if (!fmt) { - fmt =3D find_format(inst, pixelformat, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE= ); - if (!fmt) - return -EINVAL; - } + supported =3D check_format(inst, pixelformat, V4L2_BUF_TYPE_VIDEO_CAPTURE= _MPLANE); + if (!supported) + supported =3D check_format(inst, pixelformat, V4L2_BUF_TYPE_VIDEO_OUTPUT= _MPLANE); =20 - return 0; + return supported ? 0 : -EINVAL; } =20 int iris_vdec_subscribe_event(struct iris_inst *inst, const struct v4l2_ev= ent_subscription *sub) diff --git a/drivers/media/platform/qcom/iris/iris_venc.c b/drivers/media/p= latform/qcom/iris/iris_venc.c index aeed756ee9ca..a945992f63aa 100644 --- a/drivers/media/platform/qcom/iris/iris_venc.c +++ b/drivers/media/platform/qcom/iris/iris_venc.c @@ -79,40 +79,21 @@ int iris_venc_inst_init(struct iris_inst *inst) return iris_ctrls_init(inst); } =20 -void iris_venc_inst_deinit(struct iris_inst *inst) -{ - kfree(inst->fmt_dst); - kfree(inst->fmt_src); -} - -static const struct iris_fmt iris_venc_formats_cap[] =3D { - [IRIS_FMT_H264] =3D { - .pixfmt =3D V4L2_PIX_FMT_H264, - .type =3D V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, - }, - [IRIS_FMT_HEVC] =3D { - .pixfmt =3D V4L2_PIX_FMT_HEVC, - .type =3D V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, - }, +static const u32 iris_venc_formats_cap[] =3D { + [IRIS_FMT_H264] =3D V4L2_PIX_FMT_H264, + [IRIS_FMT_HEVC] =3D V4L2_PIX_FMT_HEVC, }; =20 -static const struct iris_fmt iris_venc_formats_out[] =3D { - [IRIS_FMT_NV12] =3D { - .pixfmt =3D V4L2_PIX_FMT_NV12, - .type =3D V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, - }, - [IRIS_FMT_QC08C] =3D { - .pixfmt =3D V4L2_PIX_FMT_QC08C, - .type =3D V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, - }, +static const u32 iris_venc_formats_out[] =3D { + [IRIS_FMT_NV12] =3D V4L2_PIX_FMT_NV12, + [IRIS_FMT_QC08C] =3D V4L2_PIX_FMT_QC08C, }; =20 -static const struct iris_fmt * -find_format(struct iris_inst *inst, u32 pixfmt, u32 type) +static bool check_format(struct iris_inst *inst, u32 pixfmt, u32 type) { - const struct iris_fmt *fmt =3D NULL; - unsigned int size =3D 0; - unsigned int i; + unsigned int size, i; + const u32 *fmt; + switch (type) { case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE: fmt =3D iris_venc_formats_out; @@ -123,25 +104,21 @@ find_format(struct iris_inst *inst, u32 pixfmt, u32 t= ype) size =3D ARRAY_SIZE(iris_venc_formats_cap); break; default: - return NULL; + return false; } =20 for (i =3D 0; i < size; i++) { - if (fmt[i].pixfmt =3D=3D pixfmt) - break; + if (fmt[i] =3D=3D pixfmt) + return true; } =20 - if (i =3D=3D size || fmt[i].type !=3D type) - return NULL; - - return &fmt[i]; + return false; } =20 -static const struct iris_fmt * -find_format_by_index(struct iris_inst *inst, u32 index, u32 type) +static u32 find_format_by_index(struct iris_inst *inst, u32 index, u32 typ= e) { - const struct iris_fmt *fmt =3D NULL; - unsigned int size =3D 0; + unsigned int size; + const u32 *fmt; =20 switch (type) { case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE: @@ -153,18 +130,18 @@ find_format_by_index(struct iris_inst *inst, u32 inde= x, u32 type) size =3D ARRAY_SIZE(iris_venc_formats_cap); break; default: - return NULL; + return 0; } =20 - if (index >=3D size || fmt[index].type !=3D type) - return NULL; + if (index >=3D size) + return 0; =20 - return &fmt[index]; + return fmt[index]; } =20 int iris_venc_enum_fmt(struct iris_inst *inst, struct v4l2_fmtdesc *f) { - const struct iris_fmt *fmt; + u32 fmt; =20 switch (f->type) { case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE: @@ -172,14 +149,14 @@ int iris_venc_enum_fmt(struct iris_inst *inst, struct= v4l2_fmtdesc *f) if (!fmt) return -EINVAL; =20 - f->pixelformat =3D fmt->pixfmt; + f->pixelformat =3D fmt; break; case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE: fmt =3D find_format_by_index(inst, f->index, f->type); if (!fmt) return -EINVAL; =20 - f->pixelformat =3D fmt->pixfmt; + f->pixelformat =3D fmt; f->flags =3D V4L2_FMT_FLAG_COMPRESSED | V4L2_FMT_FLAG_ENC_CAP_FRAME_INTE= RVAL; break; default: @@ -192,14 +169,14 @@ int iris_venc_enum_fmt(struct iris_inst *inst, struct= v4l2_fmtdesc *f) int iris_venc_try_fmt(struct iris_inst *inst, struct v4l2_format *f) { struct v4l2_pix_format_mplane *pixmp =3D &f->fmt.pix_mp; - const struct iris_fmt *fmt; struct v4l2_format *f_inst; + bool supported; =20 memset(pixmp->reserved, 0, sizeof(pixmp->reserved)); - fmt =3D find_format(inst, pixmp->pixelformat, f->type); + supported =3D check_format(inst, pixmp->pixelformat, f->type); switch (f->type) { case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE: - if (!fmt) { + if (!supported) { f_inst =3D inst->fmt_src; f->fmt.pix_mp.width =3D f_inst->fmt.pix_mp.width; f->fmt.pix_mp.height =3D f_inst->fmt.pix_mp.height; @@ -207,7 +184,7 @@ int iris_venc_try_fmt(struct iris_inst *inst, struct v4= l2_format *f) } break; case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE: - if (!fmt) { + if (!supported) { f_inst =3D inst->fmt_dst; f->fmt.pix_mp.width =3D f_inst->fmt.pix_mp.width; f->fmt.pix_mp.height =3D f_inst->fmt.pix_mp.height; @@ -228,17 +205,17 @@ int iris_venc_try_fmt(struct iris_inst *inst, struct = v4l2_format *f) =20 static int iris_venc_s_fmt_output(struct iris_inst *inst, struct v4l2_form= at *f) { - const struct iris_fmt *venc_fmt; struct v4l2_format *fmt; u32 codec_align; + bool supported; =20 iris_venc_try_fmt(inst, f); =20 - venc_fmt =3D find_format(inst, f->fmt.pix_mp.pixelformat, f->type); - if (!venc_fmt) + supported =3D check_format(inst, f->fmt.pix_mp.pixelformat, f->type); + if (!supported) return -EINVAL; =20 - codec_align =3D venc_fmt->pixfmt =3D=3D V4L2_PIX_FMT_HEVC ? 32 : 16; + codec_align =3D (f->fmt.pix_mp.pixelformat =3D=3D V4L2_PIX_FMT_HEVC) ? 32= : 16; =20 fmt =3D inst->fmt_dst; fmt->type =3D V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; @@ -281,7 +258,7 @@ static int iris_venc_s_fmt_input(struct iris_inst *inst= , struct v4l2_format *f) =20 iris_venc_try_fmt(inst, f); =20 - if (!(find_format(inst, f->fmt.pix_mp.pixelformat, f->type))) + if (!check_format(inst, f->fmt.pix_mp.pixelformat, f->type)) return -EINVAL; =20 fmt =3D inst->fmt_src; @@ -350,16 +327,13 @@ int iris_venc_s_fmt(struct iris_inst *inst, struct v4= l2_format *f) =20 int iris_venc_validate_format(struct iris_inst *inst, u32 pixelformat) { - const struct iris_fmt *fmt =3D NULL; + bool supported; =20 - fmt =3D find_format(inst, pixelformat, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE); - if (!fmt) { - fmt =3D find_format(inst, pixelformat, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLAN= E); - if (!fmt) - return -EINVAL; - } + supported =3D check_format(inst, pixelformat, V4L2_BUF_TYPE_VIDEO_OUTPUT_= MPLANE); + if (!supported) + supported =3D check_format(inst, pixelformat, V4L2_BUF_TYPE_VIDEO_CAPTUR= E_MPLANE); =20 - return 0; + return supported ? 0 : -EINVAL; } =20 int iris_venc_subscribe_event(struct iris_inst *inst, --- base-commit: c92057a181e8df8fd47426bb904c3253693cfced change-id: 20260311-iris-remote-fmts-53336c2b89a0 Best regards, -- =20 With best wishes Dmitry