From 2291baba649d6801f3f5b6d1f638be62a17c7998 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 12 Jun 2025 12:27:03 +0000 Subject: [PATCH] linux (NXP iMX8): rebase patches for 6.16-rc1 drm/bridge: Add encoder parameter to drm_bridge_funcs.attach - https://github.com/torvalds/linux/commit/98007a0d56b07605c626c9bdb550b5ae5ce71453 fixes: drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c:682:19: error: initialization of 'int (*)(struct drm_bridge *, struct drm_encoder *, enum drm_bridge_attach_flags)' from incompatible pointer type 'int (*)(struct drm_bridge *, enum drm_bridge_attach_flags)' [-Wincompatible-pointer-types] 682 | .attach = cdns_dp_bridge_attach, | ^~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c:682:19: note: (near initialization for 'cdns_dp_bridge_funcs.attach') drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c:553:12: note: 'cdns_dp_bridge_attach' declared here 553 | static int cdns_dp_bridge_attach(struct drm_bridge *bridge, | ^~~~~~~~~~~~~~~~~~~~~ make[7]: *** [scripts/Makefile.build:287: drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.o] Error 1 make[7]: *** Waiting for unfinished jobs.... --- ...itial-support-Cadence-MHDP8501-HDMI-DP-for-i-MX8MQ.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 3245ea48ac..e279a6532e 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 @@ -3528,7 +3528,7 @@ new file mode 100644 index 0000000000000..157b4d44b9e2b --- /dev/null +++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c -@@ -0,0 +1,693 @@ +@@ -0,0 +1,694 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Cadence MHDP8501 DisplayPort(DP) bridge driver @@ -4082,6 +4082,7 @@ index 0000000000000..157b4d44b9e2b +} + +static int cdns_dp_bridge_attach(struct drm_bridge *bridge, ++ struct drm_encoder *encoder, + enum drm_bridge_attach_flags flags) +{ + struct cdns_mhdp8501_device *mhdp = bridge->driver_private; @@ -4227,7 +4228,7 @@ new file mode 100644 index 0000000000000..9556d0929e21d --- /dev/null +++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c -@@ -0,0 +1,744 @@ +@@ -0,0 +1,745 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Cadence MHDP8501 HDMI bridge driver @@ -4576,6 +4577,7 @@ index 0000000000000..9556d0929e21d +} + +static int cdns_hdmi_bridge_attach(struct drm_bridge *bridge, ++ struct drm_encoder *encoder, + enum drm_bridge_attach_flags flags) +{ + struct cdns_mhdp8501_device *mhdp = bridge->driver_private;