Patch Detail
Show a patch.
GET /api/patches/19619/?format=api
{ "id": 19619, "url": "https://patchwork.libcamera.org/api/patches/19619/?format=api", "web_url": "https://patchwork.libcamera.org/patch/19619/", "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": "<20240301212121.9072-29-laurent.pinchart@ideasonboard.com>", "date": "2024-03-01T21:21:17", "name": "[PATCH/RFC,28/32] pipeline: raspberrypi: vc4: Unconditionally create embedded data stream", "commit_ref": null, "pull_url": null, "state": "rfc", "archived": false, "hash": "146c14e2c0d707346a785bac9eb2472adf080f7e", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/19619/mbox/", "series": [ { "id": 4197, "url": "https://patchwork.libcamera.org/api/series/4197/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4197", "date": "2024-03-01T21:20:49", "name": "libcamera: Support the upstream Unicam driver", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4197/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/19619/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/19619/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 D1E9FC32C3\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 1 Mar 2024 21:22:02 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9E9CF62964;\n\tFri, 1 Mar 2024 22:22:02 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CAF9362878\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 1 Mar 2024 22:22:00 +0100 (CET)", "from pendragon.ideasonboard.com (89-27-53-110.bb.dnainternet.fi\n\t[89.27.53.110])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4E8513871;\n\tFri, 1 Mar 2024 22:21:46 +0100 (CET)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"RJJJDS0d\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1709328106;\n\tbh=4nRhZJg1GUFTt3pitfDnfKaZQMka2pKWFZyoReg52TA=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=RJJJDS0dLraJVrK4I2dAJ7TJSWCqbV75f4XjatrpPvnCLl+pF80ikIUwp+FuHD5Wi\n\t72FNFBGGulOQjbkmeijTNLznsTWmPGm9gu7vhzui1lAwRWWFpoBzRnv7t+WyNzdrjo\n\tE4ylczliIbrz+No53MF5M70hpBTJ4Mu47xyisy4M=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Subject": "[PATCH/RFC 28/32] pipeline: raspberrypi: vc4: Unconditionally create\n\tembedded data stream", "Date": "Fri, 1 Mar 2024 23:21:17 +0200", "Message-ID": "<20240301212121.9072-29-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20240301212121.9072-1-laurent.pinchart@ideasonboard.com>", "References": "<20240301212121.9072-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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>", "Cc": "Sakari Ailus <sakari.ailus@iki.fi>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "The mainline Unicam driver unconditionally creates the embedded data\nvideo device. Create the corresponding stream unconditionally. Drop the\nwarning in case of mismatch between Unicam and the CamHelper, as this\nbecomes a normal situation when the sensor doesn't support emebedded\ndata.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/libcamera/pipeline/rpi/vc4/vc4.cpp | 26 +++++++++-----------------\n 1 file changed, 9 insertions(+), 17 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/rpi/vc4/vc4.cpp b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\nindex 75dc85cf62a1..da925ba5f793 100644\n--- a/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n+++ b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n@@ -311,24 +311,19 @@ int PipelineHandlerVc4::platformRegister(std::unique_ptr<RPi::CameraData> &camer\n \t\treturn -ENOMEM;\n \n \tMediaEntity *unicamImage = unicam->getEntityByName(\"unicam-image\");\n+\tMediaEntity *unicamEmbedded = unicam->getEntityByName(\"unicam-embedded\");\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 \n-\tif (!unicamImage || !ispOutput0 || !ispCapture1 || !ispCapture2 || !ispCapture3)\n+\tif (!unicamImage || !unicamEmbedded ||\n+\t !ispOutput0 || !ispCapture1 || !ispCapture2 || !ispCapture3)\n \t\treturn -ENOENT;\n \n-\t/* Locate and open the unicam video streams. */\n+\t/* Create the unicam video streams. */\n \tdata->unicam_[Unicam::Image] = RPi::Stream(\"Unicam Image\", unicamImage);\n-\n-\t/* An embedded data node will not be present if the sensor does not support it. */\n-\tMediaEntity *unicamEmbedded = unicam->getEntityByName(\"unicam-embedded\");\n-\tif (unicamEmbedded) {\n-\t\tdata->unicam_[Unicam::Embedded] = RPi::Stream(\"Unicam Embedded\", unicamEmbedded);\n-\t\tdata->unicam_[Unicam::Embedded].dev()->bufferReady.connect(data,\n-\t\t\t\t\t\t\t\t\t &Vc4CameraData::unicamBufferDequeue);\n-\t}\n+\tdata->unicam_[Unicam::Embedded] = RPi::Stream(\"Unicam Embedded\", unicamEmbedded);\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@@ -338,18 +333,15 @@ int PipelineHandlerVc4::platformRegister(std::unique_ptr<RPi::CameraData> &camer\n \n \t/* Wire up all the buffer connections. */\n \tdata->unicam_[Unicam::Image].dev()->bufferReady.connect(data, &Vc4CameraData::unicamBufferDequeue);\n+\tif (data->sensorMetadata_)\n+\t\tdata->unicam_[Unicam::Embedded].dev()->bufferReady.connect(data,\n+\t\t\t\t\t\t\t\t\t &Vc4CameraData::unicamBufferDequeue);\n+\n \tdata->isp_[Isp::Input].dev()->bufferReady.connect(data, &Vc4CameraData::ispInputDequeue);\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 \n-\tif (data->sensorMetadata_ ^ !!data->unicam_[Unicam::Embedded].dev()) {\n-\t\tLOG(RPI, Warning) << \"Mismatch between Unicam and CamHelper for embedded data usage!\";\n-\t\tdata->sensorMetadata_ = false;\n-\t\tif (data->unicam_[Unicam::Embedded].dev())\n-\t\t\tdata->unicam_[Unicam::Embedded].dev()->bufferReady.disconnect();\n-\t}\n-\n \t/*\n \t * Open all Unicam and ISP streams. The exception is the embedded data\n \t * stream, which only gets opened below if the IPA reports that the sensor\n", "prefixes": [ "PATCH/RFC", "28/32" ] }