xserver: Branch 'master'
Adam Jackson
ajax at kemper.freedesktop.org
Tue Sep 26 19:47:48 UTC 2017
hw/xfree86/drivers/modesetting/drmmode_display.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 37f4e7651a2fd51efa613a08a1e705553be33e76
Author: Keith Packard <keithp at keithp.com>
Date: Mon Sep 25 16:18:22 2017 -0700
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 <keithp at keithp.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
index fec7ac276..1c99dd9f9 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -2278,9 +2278,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
*/
More information about the xorg-commit
mailing list