{"id":12850,"url":"https://patchwork.libcamera.org/api/patches/12850/?format=json","web_url":"https://patchwork.libcamera.org/patch/12850/","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":"<20210707094815.1500917-7-naush@raspberrypi.com>","date":"2021-07-07T09:48:13","name":"[libcamera-devel,v4,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/12850/mbox/","series":[{"id":2214,"url":"https://patchwork.libcamera.org/api/series/2214/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2214","date":"2021-07-07T09:48:07","name":"Raspberry Pi: Enable imx477 long exposure modes","version":4,"mbox":"https://patchwork.libcamera.org/series/2214/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12850/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12850/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 6D27BC3226\n\tfor ;\n\tWed, 7 Jul 2021 09:48:25 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2483068539;\n\tWed, 7 Jul 2021 11:48:25 +0200 (CEST)","from mail-wm1-x335.google.com (mail-wm1-x335.google.com\n\t[IPv6:2a00:1450:4864:20::335])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2038168516\n\tfor ;\n\tWed, 7 Jul 2021 11:48:22 +0200 (CEST)","by mail-wm1-x335.google.com with SMTP id n33so1419262wms.1\n\tfor ;\n\tWed, 07 Jul 2021 02:48:22 -0700 (PDT)","from naush-laptop.pitowers.org\n\t([2a00:1098:3142:14:f800:302e:bf7e:a06b])\n\tby smtp.gmail.com with ESMTPSA id\n\tr16sm23377836wrx.63.2021.07.07.02.48.21\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 07 Jul 2021 02:48:21 -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=\"obSaFO+G\"; 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=obSaFO+GsG/MZuEPQjlXN32iuOEEN9lzgWZNhbLoMImHwUP6kth1HWUSBnmvrQUydH\n\tWAKVMnWLbJ2MGDWImNy422KWCiD13+xzRiLrVJZPSlApNuvDO/+Fy17WPOMU/jAY+UW6\n\tDgc+MrttrTml8nwaZqKOV1n2PIC80VwIuv+MVuLAMPqfdD/BiOvGmsUFn5wIIJdcZLoz\n\t00lgpl3VUOO4DhFLJbJJ6H8MnAIEgfxq5TBagyOOx+QtzhW5XiSfcjZdWRqZKWjwQOCc\n\twjaccpBhCQ3abRZGMHcW7Uc7DHpo8MAbJkgc3cOhVT6+zs7Z1KTRtUOAcUPwH4L5GMKf\n\teABA==","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=KNTwBOlQebkCVbwyGrXI721RjlYZ01vrC5teI3d4wOLH2/K166ZUNtoY5z/1H40YfE\n\tyxgfSMNCvzeZ/nksrAaMHfhbCaRGZoe6BZqImLAGujwD6u7csbAm9XFhk5IPrbm0EBiM\n\tOKmy3lEyFL3ux8h8HED/yYl2nrnCPxdZRDyiNEJboYuNZZ+rNvfuQTttks6fv4ijPoQ+\n\tuJNtW67Yi2wGhzSSIctPSN06IOcKhjKyXnSyrG2+0PYFDVxmW+0hwmGHgQM10TqjuTp0\n\twgUJa8udopK54BekiE0c34OcXDrfRbMlW7d0fRNo3615peMNMav79WqG0Vbjz8GmRfve\n\t7q9A==","X-Gm-Message-State":"AOAM532q4XW+L/oLa8mk1kd+Qw2usHVHWP5HleTqBVRiJQyBtduQZ25p\n\t/wQeWyAX/04gDQmPEJF+IfDak10JaBi7Bg==","X-Google-Smtp-Source":"ABdhPJzfpdo0thMBQtixTa0tZ5puuRXhcfnJAw2MImvusbXNqeVFNTHacOwMfvp4+r053DYtOqPfcw==","X-Received":"by 2002:a05:600c:1c8f:: with SMTP id\n\tk15mr25895370wms.91.1625651301716; \n\tWed, 07 Jul 2021 02:48:21 -0700 (PDT)","From":"Naushir Patuck ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 7 Jul 2021 10:48:13 +0100","Message-Id":"<20210707094815.1500917-7-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20210707094815.1500917-1-naush@raspberrypi.com>","References":"<20210707094815.1500917-1-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v4 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","v4","6/8"]}