hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/drivers/gpu/drm/bridge/rk1000.c
....@@ -18,7 +18,7 @@
1818 #include <drm/drm_atomic_helper.h>
1919 #include <drm/drm_crtc_helper.h>
2020 #include <drm/drm_of.h>
21
-#include <drm/drmP.h>
21
+#include <drm/drm_probe_helper.h>
2222
2323 #include "../rockchip/rockchip_drm_drv.h"
2424
....@@ -30,11 +30,11 @@
3030 { DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 27000, 720, 732,
3131 738, 864, 0, 576, 582, 588, 625, 0,
3232 DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC),
33
- .vrefresh = 50, 0, },
33
+ 0, },
3434 { DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 27000, 720, 736,
3535 742, 858, 0, 480, 486, 492, 529, 0,
3636 DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC),
37
- .vrefresh = 60, 0, },
37
+ 0, },
3838 };
3939
4040 struct rk1000_tve {
....@@ -258,8 +258,8 @@
258258
259259 static void
260260 rk1000_bridge_mode_set(struct drm_bridge *bridge,
261
- struct drm_display_mode *mode,
262
- struct drm_display_mode *adjusted_mode)
261
+ const struct drm_display_mode *mode,
262
+ const struct drm_display_mode *adjusted_mode)
263263 {
264264 struct rk1000_tve *rk1000;
265265
....@@ -291,7 +291,8 @@
291291 rk1000_tve_disable(rk1000);
292292 }
293293
294
-static int rk1000_bridge_attach(struct drm_bridge *bridge)
294
+static int rk1000_bridge_attach(struct drm_bridge *bridge,
295
+ enum drm_bridge_attach_flags flags)
295296 {
296297 struct rk1000_tve *rk1000 = bridge_to_rk1000(bridge);
297298 int ret;