From 86eba41022a4e555b942d63fbfbc126a35225f56 Mon Sep 17 00:00:00 2001 From: Wyon Bi Date: Wed, 28 Aug 2019 08:45:16 +0800 Subject: [PATCH] drm/rockchip: drv: support atomic_mode_set helper callback Change-Id: I565db14e964d72c460155b6b3ce8c45877d5f74c Signed-off-by: Wyon Bi --- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index 42932a093963..5d0422d1dca2 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -785,7 +785,12 @@ static int update_state(struct drm_device *drm_dev, conn_state); if (ret) return ret; - if (encoder_helper_funcs->mode_set) + + if (encoder_helper_funcs->atomic_mode_set) + encoder_helper_funcs->atomic_mode_set(encoder, + crtc_state, + conn_state); + else if (encoder_helper_funcs->mode_set) encoder_helper_funcs->mode_set(encoder, mode, mode); }