aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHirokazu Honda <hiroh@chromium.org>2021-05-13 11:29:45 +0900
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-05-24 05:55:42 +0300
commit89dae58449648660e586322059de1cbe760832f9 (patch)
tree6dbda27b40130c398e5232f9e20e898c82e6023a
parentfd1cbe84476b25b458c3dbe78ec6c55e774ce435 (diff)
libcamera: pipeline: ipu3: Store requests in the case a buffer shortage
PipelineHandlerIPU3 returns -ENOBUFS and -ENOMEM on queueing a request when there are not sufficient buffers for the request. Since the request will be successful if it is queued later when enough buffers are available. The requests failed due to a buffer shortage should be stored and retried later in the FIFO order. This introduces the queue in IPU3CameraData to do that. Signed-off-by: Hirokazu Honda <hiroh@chromium.org> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-rw-r--r--src/libcamera/pipeline/ipu3/cio2.cpp2
-rw-r--r--src/libcamera/pipeline/ipu3/frames.cpp4
-rw-r--r--src/libcamera/pipeline/ipu3/ipu3.cpp80
3 files changed, 63 insertions, 23 deletions
diff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp
index 3cd777d1..8bbef174 100644
--- a/src/libcamera/pipeline/ipu3/cio2.cpp
+++ b/src/libcamera/pipeline/ipu3/cio2.cpp
@@ -272,7 +272,7 @@ FrameBuffer *CIO2Device::queueBuffer(Request *request, FrameBuffer *rawBuffer)
/* If no buffer is provided in the request, use an internal one. */
if (!buffer) {
if (availableBuffers_.empty()) {
- LOG(IPU3, Error) << "CIO2 buffer underrun";
+ LOG(IPU3, Debug) << "CIO2 buffer underrun";
return nullptr;
}
diff --git a/src/libcamera/pipeline/ipu3/frames.cpp b/src/libcamera/pipeline/ipu3/frames.cpp
index d0f55ab9..29d9aafc 100644
--- a/src/libcamera/pipeline/ipu3/frames.cpp
+++ b/src/libcamera/pipeline/ipu3/frames.cpp
@@ -44,12 +44,12 @@ IPU3Frames::Info *IPU3Frames::create(Request *request)
unsigned int id = request->sequence();
if (availableParamBuffers_.empty()) {
- LOG(IPU3, Error) << "Parameters buffer underrun";
+ LOG(IPU3, Debug) << "Parameters buffer underrun";
return nullptr;
}
if (availableStatBuffers_.empty()) {
- LOG(IPU3, Error) << "Statistics buffer underrun";
+ LOG(IPU3, Debug) << "Statistics buffer underrun";
return nullptr;
}
diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
index ade8ffbd..6961d498 100644
--- a/src/libcamera/pipeline/ipu3/ipu3.cpp
+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
@@ -66,6 +66,8 @@ public:
void cio2BufferReady(FrameBuffer *buffer);
void paramBufferReady(FrameBuffer *buffer);
void statBufferReady(FrameBuffer *buffer);
+ void queuePendingRequests();
+ void cancelPendingRequests();
CIO2Device cio2_;
ImgUDevice *imgu_;
@@ -84,6 +86,8 @@ public:
std::unique_ptr<ipa::ipu3::IPAProxyIPU3> ipa_;
+ std::queue<Request *> pendingRequests_;
+
private:
void queueFrameAction(unsigned int id,
const ipa::ipu3::IPU3Action &action);
@@ -764,6 +768,8 @@ void PipelineHandlerIPU3::stop(Camera *camera)
IPU3CameraData *data = cameraData(camera);
int ret = 0;
+ data->cancelPendingRequests();
+
data->ipa_->stop();
ret |= data->imgu_->stop();
@@ -774,32 +780,66 @@ void PipelineHandlerIPU3::stop(Camera *camera)
freeBuffers(camera);
}
-int PipelineHandlerIPU3::queueRequestDevice(Camera *camera, Request *request)
+void IPU3CameraData::cancelPendingRequests()
{
- IPU3CameraData *data = cameraData(camera);
+ while (!pendingRequests_.empty()) {
+ Request *request = pendingRequests_.front();
- IPU3Frames::Info *info = data->frameInfos_.create(request);
- if (!info)
- return -ENOBUFS;
+ for (auto it : request->buffers()) {
+ FrameBuffer *buffer = it.second;
+ buffer->cancel();
+ pipe_->completeBuffer(request, buffer);
+ }
- /*
- * Queue a buffer on the CIO2, using the raw stream buffer provided in
- * the request, if any, or a CIO2 internal buffer otherwise.
- */
- FrameBuffer *reqRawBuffer = request->findBuffer(&data->rawStream_);
- FrameBuffer *rawBuffer = data->cio2_.queueBuffer(request, reqRawBuffer);
- if (!rawBuffer) {
- data->frameInfos_.remove(info);
- return -ENOMEM;
+ pipe_->completeRequest(request);
+ pendingRequests_.pop();
}
+}
- info->rawBuffer = rawBuffer;
+void IPU3CameraData::queuePendingRequests()
+{
+ while (!pendingRequests_.empty()) {
+ Request *request = pendingRequests_.front();
- ipa::ipu3::IPU3Event ev;
- ev.op = ipa::ipu3::EventProcessControls;
- ev.frame = info->id;
- ev.controls = request->controls();
- data->ipa_->processEvent(ev);
+ IPU3Frames::Info *info = frameInfos_.create(request);
+ if (!info)
+ break;
+
+ /*
+ * Queue a buffer on the CIO2, using the raw stream buffer
+ * provided in the request, if any, or a CIO2 internal buffer
+ * otherwise.
+ */
+ FrameBuffer *reqRawBuffer = request->findBuffer(&rawStream_);
+ FrameBuffer *rawBuffer = cio2_.queueBuffer(request, reqRawBuffer);
+ /*
+ * \todo If queueBuffer fails in queuing a buffer to the device,
+ * report the request as error by cancelling the request and
+ * calling PipelineHandler::completeRequest().
+ */
+ if (!rawBuffer) {
+ frameInfos_.remove(info);
+ break;
+ }
+
+ info->rawBuffer = rawBuffer;
+
+ ipa::ipu3::IPU3Event ev;
+ ev.op = ipa::ipu3::EventProcessControls;
+ ev.frame = info->id;
+ ev.controls = request->controls();
+ ipa_->processEvent(ev);
+
+ pendingRequests_.pop();
+ }
+}
+
+int PipelineHandlerIPU3::queueRequestDevice(Camera *camera, Request *request)
+{
+ IPU3CameraData *data = cameraData(camera);
+
+ data->pendingRequests_.push(request);
+ data->queuePendingRequests();
return 0;
}

Privacy Policy