From patchwork Thu Apr 3 18:09:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 23133 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id D770AC3213 for ; Thu, 3 Apr 2025 18:09:36 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 16A2A68994; Thu, 3 Apr 2025 20:09:36 +0200 (CEST) Received: from smtp-190e.mail.infomaniak.ch (smtp-190e.mail.infomaniak.ch [IPv6:2001:1600:4:17::190e]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C463768980 for ; Thu, 3 Apr 2025 20:09:33 +0200 (CEST) Received: from smtp-3-0001.mail.infomaniak.ch (smtp-3-0001.mail.infomaniak.ch [10.4.36.108]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4ZT8rs4G2ZzJ1w; Thu, 3 Apr 2025 20:09:33 +0200 (CEST) Received: from unknown by smtp-3-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4ZT8rs01wHzXkK; Thu, 3 Apr 2025 20:09:32 +0200 (CEST) From: Quentin Schulz To: Cc: Umang Jain , libcamera-devel@lists.libcamera.org, Quentin Schulz Subject: [PATCH] Revert "libcamera: rkisp1: Eliminate hard-coded resizer limits" Date: Thu, 3 Apr 2025 20:09:00 +0200 Message-ID: <20250403180902.484863-1-foss+libcamera@0leil.net> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-Infomaniak-Routing: alpha X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Quentin Schulz This reverts commit e85c7ddd38ce8456ab01c2a73baf9e788f6a462e. Linux kernel predating 6.4 (specifically commit 7cfb35d3a800 ("media: rkisp1: Implement ENUM_FRAMESIZES") do not have the ioctl in rkisp1 driver required to dynamically query the resizer limits. Because of that, maxResolution and minResolution are both {0, 0} (default value for Size objects) which means filterSensorResolution() will create an entry for the sensor in sensorSizesMap_ but because the sensor resolution cannot fit inside the min and max resolution of the rkisp1, no size is put into this entry in sensorSizesMap_. On the next call to filterSensorResolution(), sensorSizesMap_.find(sensor) will return the entry but when attempting to call back() on iter->second, it'll trigger an assert because the size array is empty. Linux kernel 6.1 is supported until December 2027, so it seems premature to get rid of those hard-coded resizer limits before this happens. Let's keep the hard-coded resizer limits by default, they can still be queried if necessary. Fixes: 761545407c76 ("pipeline: rkisp1: Filter out sensor sizes not supported by the pipeline") Signed-off-by: Quentin Schulz Reviewed-by: Jacopo Mondi --- src/libcamera/pipeline/rkisp1/rkisp1_path.cpp | 21 +++++++++++++------ src/libcamera/pipeline/rkisp1/rkisp1_path.h | 3 ++- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp index eee5b09e..d43f31e1 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp @@ -54,8 +54,11 @@ const std::map formatToMediaBus = { } /* namespace */ -RkISP1Path::RkISP1Path(const char *name, const Span &formats) - : name_(name), running_(false), formats_(formats), link_(nullptr) +RkISP1Path::RkISP1Path(const char *name, const Span &formats, + const Size &minResolution, const Size &maxResolution) + : name_(name), running_(false), formats_(formats), + minResolution_(minResolution), maxResolution_(maxResolution), + link_(nullptr) { } @@ -517,10 +520,12 @@ void RkISP1Path::stop() } /* - * \todo Remove the hardcoded formats once all users will have migrated to a - * recent enough kernel. + * \todo Remove the hardcoded resolutions and formats once all users will have + * migrated to a recent enough kernel. */ namespace { +constexpr Size RKISP1_RSZ_MP_SRC_MIN{ 32, 16 }; +constexpr Size RKISP1_RSZ_MP_SRC_MAX{ 4416, 3312 }; constexpr std::array RKISP1_RSZ_MP_FORMATS{ formats::YUYV, formats::NV16, @@ -542,6 +547,8 @@ constexpr std::array RKISP1_RSZ_MP_FORMATS{ formats::SRGGB12, }; +constexpr Size RKISP1_RSZ_SP_SRC_MIN{ 32, 16 }; +constexpr Size RKISP1_RSZ_SP_SRC_MAX{ 1920, 1920 }; constexpr std::array RKISP1_RSZ_SP_FORMATS{ formats::YUYV, formats::NV16, @@ -555,12 +562,14 @@ constexpr std::array RKISP1_RSZ_SP_FORMATS{ } /* namespace */ RkISP1MainPath::RkISP1MainPath() - : RkISP1Path("main", RKISP1_RSZ_MP_FORMATS) + : RkISP1Path("main", RKISP1_RSZ_MP_FORMATS, + RKISP1_RSZ_MP_SRC_MIN, RKISP1_RSZ_MP_SRC_MAX) { } RkISP1SelfPath::RkISP1SelfPath() - : RkISP1Path("self", RKISP1_RSZ_SP_FORMATS) + : RkISP1Path("self", RKISP1_RSZ_SP_FORMATS, + RKISP1_RSZ_SP_SRC_MIN, RKISP1_RSZ_SP_SRC_MAX) { } diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.h b/src/libcamera/pipeline/rkisp1/rkisp1_path.h index 2a1ef0ab..430181d3 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1_path.h +++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.h @@ -34,7 +34,8 @@ struct V4L2SubdeviceFormat; class RkISP1Path { public: - RkISP1Path(const char *name, const Span &formats); + RkISP1Path(const char *name, const Span &formats, + const Size &minResolution, const Size &maxResolution); bool init(MediaDevice *media);