On Tue Jan 27 13:43:07 2026 +0100, Martin Tůma wrote:
> Add zDML (a special signal mapping as used in Audi Digital Matrix Lights)
> color mapping support. In addition to extending the already existing color
> mapping property of the inputs, the same property is added for the outputs
> that must be configured in the same way as the inputs.
>
> Signed-off-by: Martin Tůma <[email protected]>
> Signed-off-by: Hans Verkuil <[email protected]>
Patch committed.
Thanks,
Hans Verkuil
drivers/media/pci/mgb4/mgb4_sysfs_in.c | 18 ++++++++--
drivers/media/pci/mgb4/mgb4_sysfs_out.c | 62 +++++++++++++++++++++++++++++++++
2 files changed, 77 insertions(+), 3 deletions(-)
---
diff --git a/drivers/media/pci/mgb4/mgb4_sysfs_in.c
b/drivers/media/pci/mgb4/mgb4_sysfs_in.c
index 4cd4addcd0a5..80ff05450e98 100644
--- a/drivers/media/pci/mgb4/mgb4_sysfs_in.c
+++ b/drivers/media/pci/mgb4/mgb4_sysfs_in.c
@@ -128,7 +128,16 @@ static ssize_t color_mapping_show(struct device *dev,
u32 config = mgb4_read_reg(&vindev->mgbdev->video,
vindev->config->regs.config);
- return sprintf(buf, "%s\n", config & (1U << 8) ? "0" : "1");
+ switch ((config >> 7) & 3) {
+ case 0: /* SPWG/VESA */
+ return sprintf(buf, "1\n");
+ case 1: /* ZDML */
+ return sprintf(buf, "2\n");
+ case 2: /* OLDI/JEIDA */
+ return sprintf(buf, "0\n");
+ default:
+ return -EIO;
+ }
}
/*
@@ -151,17 +160,20 @@ static ssize_t color_mapping_store(struct device *dev,
switch (val) {
case 0: /* OLDI/JEIDA */
- fpga_data = (1U << 8);
+ fpga_data = 2;
break;
case 1: /* SPWG/VESA */
fpga_data = 0;
break;
+ case 2: /* ZDML */
+ fpga_data = 1;
+ break;
default:
return -EINVAL;
}
mgb4_mask_reg(&vindev->mgbdev->video, vindev->config->regs.config,
- 1U << 8, fpga_data);
+ 3U << 7, fpga_data << 7);
return count;
}
diff --git a/drivers/media/pci/mgb4/mgb4_sysfs_out.c
b/drivers/media/pci/mgb4/mgb4_sysfs_out.c
index 5769f3ca6c2f..d807218e28ca 100644
--- a/drivers/media/pci/mgb4/mgb4_sysfs_out.c
+++ b/drivers/media/pci/mgb4/mgb4_sysfs_out.c
@@ -143,6 +143,64 @@ end:
return ret;
}
+static ssize_t color_mapping_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct video_device *vdev = to_video_device(dev);
+ struct mgb4_vout_dev *voutdev = video_get_drvdata(vdev);
+ u32 config = mgb4_read_reg(&voutdev->mgbdev->video,
+ voutdev->config->regs.config);
+
+ switch ((config >> 6) & 3) {
+ case 0: /* SPWG/VESA */
+ return sprintf(buf, "1\n");
+ case 1: /* ZDML */
+ return sprintf(buf, "2\n");
+ case 2: /* OLDI/JEIDA */
+ return sprintf(buf, "0\n");
+ default:
+ return -EIO;
+ }
+}
+
+/*
+ * Color mapping change is expected to be called on live streams. Video device
+ * locking/queue check is not needed.
+ */
+static ssize_t color_mapping_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ struct video_device *vdev = to_video_device(dev);
+ struct mgb4_vout_dev *voutdev = video_get_drvdata(vdev);
+ u32 fpga_data;
+ unsigned long val;
+ int ret;
+
+ ret = kstrtoul(buf, 10, &val);
+ if (ret)
+ return ret;
+
+ switch (val) {
+ case 0: /* OLDI/JEIDA */
+ fpga_data = 2;
+ break;
+ case 1: /* SPWG/VESA */
+ fpga_data = 0;
+ break;
+ case 2: /* ZDML */
+ fpga_data = 1;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ mgb4_mask_reg(&voutdev->mgbdev->video, voutdev->config->regs.config,
+ 3U << 6, fpga_data << 6);
+
+ return count;
+}
+
static ssize_t display_width_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
@@ -711,6 +769,7 @@ static DEVICE_ATTR_RW(hback_porch);
static DEVICE_ATTR_RW(hfront_porch);
static DEVICE_ATTR_RW(vback_porch);
static DEVICE_ATTR_RW(vfront_porch);
+static DEVICE_ATTR_RW(color_mapping);
static DEVICE_ATTR_RW(fpdl3_output_width);
@@ -731,6 +790,7 @@ struct attribute *mgb4_fpdl3_out_attrs[] = {
&dev_attr_vback_porch.attr,
&dev_attr_vfront_porch.attr,
&dev_attr_fpdl3_output_width.attr,
+ &dev_attr_color_mapping.attr,
NULL
};
@@ -740,6 +800,7 @@ struct attribute *mgb4_gmsl3_out_attrs[] = {
&dev_attr_display_width.attr,
&dev_attr_display_height.attr,
&dev_attr_frame_rate.attr,
+ &dev_attr_color_mapping.attr,
NULL
};
@@ -759,5 +820,6 @@ struct attribute *mgb4_gmsl1_out_attrs[] = {
&dev_attr_hfront_porch.attr,
&dev_attr_vback_porch.attr,
&dev_attr_vfront_porch.attr,
+ &dev_attr_color_mapping.attr,
NULL
};
_______________________________________________
linuxtv-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
