media: staging: ipu3-imgu: add the AWB memory layout

While parsing the RAW AWB metadata, the AWB layout was missing to fully
understand which byte corresponds to which feature. Make the field names
and usage explicit, as it is used by the userspace applications.

[Sakari Ailus: Changed wording of sat_ratio field as per review comments,
	       fixed a whitespace issue.]

Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Bingbu Cao <bingbu.cao@intel.com>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/ipu3/include/uapi/intel-ipu3.h b/drivers/staging/media/ipu3/include/uapi/intel-ipu3.h
index a3ffd486d291720825b9f93874ec1a71a6aa50e5..dbdd015ce2201c414eb423cf2c7957a6f5f5cce8 100644 (file)
--- a/drivers/staging/media/ipu3/include/uapi/intel-ipu3.h
+++ b/drivers/staging/media/ipu3/include/uapi/intel-ipu3.h
@@ -67,17 +67,39 @@ struct ipu3_uapi_grid_config {
        __u16 y_end;
 } __packed;
 
+/**
+ * struct ipu3_uapi_awb_set_item - Memory layout for each cell in AWB
+ *
+ * @Gr_avg:    Green average for red lines in the cell.
+ * @R_avg:     Red average in the cell.
+ * @B_avg:     Blue average in the cell.
+ * @Gb_avg:    Green average for blue lines in the cell.
+ * @sat_ratio:  Percentage of pixels over the thresholds specified in
+ *             ipu3_uapi_awb_config_s, coded from 0 to 255.
+ * @padding0:   Unused byte for padding.
+ * @padding1:   Unused byte for padding.
+ * @padding2:   Unused byte for padding.
+ */
+struct ipu3_uapi_awb_set_item {
+       __u8 Gr_avg;
+       __u8 R_avg;
+       __u8 B_avg;
+       __u8 Gb_avg;
+       __u8 sat_ratio;
+       __u8 padding0;
+       __u8 padding1;
+       __u8 padding2;
+} __attribute__((packed));
+
 /*
  * The grid based data is divided into "slices" called set, each slice of setX
  * refers to ipu3_uapi_grid_config width * height_per_slice.
  */
 #define IPU3_UAPI_AWB_MAX_SETS                         60
 /* Based on grid size 80 * 60 and cell size 16 x 16 */
-#define IPU3_UAPI_AWB_SET_SIZE                         1280
-#define IPU3_UAPI_AWB_MD_ITEM_SIZE                     8
+#define IPU3_UAPI_AWB_SET_SIZE                         160
 #define IPU3_UAPI_AWB_SPARE_FOR_BUBBLES \
-       (IPU3_UAPI_MAX_BUBBLE_SIZE * IPU3_UAPI_MAX_STRIPES * \
-        IPU3_UAPI_AWB_MD_ITEM_SIZE)
+       (IPU3_UAPI_MAX_BUBBLE_SIZE * IPU3_UAPI_MAX_STRIPES)
 #define IPU3_UAPI_AWB_MAX_BUFFER_SIZE \
        (IPU3_UAPI_AWB_MAX_SETS * \
         (IPU3_UAPI_AWB_SET_SIZE + IPU3_UAPI_AWB_SPARE_FOR_BUBBLES))
@@ -89,7 +111,7 @@ struct ipu3_uapi_grid_config {
  *             the average values for each color channel.
  */
 struct ipu3_uapi_awb_raw_buffer {
-       __u8 meta_data[IPU3_UAPI_AWB_MAX_BUFFER_SIZE]
+       struct ipu3_uapi_awb_set_item meta_data[IPU3_UAPI_AWB_MAX_BUFFER_SIZE]
                __attribute__((aligned(32)));
 } __packed;