Patch Detail
Show a patch.
GET /api/patches/13608/?format=api
{ "id": 13608, "url": "https://patchwork.libcamera.org/api/patches/13608/?format=api", "web_url": "https://patchwork.libcamera.org/patch/13608/", "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": "<20210902132930.76137-1-jeanmichel.hautbois@ideasonboard.com>", "date": "2021-09-02T13:29:30", "name": "[libcamera-devel] ipa: ipu3: Replace ipa::ipu3::algorithms::Ipu3AwbCell", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "123ee84d2a5c0ac67f6ebdeb9b1d091ad770cfca", "submitter": { "id": 75, "url": "https://patchwork.libcamera.org/api/people/75/?format=api", "name": "Jean-Michel Hautbois", "email": "jeanmichel.hautbois@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/13608/mbox/", "series": [ { "id": 2440, "url": "https://patchwork.libcamera.org/api/series/2440/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2440", "date": "2021-09-02T13:29:30", "name": "[libcamera-devel] ipa: ipu3: Replace ipa::ipu3::algorithms::Ipu3AwbCell", "version": 1, "mbox": "https://patchwork.libcamera.org/series/2440/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/13608/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/13608/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 A6E20BD87D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 2 Sep 2021 13:29:36 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 13D346916D;\n\tThu, 2 Sep 2021 15:29:36 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 580C060255\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 2 Sep 2021 15:29:34 +0200 (CEST)", "from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:43b0:6633:e0bd:5dc6])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id F1F6245E;\n\tThu, 2 Sep 2021 15:29:33 +0200 (CEST)" ], "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=\"CQdWc9dH\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1630589374;\n\tbh=mbpGgZqZr8JboCvcD97ioKowTmZ895zVcyB5Db3a1Uo=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=CQdWc9dHH4/Av5V6efMesgXME0M5DBRaSjR2UYHE7YFAHxyH4Bi3L4KGC9UB+Avei\n\twG/1R73I7JrUwe+oiC2O4fWvZp3x30VXdD2KxFlLfGBKQ+rLOsMVQ4jNsRKdy+e6gG\n\t1eg1ktto0H4Y/zdwc/FWWmyqxEQeMe58EyrjHZi4=", "From": "Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 2 Sep 2021 15:29:30 +0200", "Message-Id": "<20210902132930.76137-1-jeanmichel.hautbois@ideasonboard.com>", "X-Mailer": "git-send-email 2.30.2", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH] ipa: ipu3: Replace\n\tipa::ipu3::algorithms::Ipu3AwbCell", "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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "This patch was proposed in:\nhttps://lore.kernel.org/linux-media/20210831185140.77400-1-jeanmichel.hautbois@ideasonboard.com/\n\nIt introduces the AWB metadata layout as a structure in the kernel\nheader, to make it clear for userspace applications. As intel-ipu3.h now\nhas a defined AWB layout, use that one instead of the\nipa::ipu3::algorithms::Ipu3AwbCell.\n\nSigned-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>\n---\n include/linux/intel-ipu3.h | 38 +++++++++++++++++++++++++--------\n src/ipa/ipu3/algorithms/agc.cpp | 7 +++---\n src/ipa/ipu3/algorithms/awb.cpp | 10 ++++-----\n src/ipa/ipu3/algorithms/awb.h | 10 ---------\n 4 files changed, 38 insertions(+), 27 deletions(-)", "diff": "diff --git a/include/linux/intel-ipu3.h b/include/linux/intel-ipu3.h\nindex ee0e6d0e..0633e04e 100644\n--- a/include/linux/intel-ipu3.h\n+++ b/include/linux/intel-ipu3.h\n@@ -59,20 +59,40 @@ struct ipu3_uapi_grid_config {\n \t__u16 y_end;\n } __attribute__((packed));\n \n+/**\n+ * struct ipu3_uapi_awb_set_item - Memory layout for each cell in AWB\n+ *\n+ * @Gr_avg:\tGreen average for red lines in the cell.\n+ * @R_avg:\tRed average in the cell.\n+ * @B_avg:\tBlue average in the cell.\n+ * @Gb_avg:\tGreen average for blue lines in the cell.\n+ * @sat_ratio: Saturation ratio in the cell.\n+ * @padding0: Unused byte for padding.\n+ * @padding1: Unused byte for padding.\n+ * @padding2: Unused byte for padding.\n+ */\n+struct ipu3_uapi_awb_set_item {\n+\tunsigned char Gr_avg;\n+\tunsigned char R_avg;\n+\tunsigned char B_avg;\n+\tunsigned char Gb_avg;\n+\tunsigned char sat_ratio;\n+\tunsigned char padding0;\n+\tunsigned char padding1;\n+\tunsigned char padding2;\n+} __attribute__((packed));\n+\n /*\n * The grid based data is divided into \"slices\" called set, each slice of setX\n * refers to ipu3_uapi_grid_config width * height_per_slice.\n */\n #define IPU3_UAPI_AWB_MAX_SETS\t\t\t\t60\n-/* Based on grid size 80 * 60 and cell size 16 x 16 */\n-#define IPU3_UAPI_AWB_SET_SIZE\t\t\t\t1280\n-#define IPU3_UAPI_AWB_MD_ITEM_SIZE\t\t\t8\n-#define IPU3_UAPI_AWB_SPARE_FOR_BUBBLES \\\n-\t(IPU3_UAPI_MAX_BUBBLE_SIZE * IPU3_UAPI_MAX_STRIPES * \\\n-\t IPU3_UAPI_AWB_MD_ITEM_SIZE)\n+#define AWB_PUBLIC_NUM_OF_ITEMS_IN_SET\t\t\t160\n+/* Based on max grid height + Spare for bubbles */\n+#define AWB_PUBLIC_NUM_OF_SETS_IN_BUFFER IPU3_UAPI_AWB_MAX_SETS + \\\n+\t(IPU3_UAPI_MAX_BUBBLE_SIZE * IPU3_UAPI_MAX_STRIPES)\n #define IPU3_UAPI_AWB_MAX_BUFFER_SIZE \\\n-\t(IPU3_UAPI_AWB_MAX_SETS * \\\n-\t (IPU3_UAPI_AWB_SET_SIZE + IPU3_UAPI_AWB_SPARE_FOR_BUBBLES))\n+ AWB_PUBLIC_NUM_OF_SETS_IN_BUFFER * AWB_PUBLIC_NUM_OF_ITEMS_IN_SET\n \n \n /**\n@@ -82,7 +102,7 @@ struct ipu3_uapi_grid_config {\n *\t\tthe average values for each color channel.\n */\n struct ipu3_uapi_awb_raw_buffer {\n-\t__u8 meta_data[IPU3_UAPI_AWB_MAX_BUFFER_SIZE]\n+\tstruct ipu3_uapi_awb_set_item meta_data[IPU3_UAPI_AWB_MAX_BUFFER_SIZE]\n \t\t__attribute__((aligned(32)));\n } __attribute__((packed));\n \ndiff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp\nindex 5ff50f4a..36f648be 100644\n--- a/src/ipa/ipu3/algorithms/agc.cpp\n+++ b/src/ipa/ipu3/algorithms/agc.cpp\n@@ -96,9 +96,10 @@ void Agc::processBrightness(const ipu3_uapi_stats_3a *stats,\n \t\t\t * We observed a bit shift which makes the value 160 to be 32 in the stats grid.\n \t\t\t * Use the one passed at init time.\n \t\t\t */\n-\t\t\tif (stats->awb_raw_buffer.meta_data[i + 4 + j * grid.width] == 0) {\n-\t\t\t\tuint8_t Gr = stats->awb_raw_buffer.meta_data[i + 0 + j * grid.width];\n-\t\t\t\tuint8_t Gb = stats->awb_raw_buffer.meta_data[i + 3 + j * grid.width];\n+\t\t\tconst ipu3_uapi_awb_set_item *currentCell = &stats->awb_raw_buffer.meta_data[i + 4 + j * grid.width];\n+\t\t\tif (currentCell->sat_ratio == 0) {\n+\t\t\t\tuint8_t Gr = currentCell->Gr_avg;\n+\t\t\t\tuint8_t Gb = currentCell->Gb_avg;\n \t\t\t\thist[(Gr + Gb) / 2]++;\n \t\t\t\tcount++;\n \t\t\t}\ndiff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp\nindex ea567f96..db0a22d3 100644\n--- a/src/ipa/ipu3/algorithms/awb.cpp\n+++ b/src/ipa/ipu3/algorithms/awb.cpp\n@@ -207,14 +207,14 @@ void Awb::generateAwbStats(const ipu3_uapi_stats_3a *stats,\n \t\t\tcellPosition *= 8;\n \n \t\t\t/* Cast the initial IPU3 structure to simplify the reading */\n-\t\t\tIpu3AwbCell *currentCell = reinterpret_cast<Ipu3AwbCell *>(const_cast<uint8_t *>(&stats->awb_raw_buffer.meta_data[cellPosition]));\n-\t\t\tif (currentCell->satRatio == 0) {\n+\t\t\tconst ipu3_uapi_awb_set_item *currentCell = &stats->awb_raw_buffer.meta_data[cellPosition];\n+\t\t\tif (currentCell->sat_ratio == 0) {\n \t\t\t\t/* The cell is not saturated, use the current cell */\n \t\t\t\tawbStats_[awbRegionPosition].counted++;\n-\t\t\t\tuint32_t greenValue = currentCell->greenRedAvg + currentCell->greenBlueAvg;\n+\t\t\t\tuint32_t greenValue = currentCell->Gr_avg + currentCell->Gb_avg;\n \t\t\t\tawbStats_[awbRegionPosition].sum.green += greenValue / 2;\n-\t\t\t\tawbStats_[awbRegionPosition].sum.red += currentCell->redAvg;\n-\t\t\t\tawbStats_[awbRegionPosition].sum.blue += currentCell->blueAvg;\n+\t\t\t\tawbStats_[awbRegionPosition].sum.red += currentCell->R_avg;\n+\t\t\t\tawbStats_[awbRegionPosition].sum.blue += currentCell->B_avg;\n \t\t\t}\n \t\t}\n \t}\ndiff --git a/src/ipa/ipu3/algorithms/awb.h b/src/ipa/ipu3/algorithms/awb.h\nindex 23f3e872..a9320b4c 100644\n--- a/src/ipa/ipu3/algorithms/awb.h\n+++ b/src/ipa/ipu3/algorithms/awb.h\n@@ -23,16 +23,6 @@ namespace ipa::ipu3::algorithms {\n static constexpr uint32_t kAwbStatsSizeX = 16;\n static constexpr uint32_t kAwbStatsSizeY = 12;\n \n-/* \\todo Move the cell layout into intel-ipu3.h kernel header */\n-struct Ipu3AwbCell {\n-\tunsigned char greenRedAvg;\n-\tunsigned char redAvg;\n-\tunsigned char blueAvg;\n-\tunsigned char greenBlueAvg;\n-\tunsigned char satRatio;\n-\tunsigned char padding[3];\n-} __attribute__((packed));\n-\n struct Accumulator {\n \tunsigned int counted;\n \tunsigned int total;\n", "prefixes": [ "libcamera-devel" ] }