diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vvop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vvop.c
index 3f4432ad596c..4482da16de56 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vvop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vvop.c
@@ -10,6 +10,8 @@
 #include <drm/drm_gem.h>
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc_helper.h>
+#include <drm/drm_edid.h>
+#include <drm/drm_fourcc.h>
 #include <drm/drm_gem_framebuffer_helper.h>
 #include <drm/drm_plane_helper.h>
 #include <drm/drm_probe_helper.h>
@@ -70,8 +72,7 @@ static const struct drm_plane_funcs vvop_plane_funcs = {
 	.atomic_destroy_state	= drm_atomic_helper_plane_destroy_state,
 };
 
-static void vvop_plane_atomic_update(struct drm_plane *plane,
-				     struct drm_plane_state *old_state)
+static void vvop_plane_atomic_update(struct drm_plane *plane, struct drm_atomic_state *state)
 {
 }
 
@@ -398,14 +399,12 @@ static const struct drm_crtc_funcs vvop_crtc_funcs = {
 	.disable_vblank		= vvop_disable_vblank,
 };
 
-static void vvop_crtc_atomic_enable(struct drm_crtc *crtc,
-				    struct drm_crtc_state *old_state)
+static void vvop_crtc_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_state *state)
 {
 	drm_crtc_vblank_on(crtc);
 }
 
-static void vvop_crtc_atomic_disable(struct drm_crtc *crtc,
-				     struct drm_crtc_state *old_state)
+static void vvop_crtc_atomic_disable(struct drm_crtc *crtc, struct drm_atomic_state *state)
 {
 	unsigned long flags;
 
@@ -420,8 +419,7 @@ static void vvop_crtc_atomic_disable(struct drm_crtc *crtc,
 
 }
 
-static void vvop_crtc_atomic_flush(struct drm_crtc *crtc,
-				   struct drm_crtc_state *old_crtc_state)
+static void vvop_crtc_atomic_flush(struct drm_crtc *crtc, struct drm_atomic_state *state)
 {
 	unsigned long flags;