Patch Detail
Show a patch.
GET /api/patches/15582/?format=api
{ "id": 15582, "url": "https://patchwork.libcamera.org/api/patches/15582/?format=api", "web_url": "https://patchwork.libcamera.org/patch/15582/", "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": "<20220329112929.465434-2-naush@raspberrypi.com>", "date": "2022-03-29T11:29:28", "name": "[libcamera-devel,v3,2/3] pipeline: raspberrypi: Add a Unicam dequeue timeout", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "862f1a727a8470e3631a82a15c2943c6747563ef", "submitter": { "id": 34, "url": "https://patchwork.libcamera.org/api/people/34/?format=api", "name": "Naushir Patuck", "email": "naush@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/15582/mbox/", "series": [ { "id": 3012, "url": "https://patchwork.libcamera.org/api/series/3012/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3012", "date": "2022-03-29T11:29:27", "name": "[libcamera-devel,v3,1/3] libcamera: v4l2_videodevice: Add a dequeue timer", "version": 3, "mbox": "https://patchwork.libcamera.org/series/3012/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/15582/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/15582/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 BBC66C3265\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 29 Mar 2022 11:29:38 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 938F665631;\n\tTue, 29 Mar 2022 13:29:37 +0200 (CEST)", "from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com\n\t[IPv6:2a00:1450:4864:20::42f])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B508460135\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 29 Mar 2022 13:29:35 +0200 (CEST)", "by mail-wr1-x42f.google.com with SMTP id m30so24360592wrb.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 29 Mar 2022 04:29:35 -0700 (PDT)", "from naush-laptop.pitowers.org\n\t([2a00:1098:3142:14:e34f:94fd:5684:9ead])\n\tby smtp.gmail.com with ESMTPSA id\n\tbi20-20020a05600c3d9400b0038cfe80eeddsm1767436wmb.29.2022.03.29.04.29.33\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 29 Mar 2022 04:29:34 -0700 (PDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1648553377;\n\tbh=mjbznzRxFUAL8z7yRVPduBNyO7b2NUX6pOgQk8ld8OU=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=13pi91tlXlKEge/MQgkRfNx+0cjpGtHWhNzZxMYnphcycEO0L6UwVwNYYIw33T7Og\n\tyyARuu2jz2iJbjuk9V9PFLAzMES6utGc5krg1zEJOE1P/+Ym4w5LWshDorha9BYqG2\n\tr9CTlg7kN16Pe8yDEYZZS1gdTA8isqxCKPccrtQD3ppoQ45A7HTjU6KZ9Fj7fOfNLp\n\tMidXtReJsYdrJTgHMypklETv3IO1Hd1enXyU2ww+xJ4FCN7yDfiN4NL6Ksry2861qq\n\tlGRFv+SJAS56V3X/vXVpcoguaf5571zziXs/0FMVWDGHfmRpDa0Cj58R6/W1GO4Rdk\n\tA4DeKfHpAO7Dg==", "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=PMJdW2rucqrbrTu3le2vUiYbMO1fA9w3WTWdb1FkfOY=;\n\tb=r/s6RgHX1z4RBEmejda9XqRlzC95Ai63VYHEuFiTatG9ezXwYORE3u4HquTsZGBtDt\n\tI9ggDH/WiIE4Jb8ykdgfPRCNQcBXH4kuQeFQS1og8sWsZIW2eXX5SFhCr6deGdYEeuHm\n\tfZDRbN6o4vsMJ4jr/JcdS7l90WRIdDl8z7JmGUNDLdLpda/L9Z8CEBy3LUtJY3I2Ypds\n\tZqh0uz4v8xS71dRr1eirBEJ8SO6OFXwVwzzcNnhKM56FjHk7Ro8raC3pHi1qUM+x0mqo\n\tKfRsxg8UJIxMZZ2EMpg5wNGYzoFyBLdFaT3mwiJeLA+S0+GUpgnRsqrJRnl8HGY2vxLe\n\trbkQ==" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"r/s6RgHX\"; dkim-atps=neutral", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=PMJdW2rucqrbrTu3le2vUiYbMO1fA9w3WTWdb1FkfOY=;\n\tb=vEvOo8RHhYq0MRdQKp7kraxMeP4GUIscKvkty3VIMZhgDX+ao+NDRVd8xxX9YMpdwP\n\tiUZQ9LnUeERQKMDVSJlw1ILBsCLShKQzbYmkQIQPHNbFw/ZwEvlZqje8cZ/bx0di+GDL\n\ttGa7gn8Sq6vEkWbMxFLxVEC+hBEZ/E62GmhSnoZuqAuQ+2yhE0e2rYIzEZfu93M+vPcs\n\tOso37Fp+968mF79wjUGam/IjuDTvNUIkiOdKcUOuSD6+myuqJ+UsZMbwsDOTC/SUWy5G\n\te3bgfq9vRqDZD6WhGBG9zEmBuBfUXkf93ZVM1+1xk1FOw+M9OGXpCS7cV7TEKxGlU2ed\n\trrOg==", "X-Gm-Message-State": "AOAM530fVV4CZh38QbBA06q8U+6fH11akGC+K/gsL5EKlU5/YPZjjeK5\n\tufPktUjkeAoawBaSGdWKK6yeoP7HIfw+xQ==", "X-Google-Smtp-Source": "ABdhPJycWBY8s48ViGs+xuPO0oCpSRjOwvn7TXz+Gg1TQZaYQH9/eSmDHgDZjN4O5ozEeP7fGhZScQ==", "X-Received": "by 2002:a5d:6e0c:0:b0:1ef:7cbb:a5aa with SMTP id\n\th12-20020a5d6e0c000000b001ef7cbba5aamr30300155wrz.5.1648553374832; \n\tTue, 29 Mar 2022 04:29:34 -0700 (PDT)", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 29 Mar 2022 12:29:28 +0100", "Message-Id": "<20220329112929.465434-2-naush@raspberrypi.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20220329112929.465434-1-naush@raspberrypi.com>", "References": "<20220329112929.465434-1-naush@raspberrypi.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 2/3] pipeline: raspberrypi: Add a\n\tUnicam dequeue timeout", "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>", "From": "Naushir Patuck via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Naushir Patuck <naush@raspberrypi.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Enable the V4L2VideoDevice dequeue timeout for the Unicam Image node, and\nconnect the timeout signal to a slot in the pipeline handler. This slot will\nlog a fatal error message informing the user of a possible hardware stall.\n\nThe timeout is calculated as 2x the maximum frame length possible for a given\nmode, returned by the IPA.\n\nSigned-off-by: Naushir Patuck <naush@raspberrypi.com>\n---\n include/libcamera/ipa/raspberrypi.mojom | 1 +\n src/ipa/raspberrypi/raspberrypi.cpp | 2 ++\n .../pipeline/raspberrypi/raspberrypi.cpp | 15 +++++++++++++++\n 3 files changed, 18 insertions(+)", "diff": "diff --git a/include/libcamera/ipa/raspberrypi.mojom b/include/libcamera/ipa/raspberrypi.mojom\nindex acd3cafe6c91..5a228b75cd2f 100644\n--- a/include/libcamera/ipa/raspberrypi.mojom\n+++ b/include/libcamera/ipa/raspberrypi.mojom\n@@ -41,6 +41,7 @@ struct IPAConfig {\n struct StartConfig {\n \tlibcamera.ControlList controls;\n \tint32 dropFrameCount;\n+\tuint32 maxSensorFrameLengthMs;\n };\n \n interface IPARPiInterface {\ndiff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\nindex 1bf4e270b062..89767a9db471 100644\n--- a/src/ipa/raspberrypi/raspberrypi.cpp\n+++ b/src/ipa/raspberrypi/raspberrypi.cpp\n@@ -280,6 +280,8 @@ void IPARPi::start(const ControlList &controls, ipa::RPi::StartConfig *startConf\n \t}\n \n \tstartConfig->dropFrameCount = dropFrameCount_;\n+\tconst Duration maxSensorFrameDuration = mode_.max_frame_length * mode_.line_length;\n+\tstartConfig->maxSensorFrameLengthMs = maxSensorFrameDuration.get<std::milli>();\n \n \tfirstStart_ = false;\n \tlastRunTimestamp_ = 0;\ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 8fd79be67988..93931aaf3b55 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -208,6 +208,7 @@ public:\n \tvoid setIspControls(const ControlList &controls);\n \tvoid setDelayedControls(const ControlList &controls);\n \tvoid setSensorControls(ControlList &controls);\n+\tvoid unicamTimeout();\n \n \t/* bufferComplete signal handlers. */\n \tvoid unicamBufferDequeue(FrameBuffer *buffer);\n@@ -1050,6 +1051,11 @@ int PipelineHandlerRPi::start(Camera *camera, const ControlList *controls)\n \t\t}\n \t}\n \n+\t/* Set the dequeue timeout to 2x the maximum possible frame duration. */\n+\tstd::chrono::milliseconds msec(startConfig.maxSensorFrameLengthMs * 2);\n+\tdata->unicam_[Unicam::Image].dev()->setDequeueTimeout(msec);\n+\tLOG(RPI, Debug) << \"Setting Unicam timeout to \" << msec << \" ms.\";\n+\n \treturn 0;\n }\n \n@@ -1192,6 +1198,7 @@ int PipelineHandlerRPi::registerCamera(MediaDevice *unicam, MediaDevice *isp, Me\n \tdata->isp_[Isp::Stats] = RPi::Stream(\"ISP Stats\", ispCapture3);\n \n \t/* Wire up all the buffer connections. */\n+\tdata->unicam_[Unicam::Image].dev()->dequeueTimeout.connect(data.get(), &RPiCameraData::unicamTimeout);\n \tdata->unicam_[Unicam::Image].dev()->frameStart.connect(data.get(), &RPiCameraData::frameStarted);\n \tdata->unicam_[Unicam::Image].dev()->bufferReady.connect(data.get(), &RPiCameraData::unicamBufferDequeue);\n \tdata->isp_[Isp::Input].dev()->bufferReady.connect(data.get(), &RPiCameraData::ispInputDequeue);\n@@ -1773,6 +1780,14 @@ void RPiCameraData::setSensorControls(ControlList &controls)\n \tsensor_->setControls(&controls);\n }\n \n+void RPiCameraData::unicamTimeout()\n+{\n+\tLOG(RPI, Error)\n+\t\t<< \"Unicam has timed out!\\n\"\n+\t\t \"Please check that your camera sensor connector is attached securely.\\n\"\n+\t\t \"Alternatively, try another cable and/or sensor.\";\n+}\n+\n void RPiCameraData::unicamBufferDequeue(FrameBuffer *buffer)\n {\n \tRPi::Stream *stream = nullptr;\n", "prefixes": [ "libcamera-devel", "v3", "2/3" ] }