From: Keith Packard <kei...@keithp.com>

Outputs may have NULL mode_output (connector) pointers if the
connector disappears while the server is running. Skip these when
resetting outputs with BAD link status.

(Ported from xserver commit 37f4e7651a2fd51efa613a08a1e705553be33e76)

Signed-off-by: Michel Dänzer <michel.daen...@amd.com>
---
 src/drmmode_display.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 2cef93cdd..4ca94e71d 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -2600,9 +2600,12 @@ amdgpu_mode_hotplug(ScrnInfoPtr scrn, drmmode_ptr 
drmmode)
        for (i = 0; i < config->num_output; i++) {
                xf86OutputPtr output = config->output[i];
                drmmode_output_private_ptr drmmode_output = 
output->driver_private;
-               uint32_t con_id = drmmode_output->mode_output->connector_id;
+               uint32_t con_id;
                drmModeConnectorPtr koutput;
 
+               if (drmmode_output->mode_output == NULL)
+                       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
                 */
-- 
2.14.2

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reply via email to