From nobody Sun Nov 24 16:53:23 2024 Received: from mx08-00178001.pphosted.com (mx08-00178001.pphosted.com [91.207.212.93]) (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 59BB71B86DC; Mon, 18 Nov 2024 13:40:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.207.212.93 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731937221; cv=none; b=UQCOi4l4MesiNl6nEpJV/RliYE0omfbBGrG1wjaGx5d9M2onBKrBbyw/Uu40+PXjPRIMOBDae3Uijw7FFIWizif+XFPy4wmcM00WMAq3TbRNykLQ5LsER74dwTv5xA+RsTDJP0csmBZOu1R/hdt9/p3Tu2UqeinXdngh6Zy69YQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731937221; c=relaxed/simple; bh=Qp2LhD+mvheCt9M8icvw5D+LfrU+/8Xoq/mwVn1OEFI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=lbWS8PFmA968mGdOfi27UCpg3ruRnc7D5RT32AvD9O+EXV/e45YhIz/X42LHVGiwc4ZfZ1eh8nHBvr/su+68v7kO4EPrT4mAbFiQ2uAczJPeQmdoRd1RX16QUUG2E1RpYZXTVC0mNGfYnw1D79tVVuJXTDn9p643Z+df2lt9inU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=foss.st.com; spf=pass smtp.mailfrom=foss.st.com; dkim=pass (2048-bit key) header.d=foss.st.com header.i=@foss.st.com header.b=0jSLLrLH; arc=none smtp.client-ip=91.207.212.93 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=foss.st.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=foss.st.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=foss.st.com header.i=@foss.st.com header.b="0jSLLrLH" Received: from pps.filterd (m0369457.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4AIBUIsZ010521; Mon, 18 Nov 2024 14:39:53 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=selector1; bh= VXDDwUFZyaE/RsM7y+LjqGPAbZCI0j8Q6ZVfXNBJ3xs=; b=0jSLLrLH76MZWCQf 4R4UlggCkN7lTg800E5B4mO6wX8eAYEClZJR5gEsqYzbTgAF3wzMVbu/zBMoGLkB keies0quVzK1vI6zqkEJ8qsRZ2P9OrY5CzSfMV2mOoxrBJIqh8Wv27K1ineOzTD2 NyswxktFSI8hc45PQl4WvosWh/XjdelGfXhoaMhm4pjQjVrhz0mLCIzSJ56M0f7M rFe/eVmESrH5IekAdvKNksmVA16ffXOd2JiKbFG6/e3sBkl77bC4wmVdrcD1tQJk oEB0QJ7Bml090fqMSWS+dsRxYbHDxPPloBuCT202+Dzwe9Av8Xy06JX+ORMKm+uv sBwHRg== Received: from beta.dmz-ap.st.com (beta.dmz-ap.st.com [138.198.100.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 42y77n504t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 18 Nov 2024 14:39:52 +0100 (CET) Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 7225C40061; Mon, 18 Nov 2024 14:38:33 +0100 (CET) Received: from Webmail-eu.st.com (shfdag1node1.st.com [10.75.129.69]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 6135C275655; Mon, 18 Nov 2024 14:35:32 +0100 (CET) Received: from localhost (10.129.178.213) by SHFDAG1NODE1.st.com (10.75.129.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.37; Mon, 18 Nov 2024 14:35:32 +0100 From: Alain Volmat Date: Mon, 18 Nov 2024 14:35:33 +0100 Subject: [PATCH v3 10/15] media: stm32: dcmipp: avoid duplicated format on enum in bytecap 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: <20241118-csi_dcmipp_mp25-v3-10-c1914afb0a0f@foss.st.com> References: <20241118-csi_dcmipp_mp25-v3-0-c1914afb0a0f@foss.st.com> In-Reply-To: <20241118-csi_dcmipp_mp25-v3-0-c1914afb0a0f@foss.st.com> To: Hugues Fruchet , Mauro Carvalho Chehab , Maxime Coquelin , Alexandre Torgue , Hans Verkuil , Sakari Ailus , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel CC: , , , , , Alain Volmat X-Mailer: b4 0.14.2 X-ClientProxiedBy: EQNCAS1NODE3.st.com (10.75.129.80) To SHFDAG1NODE1.st.com (10.75.129.69) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-06_09,2024-09-06_01,2024-09-02_01 Avoid duplication of enumerated pixelformat on the bytecap video capture device. Indeed, since the bytecap format list contains both CSI & parallel 16bits formats, ensure that same pixelformat are not reported twice when performing enumeration of supported formats. Signed-off-by: Alain Volmat --- .../st/stm32/stm32-dcmipp/dcmipp-bytecap.c | 42 +++++++++++-------= ---- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-bytecap.c = b/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-bytecap.c index 99732d19dc4d5f4692588118eadb236d4ed9c8a1..8f5f69a3afc413b49d82303cd4d= 98da15f62e34d 100644 --- a/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-bytecap.c +++ b/drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-bytecap.c @@ -268,34 +268,34 @@ static int dcmipp_bytecap_enum_fmt_vid_cap(struct fil= e *file, void *priv, { const struct dcmipp_bytecap_pix_map *vpix; unsigned int index =3D f->index; - unsigned int i; + unsigned int i, prev_pixelformat =3D 0; =20 - if (f->mbus_code) { - /* - * If a media bus code is specified, only enumerate formats - * compatible with it. - */ - for (i =3D 0; i < ARRAY_SIZE(dcmipp_bytecap_pix_map_list); i++) { - vpix =3D &dcmipp_bytecap_pix_map_list[i]; - if (vpix->code !=3D f->mbus_code) - continue; + /* + * List up all formats (or only ones matching f->mbus_code), taking + * care of removing duplicated entries (due to support of both + * parallel & csi 16 bits formats + */ + for (i =3D 0; i < ARRAY_SIZE(dcmipp_bytecap_pix_map_list); i++) { + vpix =3D &dcmipp_bytecap_pix_map_list[i]; + /* Skip formats not matching requested mbus code */ + if (f->mbus_code && vpix->code !=3D f->mbus_code) + continue; =20 - if (index =3D=3D 0) - break; + /* Skip duplicated pixelformat */ + if (vpix->pixelformat =3D=3D prev_pixelformat) + continue; =20 - index--; - } + prev_pixelformat =3D vpix->pixelformat; =20 - if (i =3D=3D ARRAY_SIZE(dcmipp_bytecap_pix_map_list)) - return -EINVAL; - } else { - /* Otherwise, enumerate all formats. */ - if (f->index >=3D ARRAY_SIZE(dcmipp_bytecap_pix_map_list)) - return -EINVAL; + if (index =3D=3D 0) + break; =20 - vpix =3D &dcmipp_bytecap_pix_map_list[f->index]; + index--; } =20 + if (i =3D=3D ARRAY_SIZE(dcmipp_bytecap_pix_map_list)) + return -EINVAL; + f->pixelformat =3D vpix->pixelformat; =20 return 0; --=20 2.25.1