Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d790ad03 authored by John Keeping's avatar John Keeping Committed by Sean Paul
Browse files

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: default avatarJohn Keeping <john@metanate.com>
Reviewed-by: default avatarMark Yao <mark.yao@rock-chips.com>
Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
[seanpaul resolved conflict using macros instead of hardcoded values]
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20170224125506.21533-21-john@metanate.com
parent 2b0c4b70

drivers/gpu/drm/rockchip/rockchip_drm_vop.c

+4 −4
Original line number Diff line number Diff line
@@ -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) {