xf86-video-amdgpu: Branch 'master'

[Michel Dänzer]

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

New commits:
commit 4eb9cedca080b30c57ded349a397620ee7d0cd46
Author: Mykola Lysenko <Mykola.Lysenko at amd.com>
Date:   Wed Jan 13 14:03:55 2016 +0800

    Initialize drmmode_crtc dpms_mode to DPMSModeOff
    
    This disables query of disabled pipes for drmWaitVBlank on X start
    
    Signed-off-by: Mykola Lysenko <Mykola.Lysenko at amd.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 05c3418..3f015f9 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -993,6 +993,7 @@ drmmode_crtc_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, drmModeResPtr mode_res
 	drmmode_crtc->mode_crtc =
 	    drmModeGetCrtc(pAMDGPUEnt->fd, mode_res->crtcs[num]);
 	drmmode_crtc->drmmode = drmmode;
+	drmmode_crtc->dpms_mode = DPMSModeOff;
 	crtc->driver_private = drmmode_crtc;
 	drmmode_crtc_hw_id(crtc);