From c2560f2894d4e186108b5c87009cf1793d48dabb Mon Sep 17 00:00:00 2001 From: Mark Yao Date: Fri, 28 Jul 2017 11:33:55 +0800 Subject: [PATCH] drm/rockchip: create tv properties on master driver Change-Id: Ia42a89447281e1f2688ce34d4c0a85975222b371 Signed-off-by: Mark Yao --- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index ab2eba5fb6e4..28df7e479ea1 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -1079,7 +1079,7 @@ static int rockchip_drm_create_properties(struct drm_device *dev) return -ENOMEM; private->cabc_calc_pixel_num_property = prop; - return 0; + return drm_mode_create_tv_properties(dev, 0, NULL); } static int rockchip_gem_pool_init(struct drm_device *drm) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 85323786e13b..1e3ae60d27da 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -2811,9 +2811,6 @@ static int vop_create_crtc(struct vop *vop) crtc->port = port; rockchip_register_crtc_funcs(crtc, &private_crtc_funcs); - ret = drm_mode_create_tv_properties(drm_dev, 0, NULL); - if (ret) - goto err_unregister_crtc_funcs; #define VOP_ATTACH_MODE_CONFIG_PROP(prop, v) \ drm_object_attach_property(&crtc->base, drm_dev->mode_config.prop, v)