From mboxrd@z Thu Jan 1 00:00:00 1970 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 8E4932FB965 for ; Thu, 9 Jul 2026 13:42:09 +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=1783604531; cv=none; b=S6uavnLy+nUK1CItUWoXH+xwCoflXA5jgzkmSMV0z2GsifLSHBVyTVKqMaHNYiBghpKZFZHD3f7l9981yO0oqWKTJBhsCZw9keRJyBaerS/6511zBWfXmR9lU8hbYl6m7oIUrHfW9Xh1LIrLYb5IatM0/k9BeyVTTR82vqkXstk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783604531; c=relaxed/simple; bh=T4eIYBccxXJeZW7OH2Zm0x8+WH27A+FuLPhy+n6Z5fM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KzjibcYhHnv17neapH6iDTbkiv6NofxRsyW1sBJsvyWXQZog78FecuZZ+VMXhrv6r029LmNNjjnbsSpd825fQYQDUHioCpH2NR3zLjA85/WToM6hqOzgVAuRmF1G+/f1wl6CrjD3qG9jRTKeMmC0jILcoevGBamPrAQ80L1H8uE= 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=paiqDtVp; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Gq5x1t63; 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="paiqDtVp"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Gq5x1t63" 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 669BNT751489088 for ; Thu, 9 Jul 2026 13:42:08 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= wUHnGdkfUXRQwt8oe8xuo2tN8rjbIhoMZwW9C9J3BuU=; b=paiqDtVpB4W8XMia mkUOQiclKvrkJBkcy+rO5hkMq0oI6Cn0Xzn4u/AP0M3GJ9+tahIRGcJJEe7hpHbM D4oF0a6RGy6DeHU/i+bW66vbGrvathcUACM6H+8F8H10kapxcyB6ZtiHA0NSTrt/ ZO5zNCTQhVervggey8DeCVP//zsz8Ro+9EOIUW6ZODwNzBilBoU1bbzLn0bmNzI1 tQztUKJ4b4/LY24SELohmsZzYcWgaqFxAWtVikjoPK+KBv1PsimQsvSoxtD6xRb7 ZToP3b1eG9BKFBMs+zUvuOti/J0hgC0mKBL7MrvPwk9jYcZxRkL4wvH4jcaHCxRn TBEUlw== Received: from mail-ua1-f69.google.com (mail-ua1-f69.google.com [209.85.222.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4f9wwfufre-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 09 Jul 2026 13:42:08 +0000 (GMT) Received: by mail-ua1-f69.google.com with SMTP id a1e0cc1a2514c-963d7c11611so420238241.0 for ; Thu, 09 Jul 2026 06:42:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1783604528; x=1784209328; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=wUHnGdkfUXRQwt8oe8xuo2tN8rjbIhoMZwW9C9J3BuU=; b=Gq5x1t634YEdCM8FIGvji9D0y9N1jYI89RlnUILjGRwjK3r6UDns7cHU3wbx0aTER1 vH1Ve8Mfl9LMChqmjgceToFdIDUg17vYMJ+KmCzy+FHEraev24zKScncfNP2DXiDDIuB Hz86VCXs4VucMzUIib4iu4JqOaAYznEcLHRitAP7+qS5yvgOS7c89icYGVbdr15e4v+Z f8PIP5lU0ScsWjTNf6ws9URIwjPdhJbwqAuhsK/a80eE/T2JrudPAtmMexHKgNchBpmz n+V9c2muMwxGu0f6TkTkIM+cHsYcjCyFsbCsHwVCXKlSAEZBjzYtsBE7GRZTJ5i+2bnl aFYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783604528; x=1784209328; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=wUHnGdkfUXRQwt8oe8xuo2tN8rjbIhoMZwW9C9J3BuU=; b=lqkcle3YlHS+pJdgSIE3f9Dv8VVBfWbPy9cP8MuALqt/2t0xLLTE3nlkTLDd0ORKQ0 0GR9AlHYR5qxqjeh8c3r0sTjtTuQVxup8sP6eUEvN3Egn2SVFtfUC8PuFb8t+XGGutDv A0EqPNuQw6/ISD2tx1t0BYCRIt020XM/i5a92Dvy39HjYDs7YD46Ty7EZ/M/tIS1N35J mOnUMHJnykgfkpp/bim6ZdUpD/XXW4gQyvJp+kYuH9QAbbWvZXaTLuznC3cWlrCycQlV IR47YhB/7cp74hUC4EJF2to8doT+Hbf6w5hYPO2PImp45UgKm8OMqToaRJnTIjdF3azO VgVg== X-Forwarded-Encrypted: i=1; AHgh+Ro+Au3WAVn6VglZwFBMT5XNiluO7L2BdfQivyKqRNX2WY7U970G5P82xGxEA+P6js74LTF9tbysJUO2i4U=@vger.kernel.org X-Gm-Message-State: AOJu0YxfT3hk42M85DS3iai4LqkexY9rJkrmd1FxTx81p3weYaCKJXK4 YoRB2vNoiBEp6/KgUvJGVUYVSBoTcF7MZGJZGJWqlmHuz4cdF+1nZaEwDRe1wCbU9HjW00gOBVf tFrtacuIqB4J1nLGEtFBsuY5J/XsZ3ZInW5aR8VEuzuMp7NHFUNfrUnxlfVwTpgru7TU= X-Gm-Gg: AfdE7cn7EibBpWcJ7e4ph0zrNDQmseeXlkNMrP0KuakEaNy2Xy+EtM+GrS13WcarwKl Bt88CDKPxxlpGfw1PjbPieJQknyzKhl9vjpUzLHbVbU3PghcXTXN94OsD9OhQ/LJ5qLD8n93JPd W32917lrbiHOeR6o/p/LVUY0gsuqBuAjEcmfRap8EfZnaK8XATCTD7T6LxFiUCTDEeWp06d6G+f zmGFFxlv4GG9CdiViwMKbYP9G8paylTrD+UQXaFpZm/Rj7uyWWtgSY0Cdx22rDeCbVxhqKj8WLm hD1KdSMyP8D3e67XGf+mwVZ4AZZuFTcXnFow8ySwpB+6V1XJE6cHA7x7vH8kFubmi59YndOfPah 0LuEti+ctfkUKvxxuWka5AF3iuaHeGvxPn6Lg5aC7vNKMuINbMQURkF9C0FClm2rEG2vfsVkA8L Ex4PCRE8zN5dLZQRDb/rQGs3hc X-Received: by 2002:a05:6102:579a:b0:738:9c79:750c with SMTP id ada2fe7eead31-744e010f583mr4087196137.15.1783604527331; Thu, 09 Jul 2026 06:42:07 -0700 (PDT) X-Received: by 2002:a05:6102:579a:b0:738:9c79:750c with SMTP id ada2fe7eead31-744e010f583mr4087164137.15.1783604526550; Thu, 09 Jul 2026 06:42:06 -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 38308e7fff4ca-39c849186e1sm3345151fa.9.2026.07.09.06.42.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2026 06:42:04 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 09 Jul 2026 16:41:54 +0300 Subject: [PATCH v7 03/18] media: iris: drop IRIS_FMT_foo enumeration 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: 7bit Message-Id: <20260709-iris-ar50lt-v7-3-76af9dd4d1f6@oss.qualcomm.com> References: <20260709-iris-ar50lt-v7-0-76af9dd4d1f6@oss.qualcomm.com> In-Reply-To: <20260709-iris-ar50lt-v7-0-76af9dd4d1f6@oss.qualcomm.com> To: Vikash Garodia , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Vishnu Reddy Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Dikshita Agarwal X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4455; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=T4eIYBccxXJeZW7OH2Zm0x8+WH27A+FuLPhy+n6Z5fM=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqT6UkC6y03dfoL2gL2Fcssdxok7zymtMG6w1KB CjuKHWyNKCJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCak+lJAAKCRCLPIo+Aiko 1dAhB/97z4/xuC7+0LB1G/OrJulzwP3h8a/2nkFKlFqBXh1nnLB0IVS12gpa8iN0f+nTAZTm+3G Llt49B7giCMHZykD8OcbNgB70rg834GSxnleqLhBr+hs8u/HgTUOzk7Uglt0t26ycbuRWUlG51Y 5QVPoh/itCTTdj2sdcFaByryM92t5A34XATi6Jvx490Q20Tz9TYnh+qPdvJp2pycQ2NNxUP9XNS yDzr2PVaS9Y5s5DV6d0JY3AI396PDJhbCMQJi6mIkkkd6lyWIBd5xt+4nAUn/uNTdTuqWkbXiaC 13C4zH3qqz/UEdEymefaNr+BQqlsVsOQm5vfQoGRHO8BKiDP X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzA5MDEzNCBTYWx0ZWRfX/gOdzeMkST1R f7DiCoEkvnYFlmLjkNdQlWpCr9d5QN5bX59I9ZHhbOIOcdLDX5G/W23YPZz/Ac4WO/ntpF1748U 4JRd6fvateWovO8Dgnis0C1WofO//D5hVKiig+S0AhMWfoapFiBE3npV77T1LDmopbrr4phASi/ 2jEVwc+lUnDbBvjTuQOUhdj4B0czr2O52CcKyJ3Vzk8kGJHtBQgLLBwHDxm4ubjjFyRpNxaOmyl PBuQ9ay+msH8LPdFNseWD1O/IWDArQ75L7fzVGvlMCBu9dzV6m4R8Ep0hy8Gurn1ENJ7AZK0FPg ryRShqNbXUfGOvKb9GLXAmaXq8axKjpeO5pwidlbjN3lF1UrLgkMPIc7/yVPsWJaBc0i01JNx9+ fb+jFqGfd9FEh0Wh1CBYD2oz7/wm+BWUM44+kjQ3fAl9YFAIT3aYfIWkT41WSKXMfHI7ZFAWcYF +7jldCdYX5rswZlpkKQ== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzA5MDEzNCBTYWx0ZWRfX+UCd97hFzUA+ JyrIKFXO83xviYGa7e5g5xeb0o10s3jazfJ89G4Zgm5OuuF9A+68giXwl5XJXz7L2q/ODYF+Pmo yLa1C68q5pCJmyZS6shJYyaUg8snK3E= X-Proofpoint-ORIG-GUID: fDKcbsF0NyfHdXWP2GkrGvYEobQm-vx8 X-Proofpoint-GUID: fDKcbsF0NyfHdXWP2GkrGvYEobQm-vx8 X-Authority-Analysis: v=2.4 cv=Krh9H2WN c=1 sm=1 tr=0 ts=6a4fa530 cx=c_pps a=UbhLPJ621ZpgOD2l3yZY1w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=EUspDBNiAAAA:8 a=Azqn4rg6zLMgtGihcfEA:9 a=QEXdDO2ut3YA:10 a=TOPH6uDL9cOC6tEoww4z:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-09_02,2026-07-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 phishscore=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 suspectscore=0 bulkscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607090134 The IRIS_FMT_foo defines are only used for indexing values in the format enumeration arrays. However this kind of enumeration doesn't follow the V4L2 logic (which expects an array with consequtive indexing rather than a sparse array) and complicates adding support for platforms which support different sets of formats. Drop this enumeration and use flat lists of supported formats. Reviewed-by: Vikash Garodia Signed-off-by: Dmitry Baryshkov --- drivers/media/platform/qcom/iris/iris_instance.h | 14 -------------- drivers/media/platform/qcom/iris/iris_platform_vpu2.c | 6 +++--- drivers/media/platform/qcom/iris/iris_platform_vpu3x.c | 8 ++++---- drivers/media/platform/qcom/iris/iris_vdec.c | 8 ++++---- drivers/media/platform/qcom/iris/iris_venc.c | 8 ++++---- 5 files changed, 15 insertions(+), 29 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_instance.h b/drivers/media/platform/qcom/iris/iris_instance.h index a770331d1675..ffdbbd20901a 100644 --- a/drivers/media/platform/qcom/iris/iris_instance.h +++ b/drivers/media/platform/qcom/iris/iris_instance.h @@ -17,20 +17,6 @@ struct iris_hfi_session_ops; -enum iris_fmt_type_out { - IRIS_FMT_H264, - IRIS_FMT_HEVC, - IRIS_FMT_VP9, - IRIS_FMT_AV1, -}; - -enum iris_fmt_type_cap { - IRIS_FMT_NV12, - IRIS_FMT_QC08C, - IRIS_FMT_TP10, - IRIS_FMT_QC10C, -}; - /** * struct iris_inst - holds per video instance parameters * diff --git a/drivers/media/platform/qcom/iris/iris_platform_vpu2.c b/drivers/media/platform/qcom/iris/iris_platform_vpu2.c index 961dce2e6aa9..ba91672df1bb 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_vpu2.c +++ b/drivers/media/platform/qcom/iris/iris_platform_vpu2.c @@ -35,9 +35,9 @@ static const struct iris_firmware_desc iris_vpu20_p4_gen1_desc = { }; static const u32 iris_fmts_vpu2_dec[] = { - [IRIS_FMT_H264] = V4L2_PIX_FMT_H264, - [IRIS_FMT_HEVC] = V4L2_PIX_FMT_HEVC, - [IRIS_FMT_VP9] = V4L2_PIX_FMT_VP9, + V4L2_PIX_FMT_H264, + V4L2_PIX_FMT_HEVC, + V4L2_PIX_FMT_VP9, }; static struct platform_inst_caps platform_inst_cap_vpu2 = { diff --git a/drivers/media/platform/qcom/iris/iris_platform_vpu3x.c b/drivers/media/platform/qcom/iris/iris_platform_vpu3x.c index 74626b35d9cb..7098b652c117 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_vpu3x.c +++ b/drivers/media/platform/qcom/iris/iris_platform_vpu3x.c @@ -49,10 +49,10 @@ static const struct iris_firmware_desc iris_vpu35_p4_gen2_desc = { }; static const u32 iris_fmts_vpu3x_dec[] = { - [IRIS_FMT_H264] = V4L2_PIX_FMT_H264, - [IRIS_FMT_HEVC] = V4L2_PIX_FMT_HEVC, - [IRIS_FMT_VP9] = V4L2_PIX_FMT_VP9, - [IRIS_FMT_AV1] = V4L2_PIX_FMT_AV1, + V4L2_PIX_FMT_H264, + V4L2_PIX_FMT_HEVC, + V4L2_PIX_FMT_VP9, + V4L2_PIX_FMT_AV1, }; static const struct icc_info iris_icc_info_vpu3x[] = { diff --git a/drivers/media/platform/qcom/iris/iris_vdec.c b/drivers/media/platform/qcom/iris/iris_vdec.c index 9e228b70420e..4c8bc7aac135 100644 --- a/drivers/media/platform/qcom/iris/iris_vdec.c +++ b/drivers/media/platform/qcom/iris/iris_vdec.c @@ -63,10 +63,10 @@ int iris_vdec_inst_init(struct iris_inst *inst) } static const u32 iris_vdec_formats_cap[] = { - [IRIS_FMT_NV12] = V4L2_PIX_FMT_NV12, - [IRIS_FMT_QC08C] = V4L2_PIX_FMT_QC08C, - [IRIS_FMT_TP10] = V4L2_PIX_FMT_P010, - [IRIS_FMT_QC10C] = V4L2_PIX_FMT_QC10C, + V4L2_PIX_FMT_NV12, + V4L2_PIX_FMT_QC08C, + V4L2_PIX_FMT_P010, + V4L2_PIX_FMT_QC10C, }; static bool check_format(struct iris_inst *inst, u32 pixfmt, u32 type) diff --git a/drivers/media/platform/qcom/iris/iris_venc.c b/drivers/media/platform/qcom/iris/iris_venc.c index a945992f63aa..16c52ad07e2c 100644 --- a/drivers/media/platform/qcom/iris/iris_venc.c +++ b/drivers/media/platform/qcom/iris/iris_venc.c @@ -80,13 +80,13 @@ int iris_venc_inst_init(struct iris_inst *inst) } static const u32 iris_venc_formats_cap[] = { - [IRIS_FMT_H264] = V4L2_PIX_FMT_H264, - [IRIS_FMT_HEVC] = V4L2_PIX_FMT_HEVC, + V4L2_PIX_FMT_H264, + V4L2_PIX_FMT_HEVC, }; static const u32 iris_venc_formats_out[] = { - [IRIS_FMT_NV12] = V4L2_PIX_FMT_NV12, - [IRIS_FMT_QC08C] = V4L2_PIX_FMT_QC08C, + V4L2_PIX_FMT_NV12, + V4L2_PIX_FMT_QC08C, }; static bool check_format(struct iris_inst *inst, u32 pixfmt, u32 type) -- 2.47.3