drm/i915/dsi: fix VBT send packet port selection for ICL+

From Jani Nikula
35511d4fdd6b82c887ef038278fd808d7c7f98de in linux 5.15.y/5.15.46
0ea917819d12fed41ea4662cc26ffa0060a5c354 in mainline linux

diff --git a/sys/dev/pci/drm/i915/display/intel_dsi_vbt.c b/sys/dev/pci/drm/i915/display/intel_dsi_vbt.c
index 4a5df79..f0d43f6 100644 (file)
--- a/sys/dev/pci/drm/i915/display/intel_dsi_vbt.c
+++ b/sys/dev/pci/drm/i915/display/intel_dsi_vbt.c
@@ -125,9 +125,25 @@ struct i2c_adapter_lookup {
 #define  ICL_GPIO_DDPA_CTRLCLK_2       8
 #define  ICL_GPIO_DDPA_CTRLDATA_2      9
 
-static enum port intel_dsi_seq_port_to_port(u8 port)
+static enum port intel_dsi_seq_port_to_port(struct intel_dsi *intel_dsi,
+                                           u8 seq_port)
 {
-       return port ? PORT_C : PORT_A;
+       /*
+        * If single link DSI is being used on any port, the VBT sequence block
+        * send packet apparently always has 0 for the port. Just use the port
+        * we have configured, and ignore the sequence block port.
+        */
+       if (hweight8(intel_dsi->ports) == 1)
+               return ffs(intel_dsi->ports) - 1;
+
+       if (seq_port) {
+               if (intel_dsi->ports & PORT_B)
+                       return PORT_B;
+               else if (intel_dsi->ports & PORT_C)
+                       return PORT_C;
+       }
+
+       return PORT_A;
 }
 
 static const u8 *mipi_exec_send_packet(struct intel_dsi *intel_dsi,
@@ -149,15 +165,10 @@ static const u8 *mipi_exec_send_packet(struct intel_dsi *intel_dsi,
 
        seq_port = (flags >> MIPI_PORT_SHIFT) & 3;
 
-       /* For DSI single link on Port A & C, the seq_port value which is
-        * parsed from Sequence Block#53 of VBT has been set to 0
-        * Now, read/write of packets for the DSI single link on Port A and
-        * Port C will based on the DVO port from VBT block 2.
-        */
-       if (intel_dsi->ports == (1 << PORT_C))
-               port = PORT_C;
-       else
-               port = intel_dsi_seq_port_to_port(seq_port);
+       port = intel_dsi_seq_port_to_port(intel_dsi, seq_port);
+
+       if (drm_WARN_ON(&dev_priv->drm, !intel_dsi->dsi_hosts[port]))
+               goto out;
 
        dsi_device = intel_dsi->dsi_hosts[port]->device;
        if (!dsi_device) {