{"id":9406,"url":"https://patchwork.libcamera.org/api/patches/9406/?format=json","web_url":"https://patchwork.libcamera.org/patch/9406/","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":"<20200827082038.40758-4-jacopo@jmondi.org>","date":"2020-08-27T08:20:38","name":"[libcamera-devel,3/3] libcamera: raspberrypi: Fail on dmaHeaps_ open error","commit_ref":null,"pull_url":null,"state":"superseded","archived":true,"hash":"7dacaa2316bc03c933c1a4d19edfc66d6a092544","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":{"id":15,"url":"https://patchwork.libcamera.org/api/users/15/?format=json","username":"jmondi","first_name":"Jacopo","last_name":"Mondi","email":"jacopo@jmondi.org"},"mbox":"https://patchwork.libcamera.org/patch/9406/mbox/","series":[{"id":1245,"url":"https://patchwork.libcamera.org/api/series/1245/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1245","date":"2020-08-27T08:20:35","name":"libcamera: raspberrypi: Fail early when opening dma heaps","version":1,"mbox":"https://patchwork.libcamera.org/series/1245/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9406/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9406/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 A74C2BDC71\n\tfor ;\n\tThu, 27 Aug 2020 08:17:05 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 76B9F628F3;\n\tThu, 27 Aug 2020 10:17:05 +0200 (CEST)","from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net\n\t[217.70.183.193])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DC71962907\n\tfor ;\n\tThu, 27 Aug 2020 10:17:00 +0200 (CEST)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 1F94124000B;\n\tThu, 27 Aug 2020 08:16:59 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org,\n\tDave Stevenson ,\n\tNaushir Patuck ","Date":"Thu, 27 Aug 2020 10:20:38 +0200","Message-Id":"<20200827082038.40758-4-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20200827082038.40758-1-jacopo@jmondi.org>","References":"<20200827082038.40758-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 3/3] libcamera: raspberrypi: Fail on\n\tdmaHeaps_ open error","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=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Provide an RPiCameraData::init() method where the dmaHeaps_ member\nis opened.\n\nThis allows to fail earlier in case the allocator fails to open.\n\nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 8 ++++++++\n 1 file changed, 8 insertions(+)","diff":"diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 42c9caa03e2e..38da45607d4b 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -291,6 +291,7 @@ public:\n \t{\n \t}\n \n+\tint init();\n \tvoid frameStarted(uint32_t sequence);\n \n \tint loadIPA();\n@@ -904,6 +905,8 @@ bool PipelineHandlerRPi::match(DeviceEnumerator *enumerator)\n \t\treturn false;\n \n \tstd::unique_ptr data = std::make_unique(this);\n+\tif (data->init())\n+\t\treturn false;\n \n \t/* Locate and open the unicam video streams. */\n \tdata->unicam_[Unicam::Embedded] = RPiStream(\"Unicam Embedded\", unicam_->getEntityByName(\"unicam-embedded\"));\n@@ -1084,6 +1087,11 @@ void PipelineHandlerRPi::freeBuffers(Camera *camera)\n \t\tstream->releaseBuffers();\n }\n \n+int RPiCameraData::init()\n+{\n+\treturn dmaHeap_.open();\n+}\n+\n void RPiCameraData::frameStarted(uint32_t sequence)\n {\n \tLOG(RPI, Debug) << \"frame start \" << sequence;\n","prefixes":["libcamera-devel","3/3"]}