drm/rockchip: vop: test for P{H,V}SYNC

When connected to the MIPI DSI output, we need to use N{H,V}SYNC for the
internal connection but these flags are meaningless for DSI panels.
Switch the test so that we do not set the P{H,V}SYNC bits unless the
mode requires it.

Signed-off-by: John Keeping <john@metanate.com>
Reviewed-by: Mark Yao <mark.yao@rock-chips.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
[seanpaul resolved conflict using macros instead of hardcoded values]
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20170224125506.21533-21-john@metanate.com

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index 7c2e7c481333fcaecd60eff896c91ea966a71bd6..94d7b7327ff7e363f4f4d25ded0d63e628820038 100644 (file)
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -932,10 +932,10 @@ static void vop_crtc_enable(struct drm_crtc *crtc)
        }
 
        pin_pol = BIT(DCLK_INVERT);
-       pin_pol |= (adjusted_mode->flags & DRM_MODE_FLAG_NHSYNC) ?
-                  0 : BIT(HSYNC_POSITIVE);
-       pin_pol |= (adjusted_mode->flags & DRM_MODE_FLAG_NVSYNC) ?
-                  0 : BIT(VSYNC_POSITIVE);
+       pin_pol |= (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC) ?
+                  BIT(HSYNC_POSITIVE) : 0;
+       pin_pol |= (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC) ?
+                  BIT(VSYNC_POSITIVE) : 0;
        VOP_CTRL_SET(vop, pin_pol, pin_pol);
 
        switch (s->output_type) {