xf86-video-amdgpu: Branch 'master'

[Michel Dänzer]

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

New commits:
commit 978242977e5dc905e1d5a46b1b0d34b356c7af26
Author: Qiang Yu <Qiang.Yu at amd.com>
Date:   Wed Jul 13 19:25:12 2016 +0800

    Fix amdgpu_mode_hotplug crash on multi GPU platform.
    
    On multi GPU platform, some screen is created by other GPU DDX.
    
    Signed-off-by: Qiang Yu <Qiang.Yu 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 3a7be27..fdd5922 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -2351,7 +2351,8 @@ restart_destroy:
 			xf86CrtcConfigPtr loop_config =
 				XF86_CRTC_CONFIG_PTR(loop_scrn);
 
-			if (AMDGPUEntPriv(loop_scrn) != pAMDGPUEnt)
+			if (strcmp(loop_scrn->driverName, scrn->driverName) ||
+			    AMDGPUEntPriv(loop_scrn) != pAMDGPUEnt)
 				continue;
 
 			for (j = 0; !found && j < loop_config->num_output; j++) {