[v2,2/2] libcamera: pipeline: simple: Do not alloc CMA DMA-buffers for camss and ipu6/7
diff mbox series

Message ID 20261030141936.45238-2-johannes.goede@oss.qualcomm.com
State New
Headers show
Series
  • [v2,1/2] libcamera: software_isp: Add AllocCmaDmaBuffers constructor flag
Related show

Commit Message

Hans de Goede Oct. 30, 2026, 2:19 p.m. UTC 
On Qualcomm platforms with the camss CSI receiver block it is not necessary
to allocate DMA-buffers from CMA and doing so may lead to starvation of
the CMA pool for other processes.

On Intel IPU6 / IPU7 there typically is no CMA memory reservation at all so
trying to use memory from there is not useful.

Reported-by: Wenmeng Liu <wenmeng.liu@oss.qualcomm.com>
Closes: https://lists.libcamera.org/pipermail/libcamera-devel/2026-September/062125.html
Reviewed-by: Milan Zamazal <mzamazal@redhat.com>
Signed-off-by: Hans de Goede <johannes.goede@oss.qualcomm.com>
---
 src/libcamera/pipeline/simple/simple.cpp | 25 ++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

Patch
diff mbox series 

diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp
index b645227bc..cf419e811 100644
--- a/src/libcamera/pipeline/simple/simple.cpp
+++ b/src/libcamera/pipeline/simple/simple.cpp
@@ -252,20 +252,22 @@  struct SimplePipelineInfo {
 	 * The Software ISP can't be used together with the converters.
 	 */
 	bool swIspAllowed;
+	/* Flags controlling Software ISP behavior. */
+	SoftwareIsp::SoftwareIspFlags swIspFlags;
 };
 
 namespace {
 
 static const SimplePipelineInfo supportedDevices[] = {
-	{ "dcmipp", {}, false },
-	{ "imx7-csi", { { "pxp", 1 } }, true },
-	{ "intel-ipu6", {}, true },
-	{ "intel-ipu7", {}, true },
-	{ "j721e-csi2rx", {}, true },
-	{ "mtk-seninf", { { "mtk-mdp", 3 } }, false },
-	{ "mxc-isi", {}, false },
-	{ "qcom-camss", {}, true },
-	{ "sun6i-csi", {}, false },
+	{ "dcmipp", {}, false, {} },
+	{ "imx7-csi", { { "pxp", 1 } }, true, SoftwareIsp::SoftwareIspFlag::AllocCmaDmaBuffers },
+	{ "intel-ipu6", {}, true, {} },
+	{ "intel-ipu7", {}, true, {} },
+	{ "j721e-csi2rx", {}, true, SoftwareIsp::SoftwareIspFlag::AllocCmaDmaBuffers },
+	{ "mtk-seninf", { { "mtk-mdp", 3 } }, false, {} },
+	{ "mxc-isi", {}, false, {} },
+	{ "qcom-camss", {}, true, {} },
+	{ "sun6i-csi", {}, false, {} },
 };
 
 bool isRaw(const StreamConfiguration &cfg)
@@ -430,6 +432,7 @@  public:
 	V4L2Subdevice *subdev(const MediaEntity *entity);
 	std::shared_ptr<MediaDevice> converter() { return converter_; }
 	bool swIspEnabled() const { return swIspEnabled_; }
+	SoftwareIsp::SoftwareIspFlags swIspFlags() const { return swIspFlags_; }
 
 protected:
 	int queueRequestDevice(Camera *camera, Request *request) override;
@@ -463,6 +466,7 @@  private:
 
 	std::shared_ptr<MediaDevice> converter_;
 	bool swIspEnabled_ = false;
+	SoftwareIsp::SoftwareIspFlags swIspFlags_;
 };
 
 /* -----------------------------------------------------------------------------
@@ -619,7 +623,7 @@  int SimpleCameraData::init()
 	 */
 	if (!converter_ && pipe->swIspEnabled()) {
 		swIsp_ = std::make_unique<SoftwareIsp>(pipe, sensor_.get(),
-						       SoftwareIsp::SoftwareIspFlag::AllocCmaDmaBuffers,
+						       pipe->swIspFlags(),
 						       &controlInfo_);
 		if (!swIsp_->isValid()) {
 			LOG(SimplePipeline, Warning)
@@ -1964,6 +1968,7 @@  bool SimplePipelineHandler::matchDevice(std::shared_ptr<MediaDevice> media,
 		 */
 		numStreams = 2;
 		swIspEnabled_ = true;
+		swIspFlags_ = info.swIspFlags;
 	} else if (converter.dev) {
 		converter_ = std::move(converter.dev);
 		numStreams = converter.streams;