From 5571318f22f17883e26977a4c72e1e46d17bdf5d Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 25 Sep 2017 16:18:22 -0700 Subject: modesetting: Skip no-longer-present connectors when resetting BAD links 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. Signed-off-by: Keith Packard Reviewed-by: Adam Jackson (cherry picked from commit 37f4e7651a2fd51efa613a08a1e705553be33e76) --- hw/xfree86/drivers/modesetting/drmmode_display.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'hw') diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c index 6236fb0b6..53e1cf545 100644 --- a/hw/xfree86/drivers/modesetting/drmmode_display.c +++ b/hw/xfree86/drivers/modesetting/drmmode_display.c @@ -2298,9 +2298,12 @@ drmmode_handle_uevents(int fd, void *closure) 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 */ -- cgit v1.2.3