{"id":10770,"url":"https://patchwork.libcamera.org/api/patches/10770/?format=json","web_url":"https://patchwork.libcamera.org/patch/10770/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20201229160318.77536-5-niklas.soderlund@ragnatech.se>","date":"2020-12-29T16:03:11","name":"[libcamera-devel,v2,04/11] libcamera: ipu3: cio2: Return the FrameBuffer pointer used","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"2c8cff5c3d5e1a890b2f4c8918ba02bdd040d7aa","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":{"id":16,"url":"https://patchwork.libcamera.org/api/users/16/?format=json","username":"neg","first_name":"Niklas","last_name":"Söderlund","email":"niklas.soderlund@ragnatech.se"},"mbox":"https://patchwork.libcamera.org/patch/10770/mbox/","series":[{"id":1559,"url":"https://patchwork.libcamera.org/api/series/1559/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1559","date":"2020-12-29T16:03:07","name":"libcamera: ipu3: Attach to an skeleton IPA","version":2,"mbox":"https://patchwork.libcamera.org/series/1559/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10770/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10770/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 7F6E1C0F1A\n\tfor ;\n\tTue, 29 Dec 2020 16:04:07 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0624162006;\n\tTue, 29 Dec 2020 17:04:07 +0100 (CET)","from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net\n\t[195.74.38.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 32E076031F\n\tfor ;\n\tTue, 29 Dec 2020 17:04:06 +0100 (CET)","from bismarck.berto.se (p4fca2458.dip0.t-ipconnect.de\n\t[79.202.36.88])\n\tby bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid 7957147b-49ef-11eb-a542-005056917a89;\n\tTue, 29 Dec 2020 17:04:05 +0100 (CET)"],"X-Halon-ID":"7957147b-49ef-11eb-a542-005056917a89","Authorized-sender":"niklas.soderlund@fsdn.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 29 Dec 2020 17:03:11 +0100","Message-Id":"<20201229160318.77536-5-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.29.2","In-Reply-To":"<20201229160318.77536-1-niklas.soderlund@ragnatech.se>","References":"<20201229160318.77536-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 04/11] libcamera: ipu3: cio2: Return\n\tthe FrameBuffer pointer used","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"When adding IPA plumbing to the IPU3 pipeline handler it will be needed\nto track which raw buffer was queued to the CIO2 for a specific request.\nCurrently if using an internally allocated raw buffer the FrameBuffer is\nnot exposed outside the CIO2Device as it was not needed. Prepare for the\nIPA by exposing which internal raw buffer is picked for each request,\nlater changes will associate this with a Request.\n\nSigned-off-by: Niklas Söderlund \nReviewed-by: Jacopo Mondi \n---\n* Changes since v1\n- Update commit message.\n---\n src/libcamera/pipeline/ipu3/cio2.cpp | 10 +++++++---\n src/libcamera/pipeline/ipu3/cio2.h | 2 +-\n src/libcamera/pipeline/ipu3/ipu3.cpp | 8 ++++----\n 3 files changed, 12 insertions(+), 8 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp\nindex bd5260d5b28893e8..f76c6675b0f448fe 100644\n--- a/src/libcamera/pipeline/ipu3/cio2.cpp\n+++ b/src/libcamera/pipeline/ipu3/cio2.cpp\n@@ -254,7 +254,7 @@ int CIO2Device::stop()\n \treturn ret;\n }\n \n-int CIO2Device::queueBuffer(Request *request, FrameBuffer *rawBuffer)\n+FrameBuffer *CIO2Device::queueBuffer(Request *request, FrameBuffer *rawBuffer)\n {\n \tFrameBuffer *buffer = rawBuffer;\n \n@@ -262,7 +262,7 @@ int CIO2Device::queueBuffer(Request *request, FrameBuffer *rawBuffer)\n \tif (!buffer) {\n \t\tif (availableBuffers_.empty()) {\n \t\t\tLOG(IPU3, Error) << \"CIO2 buffer underrun\";\n-\t\t\treturn -EINVAL;\n+\t\t\treturn nullptr;\n \t\t}\n \n \t\tbuffer = availableBuffers_.front();\n@@ -271,7 +271,11 @@ int CIO2Device::queueBuffer(Request *request, FrameBuffer *rawBuffer)\n \n \tbuffer->setRequest(request);\n \n-\treturn output_->queueBuffer(buffer);\n+\tint ret = output_->queueBuffer(buffer);\n+\tif (ret)\n+\t\treturn nullptr;\n+\n+\treturn buffer;\n }\n \n void CIO2Device::tryReturnBuffer(FrameBuffer *buffer)\ndiff --git a/src/libcamera/pipeline/ipu3/cio2.h b/src/libcamera/pipeline/ipu3/cio2.h\nindex 236ad287354a0bf6..dca4d40e4c32e8b2 100644\n--- a/src/libcamera/pipeline/ipu3/cio2.h\n+++ b/src/libcamera/pipeline/ipu3/cio2.h\n@@ -51,7 +51,7 @@ public:\n \tCameraSensor *sensor() { return sensor_.get(); }\n \tconst CameraSensor *sensor() const { return sensor_.get(); }\n \n-\tint queueBuffer(Request *request, FrameBuffer *rawBuffer);\n+\tFrameBuffer *queueBuffer(Request *request, FrameBuffer *rawBuffer);\n \tvoid tryReturnBuffer(FrameBuffer *buffer);\n \tSignal &bufferReady() { return output_->bufferReady; }\n \ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 3e0e88fa63c4f1fb..a87ce8f3378ba2fe 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -643,10 +643,10 @@ int PipelineHandlerIPU3::queueRequestDevice(Camera *camera, Request *request)\n \t * Queue a buffer on the CIO2, using the raw stream buffer provided in\n \t * the request, if any, or a CIO2 internal buffer otherwise.\n \t */\n-\tFrameBuffer *rawBuffer = request->findBuffer(&data->rawStream_);\n-\terror = data->cio2_.queueBuffer(request, rawBuffer);\n-\tif (error)\n-\t\treturn error;\n+\tFrameBuffer *reqRawBuffer = request->findBuffer(&data->rawStream_);\n+\tFrameBuffer *rawBuffer = data->cio2_.queueBuffer(request, reqRawBuffer);\n+\tif (!rawBuffer)\n+\t\treturn -ENOMEM;\n \n \t/* Queue all buffers from the request aimed for the ImgU. */\n \tfor (auto it : request->buffers()) {\n","prefixes":["libcamera-devel","v2","04/11"]}