From 5f87dac24aa3520baec37b14b5f15a37b5ca4300 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 12 Jun 2025 12:28:48 +0000 Subject: [PATCH] linux (Allwinner): 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/sun4i/sun8i_dw_hdmi.c:162: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] 162 | .attach = sun8i_hdmi_enc_attach, | ^~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c:162:19: note: (near initialization for 'sun8i_hdmi_enc_bridge_funcs.attach') drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c:34:12: note: 'sun8i_hdmi_enc_attach' declared here 34 | static int sun8i_hdmi_enc_attach(struct drm_bridge *bridge, | ^~~~~~~~~~~~~~~~~~~~~ make[6]: *** [scripts/Makefile.build:287: drivers/gpu/drm/sun4i/sun8i_dw_hdmi.o] Error 1 make[5]: *** [scripts/Makefile.build:554: drivers/gpu/drm/sun4i] Error 2 make[5]: *** Waiting for unfinished jobs.... --- .../0049-drm-sun4i-dw-hdmi-Switch-to-bridge-functions.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/Allwinner/patches/linux/0049-drm-sun4i-dw-hdmi-Switch-to-bridge-functions.patch b/projects/Allwinner/patches/linux/0049-drm-sun4i-dw-hdmi-Switch-to-bridge-functions.patch index 2b06a32663..807399aa9f 100644 --- a/projects/Allwinner/patches/linux/0049-drm-sun4i-dw-hdmi-Switch-to-bridge-functions.patch +++ b/projects/Allwinner/patches/linux/0049-drm-sun4i-dw-hdmi-Switch-to-bridge-functions.patch @@ -32,7 +32,7 @@ diff --git a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c b/drivers/gpu/drm/sun4i/sun8i index 8f8d3bdba5ce..93831cdf1917 100644 --- a/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c +++ b/drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c -@@ -8,14 +8,90 @@ +@@ -8,14 +8,91 @@ #include #include @@ -53,11 +53,12 @@ index 8f8d3bdba5ce..93831cdf1917 100644 + container_of(x, struct sun8i_dw_hdmi, enc_bridge) + +static int sun8i_hdmi_enc_attach(struct drm_bridge *bridge, ++ struct drm_encoder *encoder, + enum drm_bridge_attach_flags flags) +{ + struct sun8i_dw_hdmi *hdmi = bridge_to_sun8i_dw_hdmi(bridge); + -+ return drm_bridge_attach(&hdmi->encoder, hdmi->hdmi_bridge, ++ return drm_bridge_attach(encoder, hdmi->hdmi_bridge, + &hdmi->enc_bridge, flags); +} +