NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

Revert "libcamera: rkisp1: Eliminate hard-coded resizer limits"

Browse source 
This reverts commit e85c7ddd38.

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 restore the hard-coded resizer limits as fallbacks, actual limits
are still queried from the driver on recent enough kernels.

Fixes: 761545407c ("pipeline: rkisp1: Filter out sensor sizes not supported by the pipeline")
Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Quentin Schulz 2025-04-03 20:09:00 +02:00 • committed by Laurent Pinchart
parent 5b73d25967
commit 6e24360d3f
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/libcamera/pipeline/rkisp1/rkisp1_path.cpp
View file

@ -54,8 +54,11 @@ const std::map<PixelFormat, uint32_t> formatToMediaBus = {
} /* namespace */ } /* namespace */
RkISP1Path::RkISP1Path(const char *name, const Span<const PixelFormat> &formats) RkISP1Path::RkISP1Path(const char *name, const Span<const PixelFormat> &formats,
: name_(name), running_(false), formats_(formats), link_(nullptr) 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 * \todo Remove the hardcoded resolutions and formats once kernels older than
* recent enough kernel. * v6.4 will stop receiving LTS support (scheduled for December 2027 for v6.1).
*/ */
namespace { namespace {
constexpr Size RKISP1_RSZ_MP_SRC_MIN{ 32, 16 };
constexpr Size RKISP1_RSZ_MP_SRC_MAX{ 4416, 3312 };
constexpr std::array<PixelFormat, 18> RKISP1_RSZ_MP_FORMATS{ constexpr std::array<PixelFormat, 18> RKISP1_RSZ_MP_FORMATS{
formats::YUYV, formats::YUYV,
formats::NV16, formats::NV16,
@ -542,6 +547,8 @@ constexpr std::array<PixelFormat, 18> RKISP1_RSZ_MP_FORMATS{
formats::SRGGB12, formats::SRGGB12,
}; };
constexpr Size RKISP1_RSZ_SP_SRC_MIN{ 32, 16 };
constexpr Size RKISP1_RSZ_SP_SRC_MAX{ 1920, 1920 };
constexpr std::array<PixelFormat, 8> RKISP1_RSZ_SP_FORMATS{ constexpr std::array<PixelFormat, 8> RKISP1_RSZ_SP_FORMATS{
formats::YUYV, formats::YUYV,
formats::NV16, formats::NV16,
@ -555,12 +562,14 @@ constexpr std::array<PixelFormat, 8> RKISP1_RSZ_SP_FORMATS{
} /* namespace */ } /* namespace */
RkISP1MainPath::RkISP1MainPath() 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() RkISP1SelfPath::RkISP1SelfPath()
: RkISP1Path("self", RKISP1_RSZ_SP_FORMATS) : RkISP1Path("self", RKISP1_RSZ_SP_FORMATS,
RKISP1_RSZ_SP_SRC_MIN, RKISP1_RSZ_SP_SRC_MAX)
{ {
} }

3
src/libcamera/pipeline/rkisp1/rkisp1_path.h
View file

@ -34,7 +34,8 @@ struct V4L2SubdeviceFormat;
class RkISP1Path class RkISP1Path
{ {
public: public:
RkISP1Path(const char *name, const Span<const PixelFormat> &formats); RkISP1Path(const char *name, const Span<const PixelFormat> &formats,
const Size &minResolution, const Size &maxResolution);
bool init(MediaDevice *media); bool init(MediaDevice *media);