From 85c5c47325ab7e5017e6e98421be0e18fcf69be2 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Thu, 21 Jul 2022 13:13:02 +0100
Subject: ipa: ipu3: Use the FCQueue

Replace the manual ring buffer implementation with the FCQueue class
from libipa.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
---
 src/ipa/ipu3/ipa_context.h | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'src/ipa/ipu3/ipa_context.h')

diff --git a/src/ipa/ipu3/ipa_context.h b/src/ipa/ipu3/ipa_context.h
index e8fc4276..bfc0196e 100644
--- a/src/ipa/ipu3/ipa_context.h
+++ b/src/ipa/ipu3/ipa_context.h
@@ -8,8 +8,6 @@
 
 #pragma once
 
-#include <array>
-
 #include <linux/intel-ipu3.h>
 
 #include <libcamera/base/utils.h>
@@ -23,9 +21,6 @@ namespace libcamera {
 
 namespace ipa::ipu3 {
 
-/* Maximum number of frame contexts to be held */
-static constexpr uint32_t kMaxFrameContexts = 16;
-
 struct IPASessionConfiguration {
 	struct {
 		ipu3_uapi_grid_config bdsGrid;
@@ -79,9 +74,6 @@ struct IPAActiveState {
 };
 
 struct IPAFrameContext : public FrameContext {
-	IPAFrameContext();
-	IPAFrameContext(const ControlList &reqControls);
-
 	struct {
 		uint32_t exposure;
 		double gain;
@@ -94,7 +86,7 @@ struct IPAContext {
 	IPASessionConfiguration configuration;
 	IPAActiveState activeState;
 
-	std::array<IPAFrameContext, kMaxFrameContexts> frameContexts;
+	FCQueue<IPAFrameContext> frameContexts;
 };
 
 } /* namespace ipa::ipu3 */
-- 
cgit v1.2.1