xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/drmmode_display.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d6c29250dbc293c932ca14997eb23399610b106d
Author: Daniel Stone <daniels at collabora.com>
Date:   Fri Apr 7 14:27:58 2017 +0100

    Set correct DRM event context version
    
    DRM_EVENT_CONTEXT_VERSION is the latest context version supported by
    whatever version of libdrm is present. We were blindly asserting we
    supported whatever version that may be, even if we actually didn't.
    
    Set the version as 2, which should be bumped only with the appropriate
    version checks.
    
    Signed-off-by: Daniel Stone <daniels at collabora.com>
    (Ported from xserver commit 0c8e6ed85810e96d84173a52d628863802a78d82)
    v2: Remove second paragraph of commit log, we always initialize
        page_flip_handler2 = NULL (Emil Velikov)
    Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com> # v1

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index ab11583a..9911c0a6 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -2538,7 +2538,7 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp)
 
 	xf86InitialConfiguration(pScrn, TRUE);
 
-	drmmode->event_context.version = DRM_EVENT_CONTEXT_VERSION;
+	drmmode->event_context.version = 2;
 	drmmode->event_context.vblank_handler = radeon_drm_queue_handler;
 	drmmode->event_context.page_flip_handler = radeon_drm_queue_handler;