[{"id":32957,"web_url":"https://patchwork.libcamera.org/comment/32957/","msgid":"","date":"2025-01-08T09:01:39","subject":"Re: [PATCH v2 0/4] Raspberry Pi: Various changes","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/people/34/","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"content":"Gentle ping - I think these patches are ready to be merged now.\n\nOn Wed, 18 Dec 2024 at 08:36, Naushir Patuck wrote:\n>\n> Hi,\n>\n> This revision fixes up all the minor typos reported by David and Laurent. I've\n> also removed the CNN control related patches. Patch 4/4 needs one more R-B tag\n> and this should be ready to merge.\n>\n> Regards,\n> Naush\n>\n> Naushir Patuck (4):\n> ipa: rpi: Use r-value references in the set()/setLocked() functions\n> ipa: rpi: Add erase()/eraseLocked() to RPiController::Metadata\n> ipa: rpi: Add a HW property to determine if the data buffer is strided\n> ipa: rpi: Provide the camera helper with the hardware configuration\n>\n> src/ipa/rpi/cam_helper/cam_helper.cpp | 5 +++++\n> src/ipa/rpi/cam_helper/cam_helper.h | 2 ++\n> src/ipa/rpi/common/ipa_base.cpp | 1 +\n> src/ipa/rpi/controller/controller.cpp | 2 ++\n> src/ipa/rpi/controller/controller.h | 1 +\n> src/ipa/rpi/controller/metadata.h | 23 +++++++++++++++++++----\n> 6 files changed, 30 insertions(+), 4 deletions(-)\n>\n> --\n> 2.43.0\n>","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 EFD5EBD80A\n\tfor ;\n\tWed, 8 Jan 2025 09:02:17 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2BE7661891;\n\tWed, 8 Jan 2025 10:02:17 +0100 (CET)","from mail-yb1-xb35.google.com (mail-yb1-xb35.google.com\n\t[IPv6:2607:f8b0:4864:20::b35])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B5D1C61884\n\tfor ;\n\tWed, 8 Jan 2025 10:02:13 +0100 (CET)","by mail-yb1-xb35.google.com with SMTP id\n\t3f1490d57ef6-e3990f53d30so2400492276.1\n\tfor ;\n\tWed, 08 Jan 2025 01:02:13 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"aKr5OdoI\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google; t=1736326932; x=1736931732;\n\tdarn=lists.libcamera.org; \n\th=to:subject:message-id:date:from:in-reply-to:references:mime-version\n\t:from:to:cc:subject:date:message-id:reply-to;\n\tbh=u1z5+2QTLMIRtuSZK2AUZqrezc4DLtGjcvrwZNHPUxA=;\n\tb=aKr5OdoIn/3WZEqZbAylSud/lNV3jShRWHez7q3rOcV0dj8dRmQeubYPzkRWblPgu2\n\txYTM+8CGXqh4gVfEP5tZQN9uIWvmSqTETOarSa1Ax5FlMjGh8zTkPhiahLiOUzpwtXk6\n\txqzc7Ekt8gg7sI3vNxipbu6qsclhKY5VWQhpa4/g4e1/+e1eoR/GgYQ746yNLje+OBK8\n\tocG84P4SLnIg3sjhXQe4vqm7V8TXkAzF8vDm9yQEYS9mrlCab3HJgaG/ZdmYVjNm/RPk\n\tKaelvDcGWnGDymbGfOUtStR/EIevlnKfYR3JTDMUZbgrIirN1aYeXn03w+jCOv8ejJKb\n\t+vAA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1736326932; x=1736931732;\n\th=to:subject:message-id:date:from:in-reply-to:references:mime-version\n\t:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;\n\tbh=u1z5+2QTLMIRtuSZK2AUZqrezc4DLtGjcvrwZNHPUxA=;\n\tb=SG0uO2qb3MsmMpMrLRmHx4onKSYCCjD6lvEm5CbyEvxCPOWhHAEjjdluq9baQsuHie\n\tBjmP3dFofVKlTV+D6a/v+uWgiyLvPihOi0MYyjsAriIxrcunUnzhag/d92cutNgFOp5R\n\tUBXwH7P7V3ZLku8bFYnJg3jfhqAuus0PknXZB9QYJwUJpHHBihspV8UTIZmmQjXNIeBo\n\tbpkyEvNsM56tV016qmW4pDj9zMIgpcqBIU91b6+18V8My7C/6n0NGhO6z2KdVEjvB/aW\n\tpAj+Px3KxN/Re5rwNX4TKVhbqjWoC5vlSpWMfmQzzW+NdNRmZbnKmH8PiBLHuQ3dj+7P\n\thkrQ==","X-Gm-Message-State":"AOJu0YyhkWxTxVmozXlAJBR1hGbGTJ/6HW6+5aOExHim7pu7tavNtfPh\n\t7iL1jSdTvbvU+B1l/+mOefAcGFVfUGeI2WGtSEAECk0bHYXJ5HPul7THR0WqQytfqpv64kdvlSL\n\tSwrgiUGITEr2/w9KSkeugE65O4FVZyszJDSr0GaqQsbBKyWgR8xo=","X-Gm-Gg":"ASbGnctbBnDbAEJx/1j7ifT0XGW1Nwpz8Lm9TOE85QTNAQpZkzwyaEKDdBztkgj9P5o\n\t/v0qLenXV9+RFadCfkcrwu8svtEZ4hTBqO9aoADZ7a0BAfHHvg0tYjr+HENa8Tlne+rU=","X-Google-Smtp-Source":"AGHT+IHYfm2qjiVLUA4XMFjsEa6F1f8YszZ4ACyEN2U7za37PSIqRKkBsHsB1GRT0MXaF6gvmqXmgUtVLeopr5D+5Gg=","X-Received":"by 2002:a05:690c:9a0a:b0:6ef:97d0:a989 with SMTP id\n\t00721157ae682-6f53122fc8amr6521487b3.4.1736326932029; Wed, 08 Jan 2025\n\t01:02:12 -0800 (PST)","MIME-Version":"1.0","References":"<20241218083610.2397879-1-naush@raspberrypi.com>","In-Reply-To":"<20241218083610.2397879-1-naush@raspberrypi.com>","From":"Naushir Patuck ","Date":"Wed, 8 Jan 2025 09:01:39 +0000","X-Gm-Features":"AbW1kvYXU4Cika-8PnauJ3fpWStzEV6YP7v1HamUWZRoKtSnl6StJoQnXUZsvq0","Message-ID":"","Subject":"Re: [PATCH v2 0/4] Raspberry Pi: Various changes","To":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"UTF-8\"","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\" "}},{"id":32966,"web_url":"https://patchwork.libcamera.org/comment/32966/","msgid":"<173633363971.2992722.1723548401717752587@ping.linuxembedded.co.uk>","date":"2025-01-08T10:53:59","subject":"Re: [PATCH v2 0/4] Raspberry Pi: Various changes","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Naush,\n\nQuoting Naushir Patuck (2025-01-08 09:01:39)\n> Gentle ping - I think these patches are ready to be merged now.\n> \n\nI'm happy to merge them, but they don't currently apply.\nI think I was waiting on you to rebase and repost, but I think I just\nmentioned it in a call, and didn't reply to this series directly.\n\nkbingham@Monstersaurus:~/iob/libcamera/ci/libcamera-gitlab-ci$ ./send-for-testing.sh 4910\ngit -C libcamera fetch --prune libcamera.org\nFrom https://git.libcamera.org/libcamera/libcamera\n 545046a41e17..2d4660b51aee master -> libcamera.org/master\nPreparing patchwork/4910\ngit -C libcamera show-ref --verify --quiet refs/heads/patchwork/4910\ngit -C libcamera branch -D patchwork/4910\nDeleted branch patchwork/4910 (was c71dcb9e8ee5).\ngit -C libcamera checkout -b patchwork/4910\nSwitched to a new branch 'patchwork/4910'\ngit -C libcamera pw series apply 4910 -s\nApplying: ipa: rpi: Use r-value references in the set()/setLocked() functions\nApplying: ipa: rpi: Add erase()/eraseLocked() to RPiController::Metadata\nApplying: ipa: rpi: Add a HW property to determine if the data buffer is strided\nApplying: ipa: rpi: Provide the camera helper with the hardware configuration\nUsing index info to reconstruct a base tree...\nM\tsrc/ipa/rpi/cam_helper/cam_helper.cpp\nM\tsrc/ipa/rpi/cam_helper/cam_helper.h\nM\tsrc/ipa/rpi/common/ipa_base.cpp\nFalling back to patching base and 3-way merge...\nAuto-merging src/ipa/rpi/common/ipa_base.cpp\nAuto-merging src/ipa/rpi/cam_helper/cam_helper.h\nAuto-merging src/ipa/rpi/cam_helper/cam_helper.cpp\nCONFLICT (content): Merge conflict in src/ipa/rpi/cam_helper/cam_helper.cpp\nRecorded preimage for 'src/ipa/rpi/cam_helper/cam_helper.cpp'\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch=diff' to see the failed patch\nhint: When you have resolved this problem, run \"git am --continue\".\nhint: If you prefer to skip this patch, run \"git am --skip\" instead.\nhint: To restore the original branch and stop patching, run \"git am --abort\".\nhint: Disable this message with \"git config advice.mergeConflict false\"\nPatch failed at 0004 ipa: rpi: Provide the camera helper with the hardware configuration\n\n--\nKieran\n\n> On Wed, 18 Dec 2024 at 08:36, Naushir Patuck wrote:\n> >\n> > Hi,\n> >\n> > This revision fixes up all the minor typos reported by David and Laurent. I've\n> > also removed the CNN control related patches. Patch 4/4 needs one more R-B tag\n> > and this should be ready to merge.\n> >\n> > Regards,\n> > Naush\n> >\n> > Naushir Patuck (4):\n> > ipa: rpi: Use r-value references in the set()/setLocked() functions\n> > ipa: rpi: Add erase()/eraseLocked() to RPiController::Metadata\n> > ipa: rpi: Add a HW property to determine if the data buffer is strided\n> > ipa: rpi: Provide the camera helper with the hardware configuration\n> >\n> > src/ipa/rpi/cam_helper/cam_helper.cpp | 5 +++++\n> > src/ipa/rpi/cam_helper/cam_helper.h | 2 ++\n> > src/ipa/rpi/common/ipa_base.cpp | 1 +\n> > src/ipa/rpi/controller/controller.cpp | 2 ++\n> > src/ipa/rpi/controller/controller.h | 1 +\n> > src/ipa/rpi/controller/metadata.h | 23 +++++++++++++++++++----\n> > 6 files changed, 30 insertions(+), 4 deletions(-)\n> >\n> > --\n> > 2.43.0\n> >","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 E18E2BD80A\n\tfor ;\n\tWed, 8 Jan 2025 10:54:04 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 07187684E2;\n\tWed, 8 Jan 2025 11:54:04 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AB00661884\n\tfor ;\n\tWed, 8 Jan 2025 11:54:02 +0100 (CET)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A31F7664;\n\tWed, 8 Jan 2025 11:53:09 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"CLW9464d\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1736333589;\n\tbh=n1nkLAvvD0RLD0DTfN/ksJvFbF//vwmpknS2KM07v5A=;\n\th=In-Reply-To:References:Subject:From:To:Date:From;\n\tb=CLW9464dwkoGQ8TShZYjAqwBf5qwh6K/4k3whZ+C1s3mOJDtdN8h/0LpK+20zUkjX\n\t46Yxg/8gGHkLQwkY0uws4i4wQMupqA2Hsc+1klaJJubz6D0fy64R5CHBKnUPMq5z8a\n\tKHGAFS4qHxkuG8QRoszrC4NOYO3XkfjA+QJqY/nU=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"","References":"<20241218083610.2397879-1-naush@raspberrypi.com>\n\t","Subject":"Re: [PATCH v2 0/4] Raspberry Pi: Various changes","From":"Kieran Bingham ","To":"Naushir Patuck ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Wed, 08 Jan 2025 10:53:59 +0000","Message-ID":"<173633363971.2992722.1723548401717752587@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","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\" "}},{"id":32967,"web_url":"https://patchwork.libcamera.org/comment/32967/","msgid":"","date":"2025-01-08T11:08:12","subject":"Re: [PATCH v2 0/4] Raspberry Pi: Various changes","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/people/34/","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"content":"On Wed, 8 Jan 2025 at 10:54, Kieran Bingham\n wrote:\n>\n> Hi Naush,\n>\n> Quoting Naushir Patuck (2025-01-08 09:01:39)\n> > Gentle ping - I think these patches are ready to be merged now.\n> >\n>\n> I'm happy to merge them, but they don't currently apply.\n> I think I was waiting on you to rebase and repost, but I think I just\n> mentioned it in a call, and didn't reply to this series directly.\n\nOops, did not realise that. I'll post an update to the series now.\n\nNaush\n\n\n>\n> kbingham@Monstersaurus:~/iob/libcamera/ci/libcamera-gitlab-ci$ ./send-for-testing.sh 4910\n> git -C libcamera fetch --prune libcamera.org\n> From https://git.libcamera.org/libcamera/libcamera\n> 545046a41e17..2d4660b51aee master -> libcamera.org/master\n> Preparing patchwork/4910\n> git -C libcamera show-ref --verify --quiet refs/heads/patchwork/4910\n> git -C libcamera branch -D patchwork/4910\n> Deleted branch patchwork/4910 (was c71dcb9e8ee5).\n> git -C libcamera checkout -b patchwork/4910\n> Switched to a new branch 'patchwork/4910'\n> git -C libcamera pw series apply 4910 -s\n> Applying: ipa: rpi: Use r-value references in the set()/setLocked() functions\n> Applying: ipa: rpi: Add erase()/eraseLocked() to RPiController::Metadata\n> Applying: ipa: rpi: Add a HW property to determine if the data buffer is strided\n> Applying: ipa: rpi: Provide the camera helper with the hardware configuration\n> Using index info to reconstruct a base tree...\n> M src/ipa/rpi/cam_helper/cam_helper.cpp\n> M src/ipa/rpi/cam_helper/cam_helper.h\n> M src/ipa/rpi/common/ipa_base.cpp\n> Falling back to patching base and 3-way merge...\n> Auto-merging src/ipa/rpi/common/ipa_base.cpp\n> Auto-merging src/ipa/rpi/cam_helper/cam_helper.h\n> Auto-merging src/ipa/rpi/cam_helper/cam_helper.cpp\n> CONFLICT (content): Merge conflict in src/ipa/rpi/cam_helper/cam_helper.cpp\n> Recorded preimage for 'src/ipa/rpi/cam_helper/cam_helper.cpp'\n> error: Failed to merge in the changes.\n> hint: Use 'git am --show-current-patch=diff' to see the failed patch\n> hint: When you have resolved this problem, run \"git am --continue\".\n> hint: If you prefer to skip this patch, run \"git am --skip\" instead.\n> hint: To restore the original branch and stop patching, run \"git am --abort\".\n> hint: Disable this message with \"git config advice.mergeConflict false\"\n> Patch failed at 0004 ipa: rpi: Provide the camera helper with the hardware configuration\n>\n> --\n> Kieran\n>\n> > On Wed, 18 Dec 2024 at 08:36, Naushir Patuck wrote:\n> > >\n> > > Hi,\n> > >\n> > > This revision fixes up all the minor typos reported by David and Laurent. I've\n> > > also removed the CNN control related patches. Patch 4/4 needs one more R-B tag\n> > > and this should be ready to merge.\n> > >\n> > > Regards,\n> > > Naush\n> > >\n> > > Naushir Patuck (4):\n> > > ipa: rpi: Use r-value references in the set()/setLocked() functions\n> > > ipa: rpi: Add erase()/eraseLocked() to RPiController::Metadata\n> > > ipa: rpi: Add a HW property to determine if the data buffer is strided\n> > > ipa: rpi: Provide the camera helper with the hardware configuration\n> > >\n> > > src/ipa/rpi/cam_helper/cam_helper.cpp | 5 +++++\n> > > src/ipa/rpi/cam_helper/cam_helper.h | 2 ++\n> > > src/ipa/rpi/common/ipa_base.cpp | 1 +\n> > > src/ipa/rpi/controller/controller.cpp | 2 ++\n> > > src/ipa/rpi/controller/controller.h | 1 +\n> > > src/ipa/rpi/controller/metadata.h | 23 +++++++++++++++++++----\n> > > 6 files changed, 30 insertions(+), 4 deletions(-)\n> > >\n> > > --\n> > > 2.43.0\n> > >","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 30584C32EF\n\tfor ;\n\tWed, 8 Jan 2025 11:08:49 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4AF92684E2;\n\tWed, 8 Jan 2025 12:08:48 +0100 (CET)","from mail-yb1-xb2a.google.com (mail-yb1-xb2a.google.com\n\t[IPv6:2607:f8b0:4864:20::b2a])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1E5F9608AB\n\tfor ;\n\tWed, 8 Jan 2025 12:08:46 +0100 (CET)","by mail-yb1-xb2a.google.com with SMTP id\n\t3f1490d57ef6-e3c88163a00so2469728276.2\n\tfor ;\n\tWed, 08 Jan 2025 03:08:46 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"b4UaPd7z\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google; t=1736334525; x=1736939325;\n\tdarn=lists.libcamera.org; \n\th=cc:to:subject:message-id:date:from:in-reply-to:references\n\t:mime-version:from:to:cc:subject:date:message-id:reply-to;\n\tbh=FXfEocgUCozRt6RDNvPmVCQmQUeqx5f0W4lFhwuS/7o=;\n\tb=b4UaPd7zhHKrDfO49s0rDdd6kN2XT3LQRJ1sIZEXMCWBv/hIeQZ7Pnz7fAa7GUaK97\n\tgpjB/5JyRRXirWKMmMRceaz4KbiTndB4050YMK3ZNLbA3foZBPHBcwqSHk5lSoqBZHhy\n\t8USvpIS4lWGiE7ejp0BL/VNkT9A5jlATOeJA3XRw6kTuHh33lCLDoaF1HgWCB5sHFuEN\n\tHZZSYifTa8bQApJiMVGDBi0t5r7C89kct/YE4nkf3vEEIrNqzM7klnAeBfgxxNOxXIyd\n\tArSWZODhSt2tIoDCYl6EY0YWjmOysftwDcnH298iqLvRDXQ56DK3mF8rT1R0b3oaEjCF\n\tPeBQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1736334525; x=1736939325;\n\th=cc:to:subject:message-id:date:from:in-reply-to:references\n\t:mime-version:x-gm-message-state:from:to:cc:subject:date:message-id\n\t:reply-to;\n\tbh=FXfEocgUCozRt6RDNvPmVCQmQUeqx5f0W4lFhwuS/7o=;\n\tb=fBtC5oSkCQ/pIpF6WI+w16vX++oaanpobCHPF4kiO1DPaRnQuQshp3Pu0T9PeMcLTD\n\tj6O9EY8BDLtBjneX5ULIKqZHRJRgC/ahgf+WH45RxdkP0RJL5HAZiY4FH4a058dsDqWj\n\tFHFkphz109SmRA7Mm0FDjNIcrwsXHI++8yWg80boawyYcnsleVINPqKB9LSrfreAnpPI\n\tltqdy3OTnuck77wFAgSiVvETC1urEdxI+XFscxylkM1hZCp2DufnlrXbq/P75o9z0cvF\n\t8I8AebuDBajZpkgmEQ+iVPCgnriJwkptCzENLaRHGkAqkGSAL2PHTSmZeEt+mMB+bl+p\n\tjo/Q==","X-Gm-Message-State":"AOJu0YyKDttk+ijCwaszkS42fYQJ8EieXwK90pqsBVq7Uift7Wo286Us\n\t4SfShx4Qqc9pYRzAGKo7OIY1TRDNBSkgM0jQibq/TYRQw5h24feoyq1wWmiYQqdOJMyMd7l6Xxe\n\tnYK43Yn0psQTr+cCOC51sVVtW4FoH98PjE9F3QMdJwdTtHQx4uhk=","X-Gm-Gg":"ASbGncuJ23U8fombis6LtNracTu/b2dFVO9esWhG75YuJFiQmmNo5eIEtAIJRA3Y0Jc\n\tHYgnqjJvpI2+VbOQlfrWAl4sVA45yuufJwEbDc02pLx3U/ZOXThMQYvq2y2d95wVZgA8=","X-Google-Smtp-Source":"AGHT+IG/lMss6dXRA6mLSD85QOEeWxWBH4vKrd7thzlVmBbw9FAK8StF7fDV8j0U763+8X7nL3sDkuf49Y+twvYV9kY=","X-Received":"by 2002:a05:690c:c1b:b0:6ef:6a91:4963 with SMTP id\n\t00721157ae682-6f5312ccdf7mr6174947b3.8.1736334524910; Wed, 08 Jan 2025\n\t03:08:44 -0800 (PST)","MIME-Version":"1.0","References":"<20241218083610.2397879-1-naush@raspberrypi.com>\n\t\n\t<173633363971.2992722.1723548401717752587@ping.linuxembedded.co.uk>","In-Reply-To":"<173633363971.2992722.1723548401717752587@ping.linuxembedded.co.uk>","From":"Naushir Patuck ","Date":"Wed, 8 Jan 2025 11:08:12 +0000","X-Gm-Features":"AbW1kvZj0fbMg6qyyq6dXgzCBR8jq4T2J4G7yDsKYd2RlIohzHM1eCqmIKc5OcQ","Message-ID":"","Subject":"Re: [PATCH v2 0/4] Raspberry Pi: Various changes","To":"Kieran Bingham ","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"UTF-8\"","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\" "}},{"id":32969,"web_url":"https://patchwork.libcamera.org/comment/32969/","msgid":"<173633962816.2992722.17831225013535750456@ping.linuxembedded.co.uk>","date":"2025-01-08T12:33:48","subject":"Re: [PATCH v2 0/4] Raspberry Pi: Various changes","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Naushir Patuck (2025-01-08 11:08:12)\n> On Wed, 8 Jan 2025 at 10:54, Kieran Bingham\n> wrote:\n> >\n> > Hi Naush,\n> >\n> > Quoting Naushir Patuck (2025-01-08 09:01:39)\n> > > Gentle ping - I think these patches are ready to be merged now.\n> > >\n> >\n> > I'm happy to merge them, but they don't currently apply.\n> > I think I was waiting on you to rebase and repost, but I think I just\n> > mentioned it in a call, and didn't reply to this series directly.\n> \n> Oops, did not realise that. I'll post an update to the series now.\n\nSorry - I should have referenced here indeed. Thanks for the repost - CI\nis running now:\nhttps://gitlab.freedesktop.org/camera/libcamera/-/pipelines/1341601 so I\nexpect it to merge imminently.\n\n--\nKieran\n\n> \n> Naush\n> \n> \n> >\n> > kbingham@Monstersaurus:~/iob/libcamera/ci/libcamera-gitlab-ci$ ./send-for-testing.sh 4910\n> > git -C libcamera fetch --prune libcamera.org\n> > From https://git.libcamera.org/libcamera/libcamera\n> > 545046a41e17..2d4660b51aee master -> libcamera.org/master\n> > Preparing patchwork/4910\n> > git -C libcamera show-ref --verify --quiet refs/heads/patchwork/4910\n> > git -C libcamera branch -D patchwork/4910\n> > Deleted branch patchwork/4910 (was c71dcb9e8ee5).\n> > git -C libcamera checkout -b patchwork/4910\n> > Switched to a new branch 'patchwork/4910'\n> > git -C libcamera pw series apply 4910 -s\n> > Applying: ipa: rpi: Use r-value references in the set()/setLocked() functions\n> > Applying: ipa: rpi: Add erase()/eraseLocked() to RPiController::Metadata\n> > Applying: ipa: rpi: Add a HW property to determine if the data buffer is strided\n> > Applying: ipa: rpi: Provide the camera helper with the hardware configuration\n> > Using index info to reconstruct a base tree...\n> > M src/ipa/rpi/cam_helper/cam_helper.cpp\n> > M src/ipa/rpi/cam_helper/cam_helper.h\n> > M src/ipa/rpi/common/ipa_base.cpp\n> > Falling back to patching base and 3-way merge...\n> > Auto-merging src/ipa/rpi/common/ipa_base.cpp\n> > Auto-merging src/ipa/rpi/cam_helper/cam_helper.h\n> > Auto-merging src/ipa/rpi/cam_helper/cam_helper.cpp\n> > CONFLICT (content): Merge conflict in src/ipa/rpi/cam_helper/cam_helper.cpp\n> > Recorded preimage for 'src/ipa/rpi/cam_helper/cam_helper.cpp'\n> > error: Failed to merge in the changes.\n> > hint: Use 'git am --show-current-patch=diff' to see the failed patch\n> > hint: When you have resolved this problem, run \"git am --continue\".\n> > hint: If you prefer to skip this patch, run \"git am --skip\" instead.\n> > hint: To restore the original branch and stop patching, run \"git am --abort\".\n> > hint: Disable this message with \"git config advice.mergeConflict false\"\n> > Patch failed at 0004 ipa: rpi: Provide the camera helper with the hardware configuration\n> >\n> > --\n> > Kieran\n> >\n> > > On Wed, 18 Dec 2024 at 08:36, Naushir Patuck wrote:\n> > > >\n> > > > Hi,\n> > > >\n> > > > This revision fixes up all the minor typos reported by David and Laurent. I've\n> > > > also removed the CNN control related patches. Patch 4/4 needs one more R-B tag\n> > > > and this should be ready to merge.\n> > > >\n> > > > Regards,\n> > > > Naush\n> > > >\n> > > > Naushir Patuck (4):\n> > > > ipa: rpi: Use r-value references in the set()/setLocked() functions\n> > > > ipa: rpi: Add erase()/eraseLocked() to RPiController::Metadata\n> > > > ipa: rpi: Add a HW property to determine if the data buffer is strided\n> > > > ipa: rpi: Provide the camera helper with the hardware configuration\n> > > >\n> > > > src/ipa/rpi/cam_helper/cam_helper.cpp | 5 +++++\n> > > > src/ipa/rpi/cam_helper/cam_helper.h | 2 ++\n> > > > src/ipa/rpi/common/ipa_base.cpp | 1 +\n> > > > src/ipa/rpi/controller/controller.cpp | 2 ++\n> > > > src/ipa/rpi/controller/controller.h | 1 +\n> > > > src/ipa/rpi/controller/metadata.h | 23 +++++++++++++++++++----\n> > > > 6 files changed, 30 insertions(+), 4 deletions(-)\n> > > >\n> > > > --\n> > > > 2.43.0\n> > > >","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 0FC38C32EF\n\tfor ;\n\tWed, 8 Jan 2025 12:33:55 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id F279D684D0;\n\tWed, 8 Jan 2025 13:33:53 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id ADB27608AB\n\tfor ;\n\tWed, 8 Jan 2025 13:33:51 +0100 (CET)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B73215B3;\n\tWed, 8 Jan 2025 13:32:58 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"SUlLklCZ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1736339578;\n\tbh=5ozv40u9Pl2tHjTm4HB1/IqZGl1XxbDRNiJfbXSn8jo=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=SUlLklCZW8GnO97rENjchop02WaAQpqy8/urOxvFhxKbKDJbXhN5KNOGahUS2kN5D\n\tSNeNQUIPva5kaz8DwAUerY3MBn/yOy0mfcEraR3qEGiQHUdsOlvEwdKYkM4aN9PP3i\n\ttORHKV4FY8u+Tnw9dJq767EgM+gfcGxVZ60K6u1Y=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"","References":"<20241218083610.2397879-1-naush@raspberrypi.com>\n\t\n\t<173633363971.2992722.1723548401717752587@ping.linuxembedded.co.uk>\n\t","Subject":"Re: [PATCH v2 0/4] Raspberry Pi: Various changes","From":"Kieran Bingham ","Cc":"libcamera-devel@lists.libcamera.org","To":"Naushir Patuck ","Date":"Wed, 08 Jan 2025 12:33:48 +0000","Message-ID":"<173633962816.2992722.17831225013535750456@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","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\" "}}]