Patch Detail
Show a patch.
GET /api/patches/27441/?format=api
{ "id": 27441, "url": "https://patchwork.libcamera.org/api/patches/27441/?format=api", "web_url": "https://patchwork.libcamera.org/patch/27441/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20260722-pi4-upstream-v2-6-eb44d3c6fd92@ideasonboard.com>", "date": "2026-07-22T11:23:22", "name": "[v2,6/8] pipeline: rpi: vc4: Switch to mainline media topology for bcm2835-isp", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "1e36904bfdf646b464eee3b8cdeb9c847312ea1e", "submitter": { "id": 223, "url": "https://patchwork.libcamera.org/api/people/223/?format=api", "name": "Jai Luthra", "email": "jai.luthra@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/27441/mbox/", "series": [ { "id": 6072, "url": "https://patchwork.libcamera.org/api/series/6072/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=6072", "date": "2026-07-22T11:23:16", "name": "Raspberry Pi: Update VC4 pipeline for mainline", "version": 2, "mbox": "https://patchwork.libcamera.org/series/6072/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/27441/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/27441/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 8FC4DBDE17\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 22 Jul 2026 11:25:17 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 51FFB67EA6;\n\tWed, 22 Jul 2026 13:25:17 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CFBEC67E8A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 22 Jul 2026 13:25:15 +0200 (CEST)", "from mail.ideasonboard.com (unknown\n\t[IPv6:2401:4900:1c68:25d4:fa24:78d1:31:7a56])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6ED26227;\n\tWed, 22 Jul 2026 13:24:15 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"r6C4ev6l\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1784719455;\n\tbh=SV/9yVphX7adVG0ztZJZ7TuJ/E0cAHbpcJoWQeJPWGk=;\n\th=From:Date:Subject:References:In-Reply-To:To:Cc:From;\n\tb=r6C4ev6lw66U4lCvcYVnOsazkS9l3i9qjcG2LdsQ0VtTPEQxCbJUJeBgdvna22Su9\n\tgdTAaL/4jx2xPmiRstDhW1ePI3pYJpPTCeTmrlpO4N14hLD/qB3gBNXnU6bte1ymA+\n\tmx7HdKHgsskj9fgPcbdGgqZrToY0ZxZrKJZxRM1g=", "From": "Jai Luthra <jai.luthra@ideasonboard.com>", "Date": "Wed, 22 Jul 2026 16:53:22 +0530", "Subject": "[PATCH v2 6/8] pipeline: rpi: vc4: Switch to mainline media\n\ttopology for bcm2835-isp", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "7bit", "Message-Id": "<20260722-pi4-upstream-v2-6-eb44d3c6fd92@ideasonboard.com>", "References": "<20260722-pi4-upstream-v2-0-eb44d3c6fd92@ideasonboard.com>", "In-Reply-To": "<20260722-pi4-upstream-v2-0-eb44d3c6fd92@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Naushir Patuck <naush@raspberrypi.com>, \n\tDavid Plowman <david.plowman@raspberrypi.com>, \n\tLaurent Pinchart <laurent.pinchart@ideasonboard.com>, \n\tKieran Bingham <kieran.bingham@ideasonboard.com>, \n\tJacopo Mondi <jacopo.mondi@ideasonboard.com>, \n\tDaniel Scally <dan.scally@ideasonboard.com>, \n\tJai Luthra <jai.luthra@ideasonboard.com>", "X-Mailer": "b4 0.14.3", "X-Developer-Signature": "v=1; a=openpgp-sha256; l=6639;\n\ti=jai.luthra@ideasonboard.com; h=from:subject:message-id;\n\tbh=SV/9yVphX7adVG0ztZJZ7TuJ/E0cAHbpcJoWQeJPWGk=;\n\tb=owEBbQKS/ZANAwAKAUPekfkkmnFFAcsmYgBqYKhsGLlgbNPLA70Ws5ZTgbbfaJbZFXfn8gwRu\n\tkeDPdqo8E6JAjMEAAEKAB0WIQRN4NgY5dV16NRar8VD3pH5JJpxRQUCamCobAAKCRBD3pH5JJpx\n\tReqyD/9AypqYUOM+wk8+7v9B2ggKbEnDqY0JLsEkgQWKbwOBBJQhFAPcTRWFMz+V+w4oqD+NoAP\n\taC4PpPsNyGoOPqn/bH2zwpDqvJXq1nfTcdOiTQ5PZWeZe5tmX4ZNKqppobtKfCUb4DxiHsn79bS\n\tim65l/NabXhOVD9UyCGFjdOu35skarxFv9Nyxrftx9xl+/Pp/Vl2hmQeHPXTRBtCvCT1IyGeZTj\n\tzLQwbeuSWJUfjDWMMdShhIIhg9RL3iM9KLcNHKt6SMVTWLRl3OeWOUO2bE98CBDi5lC/oEpfdRL\n\tVvIFWCRWxP2fCQiPhCEtWV/THePuletjs9EA/fOaHC2Xd+bj27xlM36fb4iKj/9QjUt8a0TiPoW\n\t7phZH2mXX5oSBxvjviw1qZ6Z3fT8niFDC7WLUcKHLqLapA3BWWl56z9LMChdOQPEKzXS+bQa63L\n\tCE1VqI4S9HqEy5cnsKmXAyev0Z3rflVn0oGm8kFsHQIUWL8NIDeojznEk62q2w+1lOKm+/BTd3p\n\ti+lrJxKc3z0IvD1/dZhAPJ9HBxC0K0sDimSExhg9F/pF+kONqW21FGvDVpjWjEs48eeL1MMt6qo\n\tHP3uWGNZnl2ZDz4ZmG2g2Ju8X1IqkV6RGASUNOzZzrDbrfjGOfKzjxqOoLXvrXcIdhL6hWJJRho\n\tcPcEMPs8ObQaE3g==", "X-Developer-Key": "i=jai.luthra@ideasonboard.com; a=openpgp;\n\tfpr=4DE0D818E5D575E8D45AAFC543DE91F9249A7145", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Switch from the downstream driver's video node naming scheme of\nbcm2835-isp0-output0,capture1..3 to the mainline scheme of\nbcm2835-isp-output0,capture0..1,stats2.\n\nUsers are expected to update their kernel to use the mainline VC4\ndriver.\n\nFor now we only initialize the new bcm2835-isp-params video node.\nFilling and queueing buffers to the node will be handled in a subsequent\ncommit.\n\nSigned-off-by: Jai Luthra <jai.luthra@ideasonboard.com>\n---\n src/libcamera/pipeline/rpi/common/rpi_stream.h | 1 +\n src/libcamera/pipeline/rpi/vc4/vc4.cpp | 49 +++++++++++++++++++-------\n 2 files changed, 37 insertions(+), 13 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/rpi/common/rpi_stream.h b/src/libcamera/pipeline/rpi/common/rpi_stream.h\nindex 300a352a7..cc18dcc8f 100644\n--- a/src/libcamera/pipeline/rpi/common/rpi_stream.h\n+++ b/src/libcamera/pipeline/rpi/common/rpi_stream.h\n@@ -30,6 +30,7 @@ enum BufferMask {\n \tMaskStats\t\t= 0x010000,\n \tMaskEmbeddedData\t= 0x020000,\n \tMaskBayerData\t\t= 0x040000,\n+\tMaskParams\t\t= 0x080000,\n };\n \n struct BufferObject {\ndiff --git a/src/libcamera/pipeline/rpi/vc4/vc4.cpp b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\nindex f06c439d5..e9fae8890 100644\n--- a/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n+++ b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n@@ -32,7 +32,7 @@ using StreamParams = RPi::RPiCameraConfiguration::StreamParams;\n namespace {\n \n enum class Unicam : unsigned int { Image, Embedded };\n-enum class Isp : unsigned int { Input, Output0, Output1, Stats };\n+enum class Isp : unsigned int { Input, Output0, Output1, Stats, Params };\n \n static constexpr unsigned int kUnicamSinkPad = 0;\n static constexpr unsigned int kUnicamSourceImagePad = 1;\n@@ -93,7 +93,7 @@ public:\n \n \t/* Array of Unicam and ISP device streams and associated buffers/streams. */\n \tRPi::Device<Unicam, 2> unicam_;\n-\tRPi::Device<Isp, 4> isp_;\n+\tRPi::Device<Isp, 5> isp_;\n \n \t/* DMAHEAP allocation helper. */\n \tDmaBufAllocator dmaHeap_;\n@@ -267,6 +267,13 @@ int PipelineHandlerVc4::allocateBuffers(Camera *camera)\n \t\t\t\t std::max<int>(data->config_.minUnicamBuffers,\n \t\t\t\t\t\t minBuffers - numRawBuffers);\n \n+\t\t} else if (stream == &data->isp_[Isp::Params]) {\n+\t\t\t/*\n+\t\t\t * Parameter buffers are dequeued immediately after\n+\t\t\t * sending the commands to VC4 firmware. Ideally, 1\n+\t\t\t * buffer would be sufficient, but allot 2 to be safe.\n+\t\t\t */\n+\t\t\tnumBuffers = 2;\n \t\t} else if (stream == &data->unicam_[Unicam::Embedded]) {\n \t\t\t/*\n \t\t\t * Embedded data buffers are (currently) for internal use, and\n@@ -303,10 +310,11 @@ int PipelineHandlerVc4::allocateBuffers(Camera *camera)\n \t}\n \n \t/*\n-\t * Pass the stats and embedded data buffers to the IPA. No other\n-\t * buffers need to be passed.\n+\t * Pass the stats, embedded data and parameter buffers to the IPA. No\n+\t * other buffers need to be passed.\n \t */\n \tmapBuffers(camera, data->isp_[Isp::Stats].getBuffers(), RPi::MaskStats);\n+\tmapBuffers(camera, data->isp_[Isp::Params].getBuffers(), RPi::MaskParams);\n \tif (data->sensorMetadata_)\n \t\tmapBuffers(camera, data->unicam_[Unicam::Embedded].getBuffers(),\n \t\t\t RPi::MaskEmbeddedData);\n@@ -325,13 +333,14 @@ int PipelineHandlerVc4::platformRegister(std::unique_ptr<RPi::CameraData> &camer\n \n \tMediaEntity *unicamSubdev = unicam->getEntityByName(\"unicam\");\n \tMediaEntity *unicamImage = unicam->getEntityByName(\"unicam-image\");\n-\tMediaEntity *ispOutput0 = isp->getEntityByName(\"bcm2835-isp0-output0\");\n-\tMediaEntity *ispCapture1 = isp->getEntityByName(\"bcm2835-isp0-capture1\");\n-\tMediaEntity *ispCapture2 = isp->getEntityByName(\"bcm2835-isp0-capture2\");\n-\tMediaEntity *ispCapture3 = isp->getEntityByName(\"bcm2835-isp0-capture3\");\n+\tMediaEntity *ispOutput0 = isp->getEntityByName(\"bcm2835-isp-output0\");\n+\tMediaEntity *ispCapture0 = isp->getEntityByName(\"bcm2835-isp-capture0\");\n+\tMediaEntity *ispCapture1 = isp->getEntityByName(\"bcm2835-isp-capture1\");\n+\tMediaEntity *ispCapture2 = isp->getEntityByName(\"bcm2835-isp-stats2\");\n+\tMediaEntity *ispParams = isp->getEntityByName(\"bcm2835-isp-params\");\n \n-\tif (!unicamSubdev || !unicamImage || !ispOutput0 || !ispCapture1 ||\n-\t !ispCapture2 || !ispCapture3)\n+\tif (!unicamSubdev || !unicamImage || !ispOutput0 || !ispCapture0 ||\n+\t !ispCapture1 || !ispCapture2 || !ispParams)\n \t\treturn -ENOENT;\n \n \t/* Create the unicam subdev and video streams. */\n@@ -348,9 +357,12 @@ int PipelineHandlerVc4::platformRegister(std::unique_ptr<RPi::CameraData> &camer\n \n \t/* Tag the ISP input stream as an import stream. */\n \tdata->isp_[Isp::Input] = RPi::Stream(\"ISP Input\", ispOutput0, StreamFlag::ImportOnly);\n-\tdata->isp_[Isp::Output0] = RPi::Stream(\"ISP Output0\", ispCapture1);\n-\tdata->isp_[Isp::Output1] = RPi::Stream(\"ISP Output1\", ispCapture2);\n-\tdata->isp_[Isp::Stats] = RPi::Stream(\"ISP Stats\", ispCapture3);\n+\tdata->isp_[Isp::Output0] = RPi::Stream(\"ISP Output0\", ispCapture0);\n+\tdata->isp_[Isp::Output1] = RPi::Stream(\"ISP Output1\", ispCapture1);\n+\tdata->isp_[Isp::Stats] = RPi::Stream(\"ISP Stats\", ispCapture2);\n+\t/* Tag the ISP params stream as MMAP (for writing into it in the IPA) and recurrent. */\n+\tdata->isp_[Isp::Params] = RPi::Stream(\"ISP Params\", ispParams,\n+\t\t\t\t\t StreamFlag::RequiresMmap | StreamFlag::Recurrent);\n \n \t/* Wire up all the buffer connections. */\n \tdata->unicam_[Unicam::Image].dev()->bufferReady.connect(data, &Vc4CameraData::unicamBufferDequeue);\n@@ -358,6 +370,7 @@ int PipelineHandlerVc4::platformRegister(std::unique_ptr<RPi::CameraData> &camer\n \tdata->isp_[Isp::Output0].dev()->bufferReady.connect(data, &Vc4CameraData::ispOutputDequeue);\n \tdata->isp_[Isp::Output1].dev()->bufferReady.connect(data, &Vc4CameraData::ispOutputDequeue);\n \tdata->isp_[Isp::Stats].dev()->bufferReady.connect(data, &Vc4CameraData::ispOutputDequeue);\n+\tdata->isp_[Isp::Params].dev()->bufferReady.connect(data, &Vc4CameraData::ispOutputDequeue);\n \n \tif (data->sensorMetadata_ ^ !!data->unicam_[Unicam::Embedded].dev()) {\n \t\tLOG(RPI, Warning) << \"Mismatch between Unicam and CamHelper for embedded data usage!\";\n@@ -758,6 +771,16 @@ int Vc4CameraData::platformConfigure(const RPi::RPiCameraConfiguration *rpiConfi\n \t\treturn ret;\n \t}\n \n+\t/* ISP parameters input format. */\n+\tformat = {};\n+\tformat.fourcc = V4L2PixelFormat(V4L2_META_FMT_BCM2835_ISP_PARAMS);\n+\tret = isp_[Isp::Params].dev()->setFormat(&format);\n+\tif (ret) {\n+\t\tLOG(RPI, Error) << \"Failed to set format on ISP params stream: \"\n+\t\t\t\t<< format;\n+\t\treturn ret;\n+\t}\n+\n \t/*\n \t * Configure the Unicam embedded data output format only if the sensor\n \t * supports it.\n", "prefixes": [ "v2", "6/8" ] }