[libcamera-devel,v4,18/19] libcamera: ipu3: Configure ImgU with the computed parameters
diff mbox series

Message ID 20200720104736.19986-19-jacopo@jmondi.org
State Accepted
Headers show
Series
  • ipu3: rework pipe confiuguration
Related show

Commit Message

Jacopo Mondi July 20, 2020, 10:47 a.m. UTC 
Instrument the ImgUDevice::configureInput() function to use the provided
pipe configuration parameters to configure the IF, BDS and GDC
rectangles.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
---
 src/libcamera/pipeline/ipu3/imgu.    |  0
 src/libcamera/pipeline/ipu3/imgu.cpp | 26 +++++++++++++-------------
 src/libcamera/pipeline/ipu3/imgu.h   |  2 +-
 src/libcamera/pipeline/ipu3/ipu3.cpp | 16 +++++++++++++++-
 4 files changed, 29 insertions(+), 15 deletions(-)
 create mode 100644 src/libcamera/pipeline/ipu3/imgu.

Patch
diff mbox series 

diff --git a/src/libcamera/pipeline/ipu3/imgu. b/src/libcamera/pipeline/ipu3/imgu.
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp
index 17b749435ee2..ad51a64a84e4 100644
--- a/src/libcamera/pipeline/ipu3/imgu.cpp
+++ b/src/libcamera/pipeline/ipu3/imgu.cpp
@@ -425,11 +425,11 @@  ImgUDevice::PipeConfig ImgUDevice::calculatePipeConfig(Pipe *pipe)
 
 /**
  * \brief Configure the ImgU unit input
- * \param[in] size The ImgU input frame size
+ * \param[in] config The ImgU pipe configuration parameters
  * \param[in] inputFormat The format to be applied to ImgU input
  * \return 0 on success or a negative error code otherwise
  */
-int ImgUDevice::configureInput(const Size &size,
+int ImgUDevice::configureInput(const PipeConfig &pipeConfig,
 			       V4L2DeviceFormat *inputFormat)
 {
 	/* Configure the ImgU input video device with the requested sizes. */
@@ -449,27 +449,27 @@  int ImgUDevice::configureInput(const Size &size,
 	 * to configure the crop/compose rectangles, contradicting the
 	 * V4L2 specification.
 	 */
-	Rectangle rect{ 0, 0, inputFormat->size };
-	ret = imgu_->setSelection(PAD_INPUT, V4L2_SEL_TGT_CROP, &rect);
+	Rectangle iif{ 0, 0, pipeConfig.iif };
+	ret = imgu_->setSelection(PAD_INPUT, V4L2_SEL_TGT_CROP, &iif);
 	if (ret)
 		return ret;
+	LOG(IPU3, Debug) << "ImgU IF rectangle = " << iif.toString();
 
-	ret = imgu_->setSelection(PAD_INPUT, V4L2_SEL_TGT_COMPOSE, &rect);
+	Rectangle bds{ 0, 0, pipeConfig.bds };
+	ret = imgu_->setSelection(PAD_INPUT, V4L2_SEL_TGT_COMPOSE, &bds);
 	if (ret)
 		return ret;
+	LOG(IPU3, Debug) << "ImgU BDS rectangle = " << bds.toString();
 
-	LOG(IPU3, Debug) << "ImgU input feeder and BDS rectangle = "
-			 << rect.toString();
+	V4L2SubdeviceFormat gdcFormat = {};
+	gdcFormat.mbus_code = MEDIA_BUS_FMT_FIXED;
+	gdcFormat.size = pipeConfig.gdc;
 
-	V4L2SubdeviceFormat imguFormat = {};
-	imguFormat.mbus_code = MEDIA_BUS_FMT_FIXED;
-	imguFormat.size = size;
-
-	ret = imgu_->setFormat(PAD_INPUT, &imguFormat);
+	ret = imgu_->setFormat(PAD_INPUT, &gdcFormat);
 	if (ret)
 		return ret;
 
-	LOG(IPU3, Debug) << "ImgU GDC format = " << imguFormat.toString();
+	LOG(IPU3, Debug) << "ImgU GDC format = " << gdcFormat.toString();
 
 	return 0;
 }
diff --git a/src/libcamera/pipeline/ipu3/imgu.h b/src/libcamera/pipeline/ipu3/imgu.h
index 0b2dd1f965c1..91715c78fa83 100644
--- a/src/libcamera/pipeline/ipu3/imgu.h
+++ b/src/libcamera/pipeline/ipu3/imgu.h
@@ -45,7 +45,7 @@  public:
 
 	PipeConfig calculatePipeConfig(Pipe *pipe);
 
-	int configureInput(const Size &size, V4L2DeviceFormat *inputFormat);
+	int configureInput(const PipeConfig &pipeConfig, V4L2DeviceFormat *inputFormat);
 
 	int configureOutput(const StreamConfiguration &cfg,
 			    V4L2DeviceFormat *outputFormat)
diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
index 5237c3b306df..d7c0076a57e3 100644
--- a/src/libcamera/pipeline/ipu3/ipu3.cpp
+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
@@ -67,6 +67,7 @@  public:
 	Status validate() override;
 
 	const StreamConfiguration &cio2Format() const { return cio2Configuration_; };
+	const ImgUDevice::PipeConfig imguConfig() const { return pipeConfig_; }
 
 private:
 	/*
@@ -461,7 +462,20 @@  int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)
 	if (ret)
 		return ret;
 
-	ret = imgu->configureInput(sensorSize, &cio2Format);
+	/*
+	 * If the ImgU gets configured with proper IF, BDS and GDC sizes, it
+	 * is then expected that frames are dequeued from its main output
+	 * otherwise the system stalls.
+	 *
+	 * If no ImgU configuration has been computed, it means only a RAW
+	 * stream has been requested: return here to skip the ImgU configuration
+	 * part.
+	 */
+	ImgUDevice::PipeConfig imguConfig = config->imguConfig();
+	if (imguConfig.isNull())
+		return 0;
+
+	ret = imgu->configureInput(imguConfig, &cio2Format);
 	if (ret)
 		return ret;