disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/gpu/drm/rockchip/rk618/rk618_vif.c
..
..
@@ -15,7 +15,7 @@
15
15
 #include <linux/regmap.h>
16
16
 
17
17
 #include <drm/drm_of.h>
18
-#include <drm/drmP.h>
18
+#include <drm/drm_drv.h>
19
19
 #include <video/videomode.h>
20
20
 
21
21
 #define RK618_VIF0_REG0			0x0000
..
..
@@ -145,15 +145,16 @@
145
145
 }
146
146
 
147
147
 static void rk618_vif_bridge_mode_set(struct drm_bridge *bridge,
148
-				      struct drm_display_mode *mode,
149
-				      struct drm_display_mode *adjusted)
148
+				      const struct drm_display_mode *mode,
149
+				      const struct drm_display_mode *adjusted)
150
150
 {
151
151
 	struct rk618_vif *vif = bridge_to_vif(bridge);
152
152
 
153
153
 	drm_mode_copy(&vif->mode, adjusted);
154
154
 }
155
155
 
156
-static int rk618_vif_bridge_attach(struct drm_bridge *bridge)
156
+static int rk618_vif_bridge_attach(struct drm_bridge *bridge,
157
+				   enum drm_bridge_attach_flags flags)
157
158
 {
158
159
 	struct rk618_vif *vif = bridge_to_vif(bridge);
159
160
 	struct device *dev = vif->dev;
..
..
@@ -174,7 +175,7 @@
174
175
 		if (!vif->bridge)
175
176
 			return -EPROBE_DEFER;
176
177
 
177
-		ret = drm_bridge_attach(bridge->encoder, vif->bridge, bridge);
178
+		ret = drm_bridge_attach(bridge->encoder, vif->bridge, bridge, 0);
178
179
 		if (ret) {
179
180
 			dev_err(dev, "failed to attach bridge\n");
180
181
 			return ret;