{"id":12797,"url":"https://patchwork.libcamera.org/api/patches/12797/?format=json","web_url":"https://patchwork.libcamera.org/patch/12797/","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":"<20210702150940.226941-7-naush@raspberrypi.com>","date":"2021-07-02T15:09:38","name":"[libcamera-devel,v3,6/8] pipeline: raspberrypi: Use priority write for vblank when writing sensor ctrls","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"4ef34ff96c23b31811763f8eb265884eb1b30131","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/people/34/?format=json","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12797/mbox/","series":[{"id":2203,"url":"https://patchwork.libcamera.org/api/series/2203/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2203","date":"2021-07-02T15:09:32","name":"Raspberry Pi: Enable imx477 long exposure modes","version":3,"mbox":"https://patchwork.libcamera.org/series/2203/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12797/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12797/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 C19C8C0100\n\tfor ;\n\tFri, 2 Jul 2021 15:09:57 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8311968503;\n\tFri, 2 Jul 2021 17:09:57 +0200 (CEST)","from mail-wr1-x429.google.com (mail-wr1-x429.google.com\n\t[IPv6:2a00:1450:4864:20::429])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3E3D668511\n\tfor ;\n\tFri, 2 Jul 2021 17:09:55 +0200 (CEST)","by mail-wr1-x429.google.com with SMTP id u8so12837588wrq.8\n\tfor ;\n\tFri, 02 Jul 2021 08:09:55 -0700 (PDT)","from naush-laptop.patuck.local ([88.97.76.4])\n\tby smtp.gmail.com with ESMTPSA id\n\tn4sm3619335wrw.21.2021.07.02.08.09.54\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 02 Jul 2021 08:09:54 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"W5tBv3y2\"; dkim-atps=neutral","DKIM-Signature":"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=/YpVJmsa5egcjdYPoaMhnVTpbUvYaQTLQzwcDmDF1BE=;\n\tb=W5tBv3y2EEbyEwZPrxIJ+eIpO/QLTod1GIbFNYLAVZnyErmjOg6zC4yNn4gwHpMeIr\n\tPEsFuyeS9ZQuzDrxsEiUFk3JEW0akyws2PtRvTId03veej3EosU3IMwPuMWVJGyhIs1I\n\tUlNPWne/T/nUoLWeNYX88X2Chxy+0svX8kVXymVaSmlsNwO5nLohvNLtdX5xjmmwlgMK\n\tjrR6ew05Po8eDW6pf7j2BYDw/M9w5O26JEc35g8OuxYAwy+ULcCRnJocrlcsYTp6b/J6\n\tKQj6+T44+F5thIBOio0fpeO/eFsKru0jHKLfQqZqN+gvwUBX3St0x6CE9aVJ8WHb4EUi\n\tRKHw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\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=/YpVJmsa5egcjdYPoaMhnVTpbUvYaQTLQzwcDmDF1BE=;\n\tb=Jou1SvTadOqcGiDUszvpkwfE88shlMTBBm3fr2cjfuNmSVn8KmuPH50YXxcwXFZkel\n\tisHg3oPMc/bfMu77T+vrrVHno0JJbZuA2giP1j+VhX3rgqaL/YlsgSuomXnlwSdAWXEk\n\tqMWMYqqqYM+YD8eaIRxEncPvdrIC4PH2ryW/TUskZX9rDvk3GxdYKaU4QFZB1GL0QFUf\n\tWk65qWWN+mpLUZCwb7jGveKM/w2hY+S6ts1/wz84Cs+syVLUMVsfXsiQuHAYbs+tJR10\n\t2S+Jmf/uZVZj0IFFVc6+d5ysRxn8UbzmbSrX4f7MFlHmhuskmxq7RHljIze3diwR8SDj\n\tueLg==","X-Gm-Message-State":"AOAM5318bbv1pDs8P7UHQXSfDdSpasWGsHZLLngHICz23YoikE4IjfK0\n\tWwxsw6GABcNKsuv4rsKVHA2ttUOsBsNnkg==","X-Google-Smtp-Source":"ABdhPJzhwlK/k3B1Vc7poAKhLWFjnEYbCAwbFWBhexmiu0ZMsYloOkqpLMFCFYY7vdn+sY8nsbjQMA==","X-Received":"by 2002:adf:d205:: with SMTP id j5mr135535wrh.242.1625238594712; \n\tFri, 02 Jul 2021 08:09:54 -0700 (PDT)","From":"Naushir Patuck ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 2 Jul 2021 16:09:38 +0100","Message-Id":"<20210702150940.226941-7-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20210702150940.226941-1-naush@raspberrypi.com>","References":"<20210702150940.226941-1-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 6/8] pipeline: raspberrypi: Use\n\tpriority write for vblank when writing sensor ctrls","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"When directly writing controls to the sensor device, ensure that VBLANK is\nwritten ahead of and before the EXPOSURE control. This is the same priority\nwrite mechanism used in DelayedControls.\n\nSigned-off-by: Naushir Patuck \nReviewed-by: David Plowman \n---\n .../pipeline/raspberrypi/raspberrypi.cpp | 37 ++++++++++++++-----\n 1 file changed, 27 insertions(+), 10 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 082eb1ee1c23..53a30cff1864 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -154,6 +154,7 @@ public:\n \tvoid embeddedComplete(uint32_t bufferId);\n \tvoid setIspControls(const ControlList &controls);\n \tvoid setDelayedControls(const ControlList &controls);\n+\tvoid setSensorControls(ControlList &controls);\n \n \t/* bufferComplete signal handlers. */\n \tvoid unicamBufferDequeue(FrameBuffer *buffer);\n@@ -828,7 +829,7 @@ int PipelineHandlerRPi::start(Camera *camera, const ControlList *controls)\n \n \t/* Apply any gain/exposure settings that the IPA may have passed back. */\n \tif (!startConfig.controls.empty())\n-\t\tdata->unicam_[Unicam::Image].dev()->setControls(&startConfig.controls);\n+\t\tdata->setSensorControls(startConfig.controls);\n \n \t/* Configure the number of dropped frames required on startup. */\n \tdata->dropFrameCount_ = startConfig.dropFrameCount;\n@@ -1294,22 +1295,20 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config)\n \t\treturn -EPIPE;\n \t}\n \n-\tif (!controls.empty())\n-\t\tunicam_[Unicam::Image].dev()->setControls(&controls);\n-\n \t/*\n \t * Configure the H/V flip controls based on the combination of\n \t * the sensor and user transform.\n \t */\n \tif (supportsFlips_) {\n-\t\tControlList ctrls(unicam_[Unicam::Image].dev()->controls());\n-\t\tctrls.set(V4L2_CID_HFLIP,\n-\t\t\t static_cast(!!(rpiConfig->combinedTransform_ & Transform::HFlip)));\n-\t\tctrls.set(V4L2_CID_VFLIP,\n-\t\t\t static_cast(!!(rpiConfig->combinedTransform_ & Transform::VFlip)));\n-\t\tunicam_[Unicam::Image].dev()->setControls(&ctrls);\n+\t\tcontrols.set(V4L2_CID_HFLIP,\n+\t\t\t static_cast(!!(rpiConfig->combinedTransform_ & Transform::HFlip)));\n+\t\tcontrols.set(V4L2_CID_VFLIP,\n+\t\t\t static_cast(!!(rpiConfig->combinedTransform_ & Transform::VFlip)));\n \t}\n \n+\tif (!controls.empty())\n+\t\tsetSensorControls(controls);\n+\n \treturn 0;\n }\n \n@@ -1379,6 +1378,24 @@ void RPiCameraData::setDelayedControls(const ControlList &controls)\n \thandleState();\n }\n \n+void RPiCameraData::setSensorControls(ControlList &controls)\n+{\n+\t/*\n+\t * We need to ensure that if both VBLANK and EXPOSURE are present, the\n+\t * former must be written ahead of, and separately from EXPOSURE to avoid\n+\t * V4L2 rejecting the latter. This is identical to what DelayedControls\n+\t * does with the priority write flag.\n+\t */\n+\tif (controls.contains(V4L2_CID_EXPOSURE) && controls.contains(V4L2_CID_VBLANK)) {\n+\t\tControlList vblank_ctrl;\n+\n+\t\tvblank_ctrl.set(V4L2_CID_VBLANK, controls.get(V4L2_CID_VBLANK));\n+\t\tunicam_[Unicam::Image].dev()->setControls(&vblank_ctrl);\n+\t}\n+\n+\tunicam_[Unicam::Image].dev()->setControls(&controls);\n+}\n+\n void RPiCameraData::unicamBufferDequeue(FrameBuffer *buffer)\n {\n \tRPi::Stream *stream = nullptr;\n","prefixes":["libcamera-devel","v3","6/8"]}