xf86-video-amdgpu: Branch 'master'

[Michel Dänzer]

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

New commits:
commit f4107f67f147e2500582fc36cf0f0f76bc1ef098
Author: Mykola Lysenko <Mykola.Lysenko at amd.com>
Date:   Wed Dec 23 11:58:47 2015 -0500

    Check for NULL koutput in drmmode_output_dpms
    
    This situation happens whit start of usage of DRM DP MST framework,
    when connectors created and destroyed dynamically.
    
    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 2761513..05c3418 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1117,6 +1117,9 @@ static void drmmode_output_dpms(xf86OutputPtr output, int mode)
 	drmModeConnectorPtr koutput = drmmode_output->mode_output;
 	AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(output->scrn);
 
+	if (!koutput)
+		return;
+
 	if (mode != DPMSModeOn && crtc)
 		drmmode_do_crtc_dpms(crtc, mode);