From 836daf4c7a276108a9f950e524828744aeda0a3c Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 31 Jul 2013 11:24:48 +1000 Subject: [PATCH] modesetting: change output names for secondary GPUs if we are a secondary GPU modify the output name to avoid clashes. Signed-off-by: Dave Airlie --- hw/xfree86/drivers/modesetting/drmmode_display.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c index ce90cea76..4fb4d21fe 100644 --- a/hw/xfree86/drivers/modesetting/drmmode_display.c +++ b/hw/xfree86/drivers/modesetting/drmmode_display.c @@ -1010,6 +1010,10 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num, int *num_dv /* need to do smart conversion here for compat with non-kms ATI driver */ if (koutput->connector_type >= MS_ARRAY_SIZE(output_names)) snprintf(name, 32, "Unknown-%d", koutput->connector_type_id - 1); +#ifdef MODESETTING_OUTPUT_SLAVE_SUPPORT + else if (pScrn->is_gpu) + snprintf(name, 32, "%s-%d-%d", output_names[koutput->connector_type], pScrn->scrnIndex - GPU_SCREEN_OFFSET + 1, koutput->connector_type_id - 1); +#endif else snprintf(name, 32, "%s-%d", output_names[koutput->connector_type], koutput->connector_type_id - 1);