change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/drivers/gpu/drm/rockchip/rk628/rk628_hdmirx.c
..
..
@@ -18,10 +18,9 @@
18
18
 #include <linux/mfd/rk628.h>
19
19
 #include <linux/phy/phy.h>
20
20
 
21
-#include <drm/drmP.h>
22
21
 #include <drm/drm_atomic.h>
23
22
 #include <drm/drm_atomic_helper.h>
24
-#include <drm/drm_crtc_helper.h>
23
+#include <drm/drm_print.h>
25
24
 #include <drm/drm_dp_helper.h>
26
25
 #include <drm/drm_of.h>
27
26
 
..
..
@@ -817,7 +816,8 @@
817
816
 	phy_power_off(hdmirx->phy);
818
817
 }
819
818
 
820
-static int rk628_hdmirx_bridge_attach(struct drm_bridge *bridge)
819
+static int rk628_hdmirx_bridge_attach(struct drm_bridge *bridge,
820
+				      enum drm_bridge_attach_flags flags)
821
821
 {
822
822
 	struct rk628_hdmirx *hdmirx = bridge_to_hdmirx(bridge);
823
823
 	struct device *dev = hdmirx->dev;
..
..
@@ -830,24 +830,22 @@
830
830
 		return ret;
831
831
 	}
832
832
 
833
-	ret = drm_bridge_attach(bridge->encoder, hdmirx->bridge, bridge);
833
+	ret = drm_bridge_attach(bridge->encoder, hdmirx->bridge, bridge, flags);
834
834
 	if (ret) {
835
835
 		dev_err(dev, "failed to attach bridge\n");
836
836
 		return ret;
837
837
 	}
838
838
 
839
-	bridge->next = hdmirx->bridge;
840
-
841
839
 	return 0;
842
840
 }
843
841
 
844
842
 static void rk628_hdmirx_bridge_mode_set(struct drm_bridge *bridge,
845
-				    struct drm_display_mode *orig_mode,
846
-				    struct drm_display_mode *mode)
843
+					 const struct drm_display_mode *mode,
844
+					 const struct drm_display_mode *adj)
847
845
 {
848
846
 	struct rk628_hdmirx *hdmirx = bridge_to_hdmirx(bridge);
849
847
 
850
-	memcpy(&hdmirx->mode, mode, sizeof(hdmirx->mode));
848
+	memcpy(&hdmirx->mode, adj, sizeof(hdmirx->mode));
851
849
 }
852
850
 
853
851
 static const struct drm_bridge_funcs rk628_hdmirx_bridge_funcs = {