From nobody Wed Apr 8 03:08:59 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 5843F1DFFD for ; Wed, 11 Mar 2026 00:10:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773187816; cv=none; b=r4hzw9QXu5zb6kw/lrEBzrw0PgoQrBdS1PS7edtnCl5iC32ALsxKKZBCyXwQVAKVECDSnnUKSsW3bnpi9hyXtYqJczmMcgcebiixYcyml4/GEfCckwShPDNNQo+J4N3S6tHZoDdut1f+OCQoEKHGZj1H0hDGwv91slqE0f3NAcY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773187816; c=relaxed/simple; bh=EvX5v465GnIMYALqC6MsZaAWBg+U6I4jD2QHThoS4r4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=pPmV7mAjaoUtulBnuslwWcK1ObwkzJDGqYUB3mo4tENJVX+a9esuAIH9fd7Z7SmJVV0Zg4kjOhwLplOeDGn4H9AhujCFjPoMD+1iR3NTz4Q3mcTfcmhwSV7Zm6Mvt6Qw+D3lDPdU4FS2raV8Wwgp4WTYo96qLcylmpVtZmDRpa8= 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=BKyfhdaH; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=OMjPOHpH; arc=none smtp.client-ip=205.220.180.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="BKyfhdaH"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="OMjPOHpH" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62AGHGTw509379 for ; Wed, 11 Mar 2026 00:10:13 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=QQwR6NRb0KUHDm9xkJblhh 3/27LpDSPzKH6SjqLzUp0=; b=BKyfhdaHLEUu8N1q6IkYg8qGt9lgGYtrJzu7p2 TvL2bl85Y44DtqMeZ+lAlpnwsw6eOWx4n6wcbeKBYz8ePiR8D6PqgguyeOcePBjG Vrx5TIG5fyZcK9+jvt93EQ0/1kK9mjpCvJslTK0FQ6ykUUxmRFJoKTemAwx4zmjr GxZxPEyXgrjdrQ3Zkcftkpg4X7hGIx55eUvWPaz2mkkpodGPqwecCV6N2qe9TTS1 vAhVA4at3Jjbbp28cPyGfUq5+Egr/VnSkd+BOuSX+lKDK5o/17nDoxm4j6TlG045 iIwzvpCVb8NVzCNWq5d8PvG4fM0qJuqFwklbihBtYE0O/IGQ== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctppahh59-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 00:10:13 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-8cd900cd3a7so1135738185a.0 for ; Tue, 10 Mar 2026 17:10:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773187812; x=1773792612; 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=QQwR6NRb0KUHDm9xkJblhh3/27LpDSPzKH6SjqLzUp0=; b=OMjPOHpHNEFvBWJd8atmE58/s0MI6qaXVHXpfmXivCKXcVy0TqzmwOBwNUHAeJQFa0 h6WIEmnV6BPzii7Zopi/NyBLpQ3L4uZzGO7k7hzMZ+SxON3UldtRniYFUgBncUFBua4b oF5vHYx67nM7GojVfLyMRYlQdadUEzWBQgwk8IqeJm4enpcrFqS5ZhJqSNnW9zsUM87T 23gYDm7SEeWBWQv7JBAe5rOGD9QSuzQpWqCpsNB0QwBLsBGWSJJPFYCHxxkJ4fkNCX8O /hDIoMoV97RljMO2D3j7LghBO9Efmdhpem+i/VOQi00w+Ln61JQ1LijivH0ozafgKhSm UDtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773187812; x=1773792612; 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=QQwR6NRb0KUHDm9xkJblhh3/27LpDSPzKH6SjqLzUp0=; b=X9zdIknU4QENBh3K6rNv50I9Ylv3uTU7z20kQgyHDd6uhso/v23aI5NE++IRAqexv2 xCFqSe0dFnr0ODEpVjwI/4/pykdAX6BeALM5+Tnqk6dg1QHXe9Wkc0VEVzed17VxnkoH oLCUUgLKQ/yw+cRv6NpNZpmc52049ts2lKwauK7aN4KeSDtr7jERPzvKAvWO8DfHh3bu SrgPtK/WaRydxqtAKclPZIELwadUurVlSsJJ1BfBXhhWF8I4dP4d6+dYti5mkKjOnQ8w dYaaRZoaGzb8bQB2cZdAGTg0CrHuoSQK8xir6YC+B86z/piuj77F/fw+39WceZCTZ+tI g1JA== X-Forwarded-Encrypted: i=1; AJvYcCVJIj1xMiQf+Y23zcjb9IAVrHm88M129Mjnkob07+YPBuYQ/ejmGIXYGRyoHEDvL4Rxy6UJe9pzY8DNIvw=@vger.kernel.org X-Gm-Message-State: AOJu0YzTNQD0JeYl6HEytEaj9bbd9KuyMRVTQoBMAjRnpePdV7NZj+uk APJaAXvXnAfWVRKHnhN7E/pmpVHhuOF2dWGIOKWcnu65eToB/LusotzgVwL7ldqjpFnz1UI3l1n 1YE4rf4CMIgigQPiaPBUFdwO+yfcUFPOTLbqaeCbAL1ghK0d5cXK3PNWjGYtKTuwvQCC1zCFbIW o= X-Gm-Gg: ATEYQzxQ6Gd+m2IlWe1putjMWfZpzPnS/JeCXWT8/kans1J5NWdxVn8j2tCn/6RxP00 m03HIgS232TP7eQvCdjn/zYUQYBoEu2swc+TGMMZwYlwh5rAMzMGlHdjVegYXh77TUwV8j+dsoB oMS9AH+EjK1q9zcTQis1r9xs0+iUWHtkQk/qVmk+izIOoJrlf55eUHolVifcfaJXXIoE831YvkP XeBYkhpsdxVmVsN1onJjjWn02LM6iVIvZY+CD8SFj3w2B8KUg7/JfryH/z9unV1xQpkpZIGXHr0 UH+k/N7qXqmMlupbOWTahYazR4q7MB/uPi20NUIfl68jQBq7pvpmtTICZQenpUQP/vJ6U1hGzI/ /5ROLnYegFEDKx8o1Zb60sh2+Uy1yJgemMZywyqc9R4d5iHHp9vES1+A+rbYk3R7zOBjIWL7JXR +Q+uvnIbZscoQC6HyfbvKsGaX2qhn67C/nzYs= X-Received: by 2002:a05:620a:4153:b0:8ca:305b:748e with SMTP id af79cd13be357-8cda1a5595fmr98957385a.57.1773187811859; Tue, 10 Mar 2026 17:10:11 -0700 (PDT) X-Received: by 2002:a05:620a:4153:b0:8ca:305b:748e with SMTP id af79cd13be357-8cda1a5595fmr98954485a.57.1773187811365; Tue, 10 Mar 2026 17:10:11 -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-5a15602e2ecsm107786e87.25.2026.03.10.17.10.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 17:10:10 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 02:10:04 +0200 Subject: [PATCH] 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: <20260311-iris-remote-fmts-v1-1-de0044453b68@oss.qualcomm.com> X-B4-Tracking: v=1; b=H4sIANyysGkC/x3MTQ5AQAxA4atMutZkfkJwFbEYFF0w0opIxN1NL L/Few8oCZNCax4Qulg57RmuMDCucV8IecoGb31lg3PIwopCWzoJ5+1ULEMI1eiHuokWcnYIzXz /y65/3w/buTqcYgAAAA== 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.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=15933; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=EvX5v465GnIMYALqC6MsZaAWBg+U6I4jD2QHThoS4r4=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsLLhjz5P1aB+8StCBOOiVXkOQtV7Vd5wFijoi J9PlzH/QzmJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabCy4QAKCRCLPIo+Aiko 1SuOB/9FPgB6bqv3zu29c9KaauiN7P9a0Ceeon2Bssrj/OOa5OnfmbcnxBvO3VaZ2vWqx3XN5SK w5abZclk9rdyOiA8NWaJdBk1ijeG1GTkymnKMnM2yFsErPp+uIlv4rJcZLuJpyeQTDO2o8+eZlS mBY3Xx/GxOVSz9+Z6p6Mq7ypyKwSQOqHGy9HwekycRL3xAM8pi6oVKT46+0iR0CEf+XaRU7ryGn 7lS0sAT9/PYU0XrZrrkwcOcNz0N+eXdAKtllu4hz0q9lbziDazPVPGIcXQxo7D/eAngwGqoyP+P 2Lf2q972f7BDTUuLdtxP/ysteAjmf9qpqfqnOe/RndA6o2Kc X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: 2PCaLeO6IKR14XsBDtyfaMR43NMl50oT X-Authority-Analysis: v=2.4 cv=D7BK6/Rj c=1 sm=1 tr=0 ts=69b0b2e5 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=EUspDBNiAAAA:8 a=P2JkpESjKQypXLoEBXAA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDAwMCBTYWx0ZWRfX6oTN0uXr6c8y lluks4Wkpgrh9peQ+0unCA+ZAcRMQzQMyn1PCmFOebtNafFaMFO9CjJni083ADDzoI8ZBVqX1x8 +tG1A50iKALIjlTvtgFqE18iG5dJKyHF+WsY0rAsSYrurYRhpR+qOyFOuNWmgRdqlRea8paCbPz xsf2wtlUdXBoBGuf+NB6W7jPpnmxkc8cLOaD0lTkVBLrWpgIDw/Dt2RkQNxhPSfAT+qMDhsdc5a D/ypVucritkbXFvFtENJPkOTkoP8MN4vL00DFQHR7ek34lXH3SaFfG8Q24Zt9KPx2kVTixtDQzF aeoV8+2o8I5DDR3AQJsmnZzmDUNptKLDAtO0qNJ5+7lbAIlfqwrEadAGRSseyKNGc4awuuoTy6x RWJVQxcguQDJQ6X4tsZpLHdZBh1ejqTOAtM2ox5fMR1LqQQA6M2f5y4u66uZox79OKyrm0+O4Dc F3uGlJzBwGn436Gs61g== X-Proofpoint-ORIG-GUID: 2PCaLeO6IKR14XsBDtyfaMR43NMl50oT X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-10_05,2026-03-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 impostorscore=0 spamscore=0 bulkscore=0 malwarescore=0 priorityscore=1501 clxscore=1015 adultscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110000 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. Signed-off-by: Dmitry Baryshkov Reviewed-by: Dikshita Agarwal --- drivers/media/platform/qcom/iris/iris_instance.h | 5 -- .../platform/qcom/iris/iris_platform_common.h | 2 +- .../media/platform/qcom/iris/iris_platform_gen1.c | 17 +--- .../media/platform/qcom/iris/iris_platform_gen2.c | 22 ++--- drivers/media/platform/qcom/iris/iris_vdec.c | 78 ++++++++---------- drivers/media/platform/qcom/iris/iris_venc.c | 96 +++++++++---------= ---- 6 files changed, 80 insertions(+), 140 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_instance.h b/drivers/med= ia/platform/qcom/iris/iris_instance.h index 16965150f427..0eb256b0e82e 100644 --- a/drivers/media/platform/qcom/iris/iris_instance.h +++ b/drivers/media/platform/qcom/iris/iris_instance.h @@ -27,11 +27,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 5a489917580e..737ca4b1fe5c 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -237,7 +237,7 @@ struct iris_platform_data { u64 dma_mask; const char *fwname; u32 pas_id; - struct iris_fmt *inst_iris_fmts; + const u32 *inst_iris_fmts; u32 inst_iris_fmts_size; struct platform_inst_caps *inst_caps; const struct platform_inst_fw_cap *inst_fw_caps_dec; diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen1.c b/driver= s/media/platform/qcom/iris/iris_platform_gen1.c index aa71f7f53ee3..c1e91e18d07f 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_gen1.c +++ b/drivers/media/platform/qcom/iris/iris_platform_gen1.c @@ -20,19 +20,10 @@ #define BITRATE_PEAK_DEFAULT (BITRATE_DEFAULT * 2) #define BITRATE_STEP 100 =20 -static struct iris_fmt platform_fmts_sm8250_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 u32 platform_fmts_sm8250_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_fw_cap inst_fw_cap_sm8250_dec[] =3D { diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/driver= s/media/platform/qcom/iris/iris_platform_gen2.c index 5da90d47f9c6..cd2725d3ff16 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c +++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c @@ -19,23 +19,11 @@ #define VIDEO_ARCH_LX 1 #define BITRATE_MAX 245000000 =20 -static struct iris_fmt platform_fmts_sm8550_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 platform_fmts_sm8550_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 platform_inst_fw_cap inst_fw_cap_sm8550_dec[] =3D { diff --git a/drivers/media/platform/qcom/iris/iris_vdec.c b/drivers/media/p= latform/qcom/iris/iris_vdec.c index 719217399a30..2d3e2d72f221 100644 --- a/drivers/media/platform/qcom/iris/iris_vdec.c +++ b/drivers/media/platform/qcom/iris/iris_vdec.c @@ -67,23 +67,16 @@ void iris_vdec_inst_deinit(struct iris_inst *inst) kfree(inst->fmt_src); } =20 -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; @@ -94,25 +87,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; + const u32 *fmt; + unsigned int size; =20 switch (type) { case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE: @@ -124,18 +113,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: @@ -143,14 +132,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; @@ -163,15 +152,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; @@ -179,7 +168,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; @@ -228,7 +217,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; @@ -266,7 +255,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; @@ -295,16 +284,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 aa27b22704eb..0cba49df512d 100644 --- a/drivers/media/platform/qcom/iris/iris_venc.c +++ b/drivers/media/platform/qcom/iris/iris_venc.c @@ -85,34 +85,21 @@ void iris_venc_inst_deinit(struct iris_inst *inst) kfree(inst->fmt_src); } =20 -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 +110,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 +136,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 +155,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 +175,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 +190,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 +211,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 +264,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 +333,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: 69f994912b677367e59934a2c34f365cf42d517f change-id: 20260311-iris-remote-fmts-53336c2b89a0 Best regards, --=20 With best wishes Dmitry