wait vblanks according to the pipe.

Change-Id: I3560c2108cf1cef0fb85120b0c7c766434de3bc5

diff --git a/src/tdm_vc4_display.c b/src/tdm_vc4_display.c
index 53e98da..6e90214 100644 (file)
--- a/src/tdm_vc4_display.c
+++ b/src/tdm_vc4_display.c
@@ -146,8 +146,10 @@ _tdm_vc4_display_get_cur_msc (int fd, int pipe, uint *msc)
        drmVBlank vbl;
 
        vbl.request.type = DRM_VBLANK_RELATIVE;
-       if (pipe > 0)
+       if (pipe == 1)
                vbl.request.type |= DRM_VBLANK_SECONDARY;
+       else if (pipe > 1)
+               vbl.request.type |= pipe << DRM_VBLANK_HIGH_CRTC_SHIFT;
 
        vbl.request.sequence = 0;
        if (drmWaitVBlank(fd, &vbl)) {
@@ -167,15 +169,17 @@ _tdm_vc4_display_wait_vblank(int fd, int pipe, uint *target_msc, void *data)
        drmVBlank vbl;
 
        vbl.request.type =  DRM_VBLANK_ABSOLUTE | DRM_VBLANK_EVENT;
-       if (pipe > 0)
+       if (pipe == 1)
                vbl.request.type |= DRM_VBLANK_SECONDARY;
+       else if (pipe > 1)
+               vbl.request.type |= pipe << DRM_VBLANK_HIGH_CRTC_SHIFT;
 
        vbl.request.sequence = *target_msc;
        vbl.request.signal = (unsigned long)(uintptr_t)data;
 
        if (drmWaitVBlank(fd, &vbl)) {
-               *target_msc = 0;
                TDM_ERR("wait vblank failed: %m");
+               *target_msc = 0;
                return TDM_ERROR_OPERATION_FAILED;
        }