From nobody Tue Apr 7 11:17:21 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 2AFA9363080 for ; Fri, 13 Mar 2026 15:55:56 +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=1773417360; cv=none; b=Bswi5BvRkp5reNcLCCecMax1p9FLpnFu6BlCRCSRDp+cvMy0+aRkgEXKYQI26JH+83Ki+sQ92cnb3nrT9D8nS1Za5wHG0e1k02nt1IU+KyF08YiNtKfuGNfp3GAKkty/XrlsGryr5x6uVM9gJYFqSSu6puP9uzhrTJcpNaDquCY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773417360; c=relaxed/simple; bh=BHCrltSoKl7vxeGTt7kHNjXBp/oLz6Z3DyNVwQN0Z2I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=kwb1dqq8nF2VtK6B2Ktk0pn/R5+8uvIXOqiI63nmMMFX/aQWr+kDhOOsLc2pPzB6zVTHcRKrTGSPma0iPbGxntxpD73m/2LUs/nv6+SdSLDO0YuH8DrjBJ02f3CKZs0EgJ8K81DIMDHHQRf/z/hD01TvmZydjtP+qCZT7o0nMfc= 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=ojgZtFRo; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=VXnMzBaE; 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="ojgZtFRo"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="VXnMzBaE" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62DFXGKD437740 for ; Fri, 13 Mar 2026 15:55:55 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=FTRo+x25I3rwOqyyDFGrMI HG7x7VoYvVDdNnIS9ruOI=; b=ojgZtFRoKuKiyIWuPera44Z+mzYsxH5isJ7PCQ nGwEYXPh2jhCdc91r7vvQvHrLIOUc8M9w8Oe+Eb6xEZ4L3AQp9HTbBcgNwPBcBBD YJwtbqMGXFOVP7VuAJkzg+GhBWld1MEADks2d2kwHnfY/hW3HrM2c6Jev8mxSTXP mZUdrgkx7fS0glnIz+vERwJ/RYpv+CoA1RcCpfJfn1l4YvMPOH3rwcEqFUw0nuoB kjPPVaP8lz2a2AY2antDV8/oqkGWCQ7u8HfCNfC4pmE5jzsGV4lVzdM2fdxyvvL7 +2UeBY3pN5HOGC3q+F/KoF557ZsF0RJqUcNXJxGreJmz8zHQ== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cvnax8222-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 13 Mar 2026 15:55:55 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-8cd85e08fddso2157798985a.1 for ; Fri, 13 Mar 2026 08:55:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773417354; x=1774022154; 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=FTRo+x25I3rwOqyyDFGrMIHG7x7VoYvVDdNnIS9ruOI=; b=VXnMzBaEOY19kzbVVHazOgkhxPsUbdHEAXQBrjrnoL48Ke5hbGFOwunRH9993QTI0Q 7CQQqqOiRHYSIKjjLixmWP5enwUP3jTcYNiY+nBPEeOFBFuVOuLhGE1aaLGJt3luzFMZ 09OKwn1VP8VOmeL1gFVYvx2hH1MAylhvUe9KeFJkA7WZwS1jwAcggpu3Z18ia9ysO8ue m5x4eMy0m40aYM1Va2x5u79Os70wmtZsLFBlE/7phJebjuf/Fr2Tnfc4Pzq1rKOGAsU3 uHPHsjr+wJQzqgQiq8vvgT9956ChBpnEyTuJi+fP5MbRJexiOqMxd+bV8LogD6C+LqHv GZCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773417354; x=1774022154; 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=FTRo+x25I3rwOqyyDFGrMIHG7x7VoYvVDdNnIS9ruOI=; b=pywnz7tvo0b0X08+MGqGNm5U+adneeZsk1npofvfPR5ZG45aYCe4TyI4S1RPJJUbeB PXP7ddxGUfVcjrwDgqCpQnXw7iuZh5gF5LalmBXeIcDlyYJsbe7NXg8NYyLu11zJnkKD M7Cu073qnLtKyEJUbs8eZBfVjwxdrZTmEIXp4o0cvLrs59svX5lIyJQUg2D5A7FFbgdA swgJyz0yrtRUgLnfaghoVOu+jJC4lsOGJr/8FrCqtFZKJxXI1SmL8uH9XKor+LYnFskw /yjcCza7O+20uah8d7903Rxok0UCdJLuAGn3XZJ4hWN7hLTSmvoLpvjnZFTYj2MOKOev 2BHg== X-Forwarded-Encrypted: i=1; AJvYcCXbIH4yy1SJvPWTPJh8tIUobIKJcD6ZFGgx4cfjj4SQGXgFxWS1CKb7zpQK72IcEipGl0q/ATY8Xg1LQAM=@vger.kernel.org X-Gm-Message-State: AOJu0YwXRPEUWyMdhgI+tfUBe0L3RWH5ilkO8GiU7plZHOyTlaTt/Ow4 EpKCxkiGjOZJOoWoEEFJ3y8WAeJAwCcPvADV2cuQm0C11If3kaSbc7TOsdyQ0UEQ0Zcg+sKwtVl HsWDOnOE3GGZ+KCFsr07D7ogjrmt3reJ/7yyfpwRZ2TqdeY1Tt2N7ENR6FdBIULFMEaE= X-Gm-Gg: ATEYQzwiWslkUKJ874IJzm2/dX5np8AgiBJWiz9CF+IdKKy0ouE0quL93s7d04uH0p2 6KZQ799KnxLUD+04QXNdNfbEzNrtJwm4Ipa7Uqa68c+UvWKSaQyBd14ziL+a5NaHyFgrANmzsGl OXgWMJGah3uXUjJ+f2aQU6OUszZnd6fJ4Bd7T/r93GCpxqB+OgOXNBHuy2gTIh2quJHHQzm47Mp XLXrlZndwrRde1dOk745HK6jBRmM9NJwv1Z32eQId70s+UPws0N7Z6az1+Ff5TxOCkF5ofBAA5H qOllnW8BF0bZHOS6fdJS+I76Qj2FL5v6bcJS5a1NiM0/MynM7bHHL67xmW8zBN7RWX1mHiwK6h/ hQLK6tPXq7/icQfuBdc+AzDHvSIn7buHjkjk69ErTWAwQ61tM9Hu9sZWYduN4UUUzcZhe1jpM44 1HOTxIpLAlNeZK7CA0qeN/mvIBaBPI3h1fPhU= X-Received: by 2002:a05:620a:5dcd:b0:8cd:b7ec:7adb with SMTP id af79cd13be357-8cdb7ec7ba1mr301969985a.60.1773417354336; Fri, 13 Mar 2026 08:55:54 -0700 (PDT) X-Received: by 2002:a05:620a:5dcd:b0:8cd:b7ec:7adb with SMTP id af79cd13be357-8cdb7ec7ba1mr301966285a.60.1773417353758; Fri, 13 Mar 2026 08:55:53 -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-5a155f33cd4sm1612329e87.8.2026.03.13.08.55.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2026 08:55:52 -0700 (PDT) From: Dmitry Baryshkov Date: Fri, 13 Mar 2026 17:55:51 +0200 Subject: [PATCH v2] 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: <20260313-iris-remote-fmts-v2-1-edb11793b196@oss.qualcomm.com> X-B4-Tracking: v=1; b=H4sIAIYztGkC/32NSw6CQBBEr0J6bZP5AEFX3sOw4NNIJw6D00g0Z O7uyAHcVPIqqVc7CAUmgUu2Q6CNhf2cwJwy6Kd2vhPykBiMMpWyWiMHFgzk/Eo4ulWwtNZWven qc6sgzZZAI78P5a1JPLGsPnyOh03/2j+yTaPGgZQqiqK0XVVfvUj+fLWP3juXp4AmxvgFaziqy bcAAAA= 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=16232; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=BHCrltSoKl7vxeGTt7kHNjXBp/oLz6Z3DyNVwQN0Z2I=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBptDOItD2BFtAM3M5nx0ZxfYDf0cljD5J+b3rJR ORSfPDVanqJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabQziAAKCRCLPIo+Aiko 1d2gB/4vd5Uni5/hU9CR+XKdoKpVrCuCxU8BRrKrSHsictsB0TgVCUwB02UD+LnOxhv2dQEj59a YLAtJ8xGU6TWdTXNUqnswiawUmTVgfAYKPqPNYYsblKOuIhu5i7WmRvdOK9u54xTdJkiGfLWTU+ AGTKZlSoDh4fBfxmf4Pt289I/OtNUE8N5jEVDUD7Iy2r5t0TGFvRwniuZXNiXES3llhszn7DJ0V bknUdxITB1+oq6ovrBLwYE5WIVfk7V5BwqGnvI7+Od9m+sNWlej5443dP/evI7OTdtYMnTpebJn Ljoy1KkaIsMZ3s6TACqK63fObuwCQ1Elkt/pHn1iF3WP95Cp X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: W8p99Ly9-SAL8SuIoUmbATnVh_rLjtHN X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzEzMDEyNyBTYWx0ZWRfXzcpeQf1y7ozY aQuf0MBo+xFX2PuV31ucLFRqEf1GoIwpwzsMikXUsv4nzaVGnSc9KUm66ZLjlnIIzGpQgYJQ/DU 9ry3QTCdKA1Vf27LimXmJv6KGyTE0dO4VKzJopkgh6W7rxQ5nwU7uWj5u6WbdbaT5qIcz2kzdaH CaOKZq7wc4AXDIIETAPWcYPGYAejMxLwHiPFQpzx3UeStqSTlzoESMrjYh/yR8Sq3ojHy7oJB0h X5DAzZARpCL6WhAVW76GcW/RlzoIzB7pABbVccU8N58dIfU6VOT7WTnGfJTdFFMRABOj5Ks5DFd a7Fdm1JcccYQyydVOFWCg6llTy6o1ilXfCKSrU+u6D0XbYQ+DolrlBlOH9nWHNQ0cBREc9OjIq7 FPYTjsBnEcfiCpbnAjv5IzNg8Emt4QydUBb2aCfw+7r5r7rHtlqDMfJ0l3n3hda1R8cRDmSejiL pADk+mjdDth2q6BVUpw== X-Authority-Analysis: v=2.4 cv=X5Ff6WTe c=1 sm=1 tr=0 ts=69b4338b cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=VwQbUJbxAAAA:8 a=EUspDBNiAAAA:8 a=P2JkpESjKQypXLoEBXAA:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-ORIG-GUID: W8p99Ly9-SAL8SuIoUmbATnVh_rLjtHN 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-13_02,2026-03-13_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 impostorscore=0 phishscore=0 lowpriorityscore=0 clxscore=1015 spamscore=0 suspectscore=0 malwarescore=0 bulkscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603130127 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 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_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..bbbbfa6880ef 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 const 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..74b0bed513c6 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; + unsigned int size; + const u32 *fmt; =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: ba72d957a142f5251b0475adc80a8dcfd85bc7b6 change-id: 20260311-iris-remote-fmts-53336c2b89a0 Best regards, --=20 With best wishes Dmitry