From 40ed8b3b75aa518226bbe35f6216797d4832341e Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Mon, 29 Jun 2020 00:42:20 +0300
Subject: ipa: raspberrypi: Pass lens shading table through configure()
 function
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The IPAInterface::configure() function now accepts custom configuration
data. Use it to pass the lens shading table instead of using a custom
IPA event. This will allow starting the IPA when starting the camera,
instead of pre-starting it early in order to process the lens shading
table allocation event.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Naushir Patuck <naush@raspberrypi.com>
---
 include/libcamera/ipa/raspberrypi.h                |  5 ++++-
 src/ipa/raspberrypi/raspberrypi.cpp                | 12 ++++++------
 src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 10 ++++------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/include/libcamera/ipa/raspberrypi.h b/include/libcamera/ipa/raspberrypi.h
index a18ce9a8..46ce7c28 100644
--- a/include/libcamera/ipa/raspberrypi.h
+++ b/include/libcamera/ipa/raspberrypi.h
@@ -10,6 +10,10 @@
 #include <libcamera/control_ids.h>
 #include <libcamera/controls.h>
 
+enum RPiConfigParameters {
+	RPI_IPA_CONFIG_LS_TABLE = (1 << 0),
+};
+
 enum RPiOperations {
 	RPI_IPA_ACTION_V4L2_SET_STAGGERED = 1,
 	RPI_IPA_ACTION_V4L2_SET_ISP,
@@ -21,7 +25,6 @@ enum RPiOperations {
 	RPI_IPA_EVENT_SIGNAL_STAT_READY,
 	RPI_IPA_EVENT_SIGNAL_ISP_PREPARE,
 	RPI_IPA_EVENT_QUEUE_REQUEST,
-	RPI_IPA_EVENT_LS_TABLE_ALLOCATION,
 };
 
 enum RPiIpaMask {
diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp
index 851597f0..b412260b 100644
--- a/src/ipa/raspberrypi/raspberrypi.cpp
+++ b/src/ipa/raspberrypi/raspberrypi.cpp
@@ -272,6 +272,12 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,
 		applyAGC(&agcStatus);
 
 	lastMode_ = mode_;
+
+	/* Store the lens shading table pointer and handle if available. */
+	if (ipaConfig.operation & RPI_IPA_CONFIG_LS_TABLE) {
+		lsTable_ = reinterpret_cast<void *>(ipaConfig.data[0]);
+		lsTableHandle_ = ipaConfig.data[1];
+	}
 }
 
 void IPARPi::mapBuffers(const std::vector<IPABuffer> &buffers)
@@ -354,12 +360,6 @@ void IPARPi::processEvent(const IPAOperationData &event)
 		break;
 	}
 
-	case RPI_IPA_EVENT_LS_TABLE_ALLOCATION: {
-		lsTable_ = reinterpret_cast<void *>(event.data[0]);
-		lsTableHandle_ = event.data[1];
-		break;
-	}
-
 	default:
 		LOG(IPARPI, Error) << "Unknown event " << event.operation;
 		break;
diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
index 12241590..dfcc7506 100644
--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
@@ -1121,6 +1121,7 @@ int RPiCameraData::configureIPA()
 {
 	std::map<unsigned int, IPAStream> streamConfig;
 	std::map<unsigned int, const ControlInfoMap &> entityControls;
+	IPAOperationData ipaConfig = {};
 
 	/* Get the device format to pass to the IPA. */
 	V4L2DeviceFormat sensorFormat;
@@ -1155,11 +1156,9 @@ int RPiCameraData::configureIPA()
 		 * IPA module isolation and should be reworked when vc_sma_cma
 		 * will permit.
 		 */
-		IPAOperationData op;
-		op.operation = RPI_IPA_EVENT_LS_TABLE_ALLOCATION;
-		op.data = { static_cast<uint32_t>(ptr & 0xffffffff),
-			    vcsm_.getVCHandle(lsTable_) };
-		ipa_->processEvent(op);
+		ipaConfig.operation = RPI_IPA_CONFIG_LS_TABLE;
+		ipaConfig.data = { static_cast<uint32_t>(ptr & 0xffffffff),
+				   vcsm_.getVCHandle(lsTable_) };
 	}
 
 	CameraSensorInfo sensorInfo = {};
@@ -1170,7 +1169,6 @@ int RPiCameraData::configureIPA()
 	}
 
 	/* Ready the IPA - it must know about the sensor resolution. */
-	IPAOperationData ipaConfig;
 	ipa_->configure(sensorInfo, streamConfig, entityControls, ipaConfig,
 			nullptr);
 
-- 
cgit v1.2.1