xf86-video-amdgpu: Branch 'master'

[GitLab Mirror]

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

New commits:
commit 6572be49b713a26eca14f16e1854cabf28101288
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu Sep 13 11:44:21 2018 +0200

    Bail from drmmode_cm_init if there's no CRTC
    
    We would crash due to dereferencing the NULL mode_res->crtc pointer.
    
    Bugzilla: https://bugs.freedesktop.org/107913
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 6ef6a98..cbda8ad 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -3198,6 +3198,9 @@ static void drmmode_cm_init(int drm_fd, drmmode_ptr drmmode,
 	memset(drmmode->cm_prop_ids, 0, sizeof(drmmode->cm_prop_ids));
 	drmmode->gamma_lut_size = drmmode->degamma_lut_size = 0;
 
+	if (!mode_res->crtcs)
+		return;
+
 	/* AMD hardware has color management support on all pipes. It is
 	 * therefore sufficient to only check the first CRTC.
 	 */