From 90abffbd30f44b9cf76a6e28103ddcb5419b4522 Mon Sep 17 00:00:00 2001 From: Ilija Hadzic Date: Fri, 6 May 2011 09:45:23 -0400 Subject: DRI2: fix high-crtc/vblank oversight/bug improvements to high-crtc handling done in f0b7d7b449cc77bb2b281d81108507f8bc2e6018 introduced a bug that caused the populate_vbl_request_type to never use the high-crtc field even when it should. The reason is that the offending patch put the code under #ifdef DRM_VBLANK_HIGH_CRTC_MASK which is not visible outside the enum type, so #else was always taken in compilation type. This patch fixes it by basing #ifdef on (pre-processor visible) DRM_VBLANK_HIGH_CRTC_SHIFT constant Signed-off-by: Ilija Hadzic --- src/radeon_dri2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c index e618cc54..bbe1a94e 100644 --- a/src/radeon_dri2.c +++ b/src/radeon_dri2.c @@ -778,7 +778,7 @@ static drmVBlankSeqType populate_vbl_request_type(RADEONInfoPtr info, int crtc) if (crtc == 1) type |= DRM_VBLANK_SECONDARY; else if (crtc > 1) -#ifdef DRM_VBLANK_HIGH_CRTC_MASK +#ifdef DRM_VBLANK_HIGH_CRTC_SHIFT type |= (crtc << DRM_VBLANK_HIGH_CRTC_SHIFT) & DRM_VBLANK_HIGH_CRTC_MASK; #else -- cgit v1.2.3