media: rockchip: hdmirx: add DT-driven edid-version + set 600M for OPi5U (#488)

* media: rockchip: hdmirx: add edid version to disable NV24

Add two new EDID variants (HDMIRX_EDID_340M_NV12 = 3 and
HDMIRX_EDID_600M_NV12 = 4) that omit the YCbCr 4:4:4 (NV24) capability
bit and let the driver fix up the EDID checksum accordingly. Read the
selected variant from the new `edid-version` DT property on the
hdmirx_ctrler node so per-board defaults can be chosen without
requiring userspace to poke the edid sysfs file at boot.

This is a direct prerequisite for board DTS files that want to advertise
a default EDID other than the hard-coded 340MHz variant.

Signed-off-by: jensen <jensenhuang@friendlyarm.com>
[smazurov@gmail.com: cherry-picked unmodified from friendlyarm/kernel-rockchip
 commit ee391fb22 on branch nanopi6-v6.1.y. Applies cleanly on top of
 armbian/linux-rockchip rk-6.1-rkr5.1 (with offsets, due to subsequent
 unrelated drift). Tested on Orange Pi 5 Ultra (RK3588) with both 1080p60
 and 4K60 HDMI sources; required by the companion DTS patch which sets
 edid-version = <2> for OPi5U.]
Tested-by: Stepan Mazurov <smazurov@gmail.com>
Signed-off-by: Stepan Mazurov <smazurov@gmail.com>

* arm64: dts: rockchip: opi5-ultra: default hdmirx edid-version to 600M

Set edid-version = <2> (HDMIRX_EDID_600M) on the hdmirx_ctrler node so
the default EDID advertised to upstream HDMI sources includes the
TMDS-up-to-600MHz block (covering 4K@60 modes), instead of the driver's
built-in HDMIRX_EDID_340M default which advertises only up to TMDS
340MHz (1080p60 / 4K@30).

Symptom without this property on Orange Pi 5 Ultra: a 4K-capable HDMI
source (tested with a Linux desktop pushing 3840x2160@60 from a discrete
GPU) cycles indefinitely between TMDS-valid and TMDS-invalid states.
The hdmirx PHY rejects the source's 4K stream because the EDID the
source read did not advertise 4K support, yet the source insists on
4K based on its own display configuration. Writing "2" to
/sys/devices/platform/fdee0000.hdmirx-controller/hdmirx/hdmirx/edid
at runtime resolves the symptom immediately and stably; this DTS change
makes the runtime fix the default at boot.

The Rock 5B+ and NanoPC-T6 board DTS files already set similar
edid-version properties; Orange Pi 5 Ultra was missing the equivalent.

Depends on the rk_hdmirx driver reading edid-version from DT
(prerequisite patch: cherry-pick of friendlyarm/kernel-rockchip commit
ee391fb22 in the companion patch).

Tested-by: Stepan Mazurov <smazurov@gmail.com>
Signed-off-by: Stepan Mazurov <smazurov@gmail.com>

---------

Signed-off-by: jensen <jensenhuang@friendlyarm.com>
Signed-off-by: Stepan Mazurov <smazurov@gmail.com>
Co-authored-by: jensen <jensenhuang@friendlyarm.com>

Author: smazurov

arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-ultra.dts

@@ -1400,6 +1400,7 @@
 /* Should work with at least 128MB cma reserved above. */
 &hdmirx_ctrler {
 	#sound-dai-cells = <1>;
+	edid-version = <2>;
 	/* Effective level used to trigger HPD: 0-low, 1-high */
 	hpd-trigger-level = <1>;
 	hdmirx-det-gpios = <&gpio3 RK_PD3 GPIO_ACTIVE_LOW>;

drivers/media/platform/rockchip/hdmirx/rk_hdmirx.c

@@ -148,6 +148,8 @@ enum hdmirx_edid_version {
 	HDMIRX_EDID_USER = 0,
 	HDMIRX_EDID_340M = 1,
 	HDMIRX_EDID_600M = 2,
+	HDMIRX_EDID_340M_NV12 = 3,
+	HDMIRX_EDID_600M_NV12 = 4,
 };
 
 struct hdmirx_reg_table {
@@ -4003,7 +4005,6 @@ static int hdmirx_parse_dt(struct rk_hdmirx_dev *hdmirx_dev)
 		return PTR_ERR(hdmirx_dev->rst_biu);
 	}
 
-
 	hdmirx_dev->hdmirx_det_gpio = devm_gpiod_get_optional(dev,
 			"hdmirx-det", GPIOD_IN);
 	if (IS_ERR(hdmirx_dev->hdmirx_det_gpio)) {
@@ -4039,6 +4040,8 @@ static int hdmirx_parse_dt(struct rk_hdmirx_dev *hdmirx_dev)
 	if (of_property_read_bool(np, "cec-enable"))
 		hdmirx_dev->cec_enable = true;
 
+	of_property_read_u32(np, "edid-version", &hdmirx_dev->edid_version);
+
 	ret = of_reserved_mem_device_init(dev);
 	if (ret)
 		dev_warn(dev, "No reserved memory for HDMIRX, use default CMA\n");
@@ -4098,19 +4101,51 @@ static int hdmirx_power_on(struct rk_hdmirx_dev *hdmirx_dev)
 	return 0;
 }
 
+static void hdmirx_fixup_edid(struct rk_hdmirx_dev *hdmirx_dev,
+			      u8 *edid, int edid_len)
+{
+	int i;
+	u8 sum;
+
+	/* CTA Extension data format */
+#define EDID_CEA_YCRCB444	(1 << 5)
+
+	if (hdmirx_dev->edid_version == HDMIRX_EDID_340M ||
+	    hdmirx_dev->edid_version == HDMIRX_EDID_600M)
+		edid[131] |=  EDID_CEA_YCRCB444;
+	else
+		edid[131] &= ~EDID_CEA_YCRCB444;
+
+	/* update checksum */
+	for (i = 0, sum = 0; i < edid_len - 1; i++)
+		sum += edid[i];
+
+	edid[i] = 0x100 - sum;
+}
+
 static void hdmirx_edid_init_config(struct rk_hdmirx_dev *hdmirx_dev)
 {
 	int ret;
 	struct v4l2_edid def_edid;
+	u8 *edid_data;
+	int edid_len;
 
 	/* disable hpd and write edid */
 	def_edid.pad = 0;
 	def_edid.start_block = 0;
 	def_edid.blocks = EDID_NUM_BLOCKS_MAX;
-	if (hdmirx_dev->edid_version == HDMIRX_EDID_600M)
-		def_edid.edid = edid_init_data_600M;
-	else
-		def_edid.edid = edid_init_data_340M;
+
+	if (hdmirx_dev->edid_version == HDMIRX_EDID_600M ||
+	    hdmirx_dev->edid_version == HDMIRX_EDID_600M_NV12) {
+		edid_data = edid_init_data_600M;
+		edid_len = sizeof(edid_init_data_600M);
+	} else {
+		edid_data = edid_init_data_340M;
+		edid_len = sizeof(edid_init_data_340M);
+	}
+	hdmirx_fixup_edid(hdmirx_dev, edid_data, edid_len);
+
+	def_edid.edid = edid_data;
 	ret = hdmirx_write_edid(hdmirx_dev, &def_edid, false);
 	if (ret)
 		dev_err(hdmirx_dev->dev, "%s write edid failed!\n", __func__);
@@ -4244,7 +4279,8 @@ static ssize_t edid_store(struct device *dev,
 	if (kstrtoint(buf, 10, &edid))
 		return -EINVAL;
 
-	if (edid != HDMIRX_EDID_340M && edid != HDMIRX_EDID_600M)
+	if (edid != HDMIRX_EDID_340M && edid != HDMIRX_EDID_340M_NV12 &&
+	    edid != HDMIRX_EDID_600M && edid != HDMIRX_EDID_600M_NV12)
 		return count;
 
 	if (hdmirx_dev->edid_version != edid) {