{"id":2361,"url":"https://patchwork.libcamera.org/api/patches/2361/?format=json","web_url":"https://patchwork.libcamera.org/patch/2361/","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":"<20191126233620.1695316-14-niklas.soderlund@ragnatech.se>","date":"2019-11-26T23:36:03","name":"[libcamera-devel,13/30] libcamera: v4l2_videodevice: Extract exportDmaBuffer() to export DMA buffer","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"0acb18d637e5bd2fa431b562081db00cf44f33c7","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2361/mbox/","series":[{"id":579,"url":"https://patchwork.libcamera.org/api/series/579/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=579","date":"2019-11-26T23:35:50","name":"libcamera: Rework buffer API","version":1,"mbox":"https://patchwork.libcamera.org/series/579/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2361/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2361/checks/","tags":{},"headers":{"Return-Path":"","Received":["from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net\n\t[195.74.38.228])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 16C6461CAA\n\tfor ;\n\tWed, 27 Nov 2019 00:39:34 +0100 (CET)","from bismarck.berto.se (p54ac5865.dip0.t-ipconnect.de\n\t[84.172.88.101]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid ff16ac83-10a5-11ea-a0b9-005056917f90;\n\tWed, 27 Nov 2019 00:39:32 +0100 (CET)"],"X-Halon-ID":"ff16ac83-10a5-11ea-a0b9-005056917f90","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 27 Nov 2019 00:36:03 +0100","Message-Id":"<20191126233620.1695316-14-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.24.0","In-Reply-To":"<20191126233620.1695316-1-niklas.soderlund@ragnatech.se>","References":"<20191126233620.1695316-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 13/30] libcamera: v4l2_videodevice:\n\tExtract exportDmaBuffer() to export DMA buffer","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","X-List-Received-Date":"Tue, 26 Nov 2019 23:39:35 -0000"},"content":"The part in createPlane() that exports a dma buffer from a video device\nwill be used directly by the FrameBuffer interface. Break it out to a\nown function.\n\nSigned-off-by: Niklas Söderlund \n---\n src/libcamera/include/v4l2_videodevice.h | 1 +\n src/libcamera/v4l2_videodevice.cpp | 41 +++++++++++++++---------\n 2 files changed, 27 insertions(+), 15 deletions(-)","diff":"diff --git a/src/libcamera/include/v4l2_videodevice.h b/src/libcamera/include/v4l2_videodevice.h\nindex fdf11b3a6ec9b702..34bbff41760753bd 100644\n--- a/src/libcamera/include/v4l2_videodevice.h\n+++ b/src/libcamera/include/v4l2_videodevice.h\n@@ -179,6 +179,7 @@ private:\n \tint requestBuffers(unsigned int count);\n \tint createPlane(BufferMemory *buffer, unsigned int index,\n \t\t\tunsigned int plane, unsigned int length);\n+\tint exportDmaBuffer(unsigned int index, unsigned int plane);\n \n \tBuffer *dequeueBuffer();\n \tvoid bufferAvailable(EventNotifier *notifier);\ndiff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp\nindex 644e4545a2f33b2e..cc0a1c9382a2b1ed 100644\n--- a/src/libcamera/v4l2_videodevice.cpp\n+++ b/src/libcamera/v4l2_videodevice.cpp\n@@ -901,28 +901,19 @@ int V4L2VideoDevice::exportBuffers(BufferPool *pool)\n int V4L2VideoDevice::createPlane(BufferMemory *buffer, unsigned int index,\n \t\t\t\t unsigned int planeIndex, unsigned int length)\n {\n-\tstruct v4l2_exportbuffer expbuf = {};\n-\tint ret;\n+\tint fd;\n \n \tLOG(V4L2, Debug)\n \t\t<< \"Buffer \" << index\n \t\t<< \" plane \" << planeIndex\n \t\t<< \": length=\" << length;\n \n-\texpbuf.type = bufferType_;\n-\texpbuf.index = index;\n-\texpbuf.plane = planeIndex;\n-\texpbuf.flags = O_RDWR;\n-\n-\tret = ioctl(VIDIOC_EXPBUF, &expbuf);\n-\tif (ret < 0) {\n-\t\tLOG(V4L2, Error)\n-\t\t\t<< \"Failed to export buffer: \" << strerror(-ret);\n-\t\treturn ret;\n-\t}\n+\tfd = exportDmaBuffer(index, planeIndex);\n+\tif (fd < 0)\n+\t\treturn fd;\n \n-\tbuffer->planes().emplace_back(expbuf.fd, length);\n-\t::close(expbuf.fd);\n+\tbuffer->planes().emplace_back(fd, length);\n+\t::close(fd);\n \n \treturn 0;\n }\n@@ -948,6 +939,26 @@ int V4L2VideoDevice::importBuffers(BufferPool *pool)\n \treturn 0;\n }\n \n+int V4L2VideoDevice::exportDmaBuffer(unsigned int index, unsigned int plane)\n+{\n+\tstruct v4l2_exportbuffer expbuf = {};\n+\tint ret;\n+\n+\texpbuf.type = bufferType_;\n+\texpbuf.index = index;\n+\texpbuf.plane = plane;\n+\texpbuf.flags = O_RDWR;\n+\n+\tret = ioctl(VIDIOC_EXPBUF, &expbuf);\n+\tif (ret < 0) {\n+\t\tLOG(V4L2, Error)\n+\t\t\t<< \"Failed to export buffer: \" << strerror(-ret);\n+\t\treturn ret;\n+\t}\n+\n+\treturn expbuf.fd;\n+}\n+\n /**\n * \\brief Release all internally allocated buffers\n */\n","prefixes":["libcamera-devel","13/30"]}