From 258c74819a43bb9862c84ebc72d0502d007fde30 Mon Sep 17 00:00:00 2001
From: Umang Jain <umang.jain@ideasonboard.com>
Date: Wed, 26 May 2021 17:18:14 +0530
Subject: ipa: ipu3: Rectify ControlInfoMap matching in IPAConfigInfo

The ControlInfoMap of entityControls member in IPAConfigInfo struct,
was not able to correctly match to the ControlInfoMap defined in
core.mojom. This resulted in a FATAL breakage when IPU3 IPA is meant to
run:

 FATAL IPADataSerializer ipa_data_serializer.cpp:437 ControlSerializer
 not provided for serialization of ControlInfoMap

Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 include/libcamera/ipa/ipu3.mojom | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/libcamera/ipa/ipu3.mojom b/include/libcamera/ipa/ipu3.mojom
index 6b6b431f..32c046ad 100644
--- a/include/libcamera/ipa/ipu3.mojom
+++ b/include/libcamera/ipa/ipu3.mojom
@@ -32,7 +32,7 @@ struct IPU3Action {
 
 struct IPAConfigInfo {
 	libcamera.IPACameraSensorInfo sensorInfo;
-	map<uint32, ControlInfoMap> entityControls;
+	map<uint32, libcamera.ControlInfoMap> entityControls;
 	libcamera.Size bdsOutputSize;
 	libcamera.Size iif;
 };
-- 
cgit v1.2.1