xf86-video-amdgpu: Branch 'master'

[Michel Dänzer]

 src/drmmode_display.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 875339c1064f666a2391b4a5a495eddda9407ab6
Author: Daniel Martin <consume.noise at gmail.com>
Date:   Fri Oct 20 10:05:35 2017 +0200

    modesetting: Check crtc before searching link-status property
    
    No need to lookup the link-status property if we don't have a crtc.
    
    Signed-off-by: Daniel Martin <consume.noise at gmail.com>
    (Ported from xserver commit 8d7f7e24261e68459e6f0a865e243473f65fe7ad)
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 4ca94e7..55551ee 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -2599,12 +2599,14 @@ amdgpu_mode_hotplug(ScrnInfoPtr scrn, drmmode_ptr drmmode)
 	 */
 	for (i = 0; i < config->num_output; i++) {
 		xf86OutputPtr output = config->output[i];
+		xf86CrtcPtr crtc = output->crtc;
 		drmmode_output_private_ptr drmmode_output = output->driver_private;
 		uint32_t con_id;
 		drmModeConnectorPtr koutput;
 
-		if (drmmode_output->mode_output == NULL)
+		if (!crtc || !drmmode_output->mode_output)
 			continue;
+
 		con_id = drmmode_output->mode_output->connector_id;
 		/* Get an updated view of the properties for the current connector and
 		 * look for the link-status property
@@ -2616,10 +2618,6 @@ amdgpu_mode_hotplug(ScrnInfoPtr scrn, drmmode_ptr drmmode)
 			if (props && props->flags & DRM_MODE_PROP_ENUM &&
 			    !strcmp(props->name, "link-status") &&
 			    koutput->prop_values[j] == DRM_MODE_LINK_STATUS_BAD) {
-				xf86CrtcPtr crtc = output->crtc;
-				if (!crtc)
-					continue;
-
 				/* the connector got a link failure, re-set the current mode */
 				drmmode_set_mode_major(crtc, &crtc->mode, crtc->rotation,
 						       crtc->x, crtc->y);