summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
diff options
context:
space:
mode:
authorJeffy Chen2017-04-27 08:54:17 +0200
committerSean Paul2017-04-27 15:07:38 +0200
commit459b086d878b855a7d09a074cf0dbd0717dc50ec (patch)
treed6aa566d44512786b80fa4a377a10c60fc26d2a0 /drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
parentdrm/cec: Add CEC over Aux register definitions (diff)
downloadkernel-qcow2-linux-459b086d878b855a7d09a074cf0dbd0717dc50ec.tar.gz
kernel-qcow2-linux-459b086d878b855a7d09a074cf0dbd0717dc50ec.tar.xz
kernel-qcow2-linux-459b086d878b855a7d09a074cf0dbd0717dc50ec.zip
drm/rockchip: Set line flag config register in vop_crtc_enable
We need to set vop config done after update line flag config, it's a new requirement for chips newer than rk3368. Since we would only use line flag irq for vact_end, let's move it to vop_crtc_enable. Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> Acked-by: Mark Yao <mark.yao@rock-chips.com Signed-off-by: Sean Paul <seanpaul@chromium.org> Link: http://patchwork.freedesktop.org/patch/msgid/1493276057-4516-1-git-send-email-jeffy.chen@rock-chips.com
Diffstat (limited to 'drivers/gpu/drm/rockchip/analogix_dp-rockchip.c')
-rw-r--r--drivers/gpu/drm/rockchip/analogix_dp-rockchip.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
index d8fa7a9c9240..9bfdbc6b37d5 100644
--- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
+++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
@@ -115,8 +115,8 @@ static void analogix_dp_psr_work(struct work_struct *work)
vact_end = crtc->mode.vtotal - crtc->mode.vsync_start + crtc->mode.vdisplay;
- ret = rockchip_drm_wait_line_flag(dp->encoder.crtc, vact_end,
- PSR_WAIT_LINE_FLAG_TIMEOUT_MS);
+ ret = rockchip_drm_wait_vact_end(dp->encoder.crtc,
+ PSR_WAIT_LINE_FLAG_TIMEOUT_MS);
if (ret) {
dev_err(dp->dev, "line flag interrupt did not arrive\n");
return;