linux (NXP iMX8): rebase patches for 6.16-rc1

drm/bridge: Add encoder parameter to drm_bridge_funcs.attach
- 98007a0d56

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....
This commit is contained in:
Rudi Heitbaum 2025-06-12 12:27:03 +00:00
parent 1f21b0a0fe
commit e0d1ce04ed

View File

@ -3528,7 +3528,7 @@ new file mode 100644
index 0000000000000..157b4d44b9e2b index 0000000000000..157b4d44b9e2b
--- /dev/null --- /dev/null
+++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-dp.c +++ 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 +// SPDX-License-Identifier: GPL-2.0-only
+/* +/*
+ * Cadence MHDP8501 DisplayPort(DP) bridge driver + * Cadence MHDP8501 DisplayPort(DP) bridge driver
@ -4082,6 +4082,7 @@ index 0000000000000..157b4d44b9e2b
+} +}
+ +
+static int cdns_dp_bridge_attach(struct drm_bridge *bridge, +static int cdns_dp_bridge_attach(struct drm_bridge *bridge,
+ struct drm_encoder *encoder,
+ enum drm_bridge_attach_flags flags) + enum drm_bridge_attach_flags flags)
+{ +{
+ struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + struct cdns_mhdp8501_device *mhdp = bridge->driver_private;
@ -4227,7 +4228,7 @@ new file mode 100644
index 0000000000000..9556d0929e21d index 0000000000000..9556d0929e21d
--- /dev/null --- /dev/null
+++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8501-hdmi.c +++ 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 +// SPDX-License-Identifier: GPL-2.0-only
+/* +/*
+ * Cadence MHDP8501 HDMI bridge driver + * Cadence MHDP8501 HDMI bridge driver
@ -4576,6 +4577,7 @@ index 0000000000000..9556d0929e21d
+} +}
+ +
+static int cdns_hdmi_bridge_attach(struct drm_bridge *bridge, +static int cdns_hdmi_bridge_attach(struct drm_bridge *bridge,
+ struct drm_encoder *encoder,
+ enum drm_bridge_attach_flags flags) + enum drm_bridge_attach_flags flags)
+{ +{
+ struct cdns_mhdp8501_device *mhdp = bridge->driver_private; + struct cdns_mhdp8501_device *mhdp = bridge->driver_private;