From 4537b799d9af621587cfd6c23da620fe95c5b65e Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 24 May 2025 14:13:25 +0000 Subject: [PATCH] linux (NXP iMX8): rebase HDMI patches for 6.15 - https://lore.kernel.org/all/20250213-bridge-connector-v3-3-e71598f49c8f@kernel.org/ - https://github.com/torvalds/linux/commit/c2b190bf2a8bd02ac196a5a41a00f2bbb73e8252 --- ...port-Cadence-MHDP8501-HDMI-DP-for-i-MX8MQ.patch | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/projects/NXP/devices/iMX8/patches/linux/0001-Initial-support-Cadence-MHDP8501-HDMI-DP-for-i-MX8MQ.patch b/projects/NXP/devices/iMX8/patches/linux/0001-Initial-support-Cadence-MHDP8501-HDMI-DP-for-i-MX8MQ.patch index 4ada9c6baa..02f0c17ec2 100644 --- a/projects/NXP/devices/iMX8/patches/linux/0001-Initial-support-Cadence-MHDP8501-HDMI-DP-for-i-MX8MQ.patch +++ b/projects/NXP/devices/iMX8/patches/linux/0001-Initial-support-Cadence-MHDP8501-HDMI-DP-for-i-MX8MQ.patch @@ -3641,7 +3641,7 @@ new file mode 100644 index 0000000000000..157b4d44b9e2b --- /dev/null +++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c -@@ -0,0 +1,694 @@ +@@ -0,0 +1,693 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Cadence MHDP8501 DisplayPort(DP) bridge driver @@ -4269,7 +4269,7 @@ index 0000000000000..157b4d44b9e2b +} + +static void cdns_dp_bridge_atomic_disable(struct drm_bridge *bridge, -+ struct drm_bridge_state *old_state) ++ struct drm_atomic_state *state) +{ + struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + @@ -4280,10 +4280,9 @@ index 0000000000000..157b4d44b9e2b +} + +static void cdns_dp_bridge_atomic_enable(struct drm_bridge *bridge, -+ struct drm_bridge_state *old_state) ++ struct drm_atomic_state *state) +{ + struct cdns_mhdp8501_device *mhdp = bridge->driver_private; -+ struct drm_atomic_state *state = old_state->base.state; + struct drm_connector *connector; + struct drm_crtc_state *crtc_state; + struct drm_connector_state *conn_state; @@ -4341,7 +4340,7 @@ new file mode 100644 index 0000000000000..9556d0929e21d --- /dev/null +++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c -@@ -0,0 +1,745 @@ +@@ -0,0 +1,744 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Cadence MHDP8501 HDMI bridge driver @@ -4943,7 +4942,7 @@ index 0000000000000..9556d0929e21d +} + +static void cdns_hdmi_bridge_atomic_disable(struct drm_bridge *bridge, -+ struct drm_bridge_state *old_state) ++ struct drm_atomic_state *state) +{ + struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + @@ -4953,10 +4952,9 @@ index 0000000000000..9556d0929e21d +} + +static void cdns_hdmi_bridge_atomic_enable(struct drm_bridge *bridge, -+ struct drm_bridge_state *old_state) ++ struct drm_atomic_state *state) +{ + struct cdns_mhdp8501_device *mhdp = bridge->driver_private; -+ struct drm_atomic_state *state = old_state->base.state; + struct drm_connector *connector; + struct drm_crtc_state *crtc_state; + struct drm_connector_state *conn_state;