[{"id":27599,"web_url":"https://patchwork.libcamera.org/comment/27599/","msgid":"","date":"2023-07-24T07:34:29","subject":"Re: [libcamera-devel] [PATCH v1 2/4] pipeline: rpi: Remove\n\tadditional external dma buf handling logic","submitter":{"id":143,"url":"https://patchwork.libcamera.org/api/people/143/","name":"Jacopo Mondi","email":"jacopo.mondi@ideasonboard.com"},"content":"Hi Naush\n\nOn Fri, Jul 21, 2023 at 10:37:57AM +0100, Naushir Patuck via libcamera-devel wrote:\n> There is no need to distinguish between dma bufs allocated outside of\n> libcamera and internally allocated buffers. As such, remove all the\n> special case handling of such buffers.\n>\n> Signed-off-by: Naushir Patuck \n\nShould you remove the function declaration too ?\n\nsrc/libcamera/pipeline/rpi/common/pipeline_base.h: void handleExternalBuffer(FrameBuffer *buffer, Stream *stream);\n\nI'm surprised the compiler doesn't generate a linkage error..\n\n\n\n> ---\n> .../pipeline/rpi/common/pipeline_base.cpp | 16 ----------------\n> src/libcamera/pipeline/rpi/common/rpi_stream.cpp | 11 +----------\n> src/libcamera/pipeline/rpi/common/rpi_stream.h | 2 --\n> 3 files changed, 1 insertion(+), 28 deletions(-)\n>\n> diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n> index 179a5b81a516..f244edc68a85 100644\n> --- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n> +++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n> @@ -1391,11 +1391,6 @@ void CameraData::handleStreamBuffer(FrameBuffer *buffer, RPi::Stream *stream)\n> \t */\n> \tRequest *request = requestQueue_.empty() ? nullptr : requestQueue_.front();\n> \tif (!dropFrameCount_ && request && request->findBuffer(stream) == buffer) {\n> -\t\t/*\n> -\t\t * Check if this is an externally provided buffer, and if\n> -\t\t * so, we must stop tracking it in the pipeline handler.\n> -\t\t */\n> -\t\thandleExternalBuffer(buffer, stream);\n> \t\t/*\n> \t\t * Tag the buffer as completed, returning it to the\n> \t\t * application.\n> @@ -1435,17 +1430,6 @@ void CameraData::handleState()\n> \t}\n> }\n>\n> -void CameraData::handleExternalBuffer(FrameBuffer *buffer, RPi::Stream *stream)\n> -{\n> -\tunsigned int id = stream->getBufferId(buffer);\n> -\n> -\tif (!(id & MaskExternalBuffer))\n> -\t\treturn;\n> -\n> -\t/* Stop the Stream object from tracking the buffer. */\n> -\tstream->removeExternalBuffer(buffer);\n> -}\n> -\n> void CameraData::checkRequestCompleted()\n> {\n> \tbool requestCompleted = false;\n> diff --git a/src/libcamera/pipeline/rpi/common/rpi_stream.cpp b/src/libcamera/pipeline/rpi/common/rpi_stream.cpp\n> index 1d05c5acc0d9..07b8de6875fe 100644\n> --- a/src/libcamera/pipeline/rpi/common/rpi_stream.cpp\n> +++ b/src/libcamera/pipeline/rpi/common/rpi_stream.cpp\n> @@ -78,16 +78,7 @@ unsigned int Stream::getBufferId(FrameBuffer *buffer) const\n>\n> void Stream::setExternalBuffer(FrameBuffer *buffer)\n> {\n> -\tbufferMap_.emplace(BufferMask::MaskExternalBuffer | id_.get(), buffer);\n> -}\n> -\n> -void Stream::removeExternalBuffer(FrameBuffer *buffer)\n> -{\n> -\tunsigned int id = getBufferId(buffer);\n> -\n> -\t/* Ensure we have this buffer in the stream, and it is marked external. */\n> -\tASSERT(id & BufferMask::MaskExternalBuffer);\n> -\tbufferMap_.erase(id);\n> +\tbufferMap_.emplace(id_.get(), buffer);\n> }\n>\n> int Stream::prepareBuffers(unsigned int count)\n> diff --git a/src/libcamera/pipeline/rpi/common/rpi_stream.h b/src/libcamera/pipeline/rpi/common/rpi_stream.h\n> index 6edd304bdfe2..ca591f99cc45 100644\n> --- a/src/libcamera/pipeline/rpi/common/rpi_stream.h\n> +++ b/src/libcamera/pipeline/rpi/common/rpi_stream.h\n> @@ -28,7 +28,6 @@ enum BufferMask {\n> \tMaskStats\t\t= 0x010000,\n> \tMaskEmbeddedData\t= 0x020000,\n> \tMaskBayerData\t\t= 0x040000,\n> -\tMaskExternalBuffer\t= 0x100000,\n> };\n>\n> /*\n> @@ -78,7 +77,6 @@ public:\n> \tunsigned int getBufferId(FrameBuffer *buffer) const;\n>\n> \tvoid setExternalBuffer(FrameBuffer *buffer);\n> -\tvoid removeExternalBuffer(FrameBuffer *buffer);\n>\n> \tint prepareBuffers(unsigned int count);\n> \tint queueBuffer(FrameBuffer *buffer);\n> --\n> 2.34.1\n>","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 1F3F5BDC71\n\tfor ;\n\tMon, 24 Jul 2023 07:34:41 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 513F5628C0;\n\tMon, 24 Jul 2023 09:34:40 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CB18E60387\n\tfor ;\n\tMon, 24 Jul 2023 09:34:38 +0200 (CEST)","from ideasonboard.com (mob-5-91-20-233.net.vodafone.it\n\t[5.91.20.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 378C7735;\n\tMon, 24 Jul 2023 09:33:39 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1690184080;\n\tbh=YLDWwYjRxtyfcjHmGmQp2uIFcJtcbBwnQiMIgF6Z/Sk=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=StH6WEyCbpziJJ58YobUtOyPQdeTF7Ixez2aWDuCJibEEpU+sIf5UfOasiE7dr1Zj\n\tsj523okn6vGoKr8hR55zOZ6j7uLKPJCFmcpyIan4lLhd61Zoyj4Gox9sSar4BIoQvU\n\tZ5hTzWqJe7EVAil1e0dwgXJFwoIHpkoRi2Ai1ztCIR+HGYhwpXRiAArodZSQIBdwhF\n\toPWAONDD5e7jzQmqoX8VqpRPt+OESuzrAFl95b/vXLs0oH3LeyQwk6lkfLoEsavKuj\n\tgUeNkRXHm1oI/N4yQSWI8ytcjcthTY9PPYY0Y32qT62ZGfOGCREIBkoZVZIm9FBKLS\n\tuTrMmhdmyGonQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1690184021;\n\tbh=YLDWwYjRxtyfcjHmGmQp2uIFcJtcbBwnQiMIgF6Z/Sk=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=amPWo5ZbK53xrh80mQK2SEQxBhfJjdlPY/5503HMrhklGN5gQksAtlSXK3O3riD3h\n\tTIZq+vBO5H/5k45Jm/MKvx6S1kTLDZr/E2Uyl03/RxrHH86Yi70GdjNeE6TVamwjD+\n\tic5w+leouvVDLYeqsPlGDOa6QxFa95AGPglbxl9Q="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"amPWo5Zb\"; dkim-atps=neutral","Date":"Mon, 24 Jul 2023 09:34:29 +0200","To":"Naushir Patuck ","Message-ID":"","References":"<20230721093759.27700-1-naush@raspberrypi.com>\n\t<20230721093759.27700-3-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20230721093759.27700-3-naush@raspberrypi.com>","Subject":"Re: [libcamera-devel] [PATCH v1 2/4] pipeline: rpi: Remove\n\tadditional external dma buf handling logic","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","From":"Jacopo Mondi via libcamera-devel ","Reply-To":"Jacopo Mondi ","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":27602,"web_url":"https://patchwork.libcamera.org/comment/27602/","msgid":"","date":"2023-07-24T07:49:25","subject":"Re: [libcamera-devel] [PATCH v1 2/4] pipeline: rpi: Remove\n\tadditional external dma buf handling logic","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/people/34/","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"content":"Hi Jacopo,\n\nThank you for your feedback.\n\nOn Mon, 24 Jul 2023 at 08:34, Jacopo Mondi\n wrote:\n>\n> Hi Naush\n>\n> On Fri, Jul 21, 2023 at 10:37:57AM +0100, Naushir Patuck via libcamera-devel wrote:\n> > There is no need to distinguish between dma bufs allocated outside of\n> > libcamera and internally allocated buffers. As such, remove all the\n> > special case handling of such buffers.\n> >\n> > Signed-off-by: Naushir Patuck \n>\n> Should you remove the function declaration too ?\n>\n> src/libcamera/pipeline/rpi/common/pipeline_base.h: void handleExternalBuffer(FrameBuffer *buffer, Stream *stream);\n>\n> I'm surprised the compiler doesn't generate a linkage error..\n\nYes it definitely should be removed. I'm also a bit surprised the\ncompiler didn't shout!\n\nRegards,\nNaush\n\n>\n>\n>\n> > ---\n> > .../pipeline/rpi/common/pipeline_base.cpp | 16 ----------------\n> > src/libcamera/pipeline/rpi/common/rpi_stream.cpp | 11 +----------\n> > src/libcamera/pipeline/rpi/common/rpi_stream.h | 2 --\n> > 3 files changed, 1 insertion(+), 28 deletions(-)\n> >\n> > diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n> > index 179a5b81a516..f244edc68a85 100644\n> > --- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n> > +++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n> > @@ -1391,11 +1391,6 @@ void CameraData::handleStreamBuffer(FrameBuffer *buffer, RPi::Stream *stream)\n> > */\n> > Request *request = requestQueue_.empty() ? nullptr : requestQueue_.front();\n> > if (!dropFrameCount_ && request && request->findBuffer(stream) == buffer) {\n> > - /*\n> > - * Check if this is an externally provided buffer, and if\n> > - * so, we must stop tracking it in the pipeline handler.\n> > - */\n> > - handleExternalBuffer(buffer, stream);\n> > /*\n> > * Tag the buffer as completed, returning it to the\n> > * application.\n> > @@ -1435,17 +1430,6 @@ void CameraData::handleState()\n> > }\n> > }\n> >\n> > -void CameraData::handleExternalBuffer(FrameBuffer *buffer, RPi::Stream *stream)\n> > -{\n> > - unsigned int id = stream->getBufferId(buffer);\n> > -\n> > - if (!(id & MaskExternalBuffer))\n> > - return;\n> > -\n> > - /* Stop the Stream object from tracking the buffer. */\n> > - stream->removeExternalBuffer(buffer);\n> > -}\n> > -\n> > void CameraData::checkRequestCompleted()\n> > {\n> > bool requestCompleted = false;\n> > diff --git a/src/libcamera/pipeline/rpi/common/rpi_stream.cpp b/src/libcamera/pipeline/rpi/common/rpi_stream.cpp\n> > index 1d05c5acc0d9..07b8de6875fe 100644\n> > --- a/src/libcamera/pipeline/rpi/common/rpi_stream.cpp\n> > +++ b/src/libcamera/pipeline/rpi/common/rpi_stream.cpp\n> > @@ -78,16 +78,7 @@ unsigned int Stream::getBufferId(FrameBuffer *buffer) const\n> >\n> > void Stream::setExternalBuffer(FrameBuffer *buffer)\n> > {\n> > - bufferMap_.emplace(BufferMask::MaskExternalBuffer | id_.get(), buffer);\n> > -}\n> > -\n> > -void Stream::removeExternalBuffer(FrameBuffer *buffer)\n> > -{\n> > - unsigned int id = getBufferId(buffer);\n> > -\n> > - /* Ensure we have this buffer in the stream, and it is marked external. */\n> > - ASSERT(id & BufferMask::MaskExternalBuffer);\n> > - bufferMap_.erase(id);\n> > + bufferMap_.emplace(id_.get(), buffer);\n> > }\n> >\n> > int Stream::prepareBuffers(unsigned int count)\n> > diff --git a/src/libcamera/pipeline/rpi/common/rpi_stream.h b/src/libcamera/pipeline/rpi/common/rpi_stream.h\n> > index 6edd304bdfe2..ca591f99cc45 100644\n> > --- a/src/libcamera/pipeline/rpi/common/rpi_stream.h\n> > +++ b/src/libcamera/pipeline/rpi/common/rpi_stream.h\n> > @@ -28,7 +28,6 @@ enum BufferMask {\n> > MaskStats = 0x010000,\n> > MaskEmbeddedData = 0x020000,\n> > MaskBayerData = 0x040000,\n> > - MaskExternalBuffer = 0x100000,\n> > };\n> >\n> > /*\n> > @@ -78,7 +77,6 @@ public:\n> > unsigned int getBufferId(FrameBuffer *buffer) const;\n> >\n> > void setExternalBuffer(FrameBuffer *buffer);\n> > - void removeExternalBuffer(FrameBuffer *buffer);\n> >\n> > int prepareBuffers(unsigned int count);\n> > int queueBuffer(FrameBuffer *buffer);\n> > --\n> > 2.34.1\n> >","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 0855FBDC71\n\tfor ;\n\tMon, 24 Jul 2023 07:49:45 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BAACB628C1;\n\tMon, 24 Jul 2023 09:49:44 +0200 (CEST)","from mail-yw1-x112b.google.com (mail-yw1-x112b.google.com\n\t[IPv6:2607:f8b0:4864:20::112b])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 710F061E25\n\tfor ;\n\tMon, 24 Jul 2023 09:49:42 +0200 (CEST)","by mail-yw1-x112b.google.com with SMTP id\n\t00721157ae682-5700b15c12fso47308907b3.1\n\tfor ;\n\tMon, 24 Jul 2023 00:49:42 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1690184984;\n\tbh=8k5VQrCZDHYrRTJXoB2t0l8Iicp9A+pSk3LxPrDhPWI=;\n\th=References:In-Reply-To:Date:To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=CHJ2I0JTH7heLpEjscAm4+YdyKniqKjh/l7Cn3HkuWFN21yMAdmCP1aZ3tov4whjE\n\tuIPyVzh1Mk4dVn1llYswkb1fWep/iIiFcPb3o+MSdiE8NDgP6CD4IFRvN/6ms4It9L\n\ti8HhOuLD3A5R2JjeYaC0KfatVdHB9kKjqndwHiLFKb7+s5R9ZfHyf5XEM8WSZ9z2/N\n\t9UdMgqkeMsNuFvTg1ucHlcx+J8Q6doekA9cjyXKl20/xdNTox3Gb2c5S0d99DHkmVj\n\tvEcXWQ3o3S6EO6ubr+HOvfIGBM7/9cuIByEIUkis7v+nVvNkmuuZKI+HAfui4bUNoM\n\tyWnSs+zIisdlQ==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google; t=1690184981; x=1690789781;\n\th=cc:to:subject:message-id:date:from:in-reply-to:references\n\t:mime-version:from:to:cc:subject:date:message-id:reply-to;\n\tbh=iU9XBmTfN6jpZB0/ysoy/sjL0g6ze72hQkZNcCy9uJw=;\n\tb=FUQJlxoY3RW1YvQL4+lRIBe5e1zWIqqj1S9bjgeRgVAiRObHiRQ4ZxAMuNyRJL20M1\n\tm2VJFRTV86FmRRtT5O7/BEF/9OwHPH8BkGDgaQqqJP9xw0n7ap7oGcNMZjBU3KKexuWB\n\tVUrrgJctD7Bl7GTQ3NFbmejQBA8WaJkkSwArSCwglSqp0pv7qNSw1O9+a1bVykr+LOpn\n\t12MTR6AutCseoHMGRk/t02zH43hMXKWNpkNsdIXgvpiEiejfAaxyKTfVDGVs5mVd+Ilx\n\tTTOQiLO66ya7V/6tafGIUmZclzCt5aKtVgOjG53Zxss2y5nuljsqgM8OlhzwyTgqw3hm\n\t0ZjA=="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"FUQJlxoY\"; dkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20221208; t=1690184981; x=1690789781;\n\th=cc:to:subject:message-id:date:from:in-reply-to:references\n\t:mime-version:x-gm-message-state:from:to:cc:subject:date:message-id\n\t:reply-to;\n\tbh=iU9XBmTfN6jpZB0/ysoy/sjL0g6ze72hQkZNcCy9uJw=;\n\tb=IsLlo37w61BTsXfowj+vuLItdRO+0IhF5XhMDstECLOvIvp7SLwTv2qVnyZaIYxCJZ\n\thuMImjCQLDbIJDONPkFGn7iVIDkeFHavWd5ximWOYuBGT+yD4r7B5MRYTIFwZDVnzEZW\n\t88TeHfEPQTyDMzhLvzDJSNMo/lBMi7VytIhLIDmStA+E8GPJ3njc3g1KgNF26yuhBwGz\n\tPon1uHIL97LPtzmDOOp1mZDXn52nApsXfy/wMrFYnTkzF9z93Msc8/UL+ngedN5DY38l\n\txmyiNqJwfX6ynC0R9fseXwNqpra568nqwpJUxUZYKLe9D2DsLrLKPO0wW8ooamA8bV+2\n\th9HA==","X-Gm-Message-State":"ABy/qLb59cnRR+DWhrsyp+35KGEMf6tEabJRXHtPUnD90X1S+Bd4gHNr\n\tTosq2hI0+P6yQfNE5DwV4dHaFMTwpa1xBcnZARAhF6EJTjLFR3l2F0I=","X-Google-Smtp-Source":"APBJJlH93WJINsdLIM3rfZa54MJdoUwfrkEwxQD8umienX0flPafVjwHIqzuVCqSBDwJ8LE9LRw2VE9cfRQiFh4kTFM=","X-Received":"by 2002:a0d:c083:0:b0:583:b802:d207 with SMTP id\n\tb125-20020a0dc083000000b00583b802d207mr4411010ywd.43.1690184981314;\n\tMon, 24 Jul 2023 00:49:41 -0700 (PDT)","MIME-Version":"1.0","References":"<20230721093759.27700-1-naush@raspberrypi.com>\n\t<20230721093759.27700-3-naush@raspberrypi.com>\n\t","In-Reply-To":"","Date":"Mon, 24 Jul 2023 08:49:25 +0100","Message-ID":"","To":"Jacopo Mondi ","Content-Type":"text/plain; charset=\"UTF-8\"","Subject":"Re: [libcamera-devel] [PATCH v1 2/4] pipeline: rpi: Remove\n\tadditional external dma buf handling logic","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","From":"Naushir Patuck via libcamera-devel\n\t","Reply-To":"Naushir Patuck ","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]