diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
index 0ccc76217ee4..68ad802caad5 100644
--- a/drivers/gpu/drm/rockchip/Kconfig
+++ b/drivers/gpu/drm/rockchip/Kconfig
@@ -66,4 +66,12 @@ config ROCKCHIP_LVDS
 	  Rockchip rk3288 SoC has LVDS TX Controller can be used, and it
 	  support LVDS, rgb, dual LVDS output mode. say Y to enable its
 	  driver.
+
+config ROCKCHIP_DRM_TVE
+	bool "Rockchip TVE support"
+	depends on DRM_ROCKCHIP
+	help
+	  Choose this option to enable support for Rockchip TVE controllers.
+	  say Y to enable its driver.
+
 endif
diff --git a/drivers/gpu/drm/rockchip/Makefile b/drivers/gpu/drm/rockchip/Makefile
index a314e2109e76..d277403f155c 100644
--- a/drivers/gpu/drm/rockchip/Makefile
+++ b/drivers/gpu/drm/rockchip/Makefile
@@ -14,5 +14,6 @@ rockchipdrm-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o
 rockchipdrm-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi.o
 rockchipdrm-$(CONFIG_ROCKCHIP_INNO_HDMI) += inno_hdmi.o
 rockchipdrm-$(CONFIG_ROCKCHIP_LVDS) += rockchip_lvds.o
+rockchipdrm-$(CONFIG_ROCKCHIP_DRM_TVE) += rockchip_drm_tve.o
 
 obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_tve.c b/drivers/gpu/drm/rockchip/rockchip_drm_tve.c
index 50b8e3631753..aa5dda38c3a1 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_tve.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_tve.c
@@ -305,7 +305,6 @@ static const struct drm_encoder_funcs rockchip_tve_encoder_funcs = {
 };
 
 static const struct drm_connector_funcs rockchip_tve_connector_funcs = {
-	.dpms = drm_atomic_helper_connector_dpms,
 	.detect = rockchip_tve_connector_detect,
 	.fill_modes = drm_helper_probe_single_connector_modes,
 	.destroy = rockchip_tve_connector_destroy,
@@ -536,7 +535,7 @@ static int rockchip_tve_bind(struct device *dev, struct device *master,
 	drm_connector_helper_add(connector,
 				 &rockchip_tve_connector_helper_funcs);
 
-	ret = drm_mode_connector_attach_encoder(connector, encoder);
+	ret = drm_connector_attach_encoder(connector, encoder);
 	if (ret < 0) {
 		dev_dbg(tve->dev, "failed to attach connector and encoder\n");
 		goto err_free_connector;
@@ -607,7 +606,6 @@ struct platform_driver rockchip_tve_driver = {
 		   .of_match_table = of_match_ptr(rockchip_tve_dt_ids),
 	},
 };
-module_platform_driver(rockchip_tve_driver);
 
 MODULE_AUTHOR("Algea Cao <Algea.cao@rock-chips.com>");
 MODULE_DESCRIPTION("ROCKCHIP TVE Driver");