.. | .. |
---|
18 | 18 | #include <drm/drm_atomic_helper.h> |
---|
19 | 19 | #include <drm/drm_crtc_helper.h> |
---|
20 | 20 | #include <drm/drm_of.h> |
---|
21 | | -#include <drm/drmP.h> |
---|
| 21 | +#include <drm/drm_probe_helper.h> |
---|
22 | 22 | |
---|
23 | 23 | #include "../rockchip/rockchip_drm_drv.h" |
---|
24 | 24 | |
---|
.. | .. |
---|
30 | 30 | { DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 27000, 720, 732, |
---|
31 | 31 | 738, 864, 0, 576, 582, 588, 625, 0, |
---|
32 | 32 | DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC), |
---|
33 | | - .vrefresh = 50, 0, }, |
---|
| 33 | + 0, }, |
---|
34 | 34 | { DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 27000, 720, 736, |
---|
35 | 35 | 742, 858, 0, 480, 486, 492, 529, 0, |
---|
36 | 36 | DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC), |
---|
37 | | - .vrefresh = 60, 0, }, |
---|
| 37 | + 0, }, |
---|
38 | 38 | }; |
---|
39 | 39 | |
---|
40 | 40 | struct rk1000_tve { |
---|
.. | .. |
---|
258 | 258 | |
---|
259 | 259 | static void |
---|
260 | 260 | 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) |
---|
263 | 263 | { |
---|
264 | 264 | struct rk1000_tve *rk1000; |
---|
265 | 265 | |
---|
.. | .. |
---|
291 | 291 | rk1000_tve_disable(rk1000); |
---|
292 | 292 | } |
---|
293 | 293 | |
---|
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) |
---|
295 | 296 | { |
---|
296 | 297 | struct rk1000_tve *rk1000 = bridge_to_rk1000(bridge); |
---|
297 | 298 | int ret; |
---|