jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-31 06:36:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux (Allwinner): rebase patches for 6.16-rc1

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

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....
This commit is contained in:
Rudi Heitbaum 2025-06-12 12:28:48 +00:00
parent aac95488a2
commit 6da44b2fb0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
projects/Allwinner/patches/linux/0049-drm-sun4i-dw-hdmi-Switch-to-bridge-functions.patch
View File

@ -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 <linux/of.h>
#include <linux/platform_device.h>
@ -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);
+}
+