summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@gmail.com>2013-07-31 11:01:15 +1000
committerDave Airlie <airlied@gmail.com>2013-07-31 11:01:15 +1000
commit27323ce68d58fcb82a648ab14abbc99acdc36f44 (patch)
treeb62159bd157927151e889db6d812e934c7632040
parent1df177f35a05db505577cdc929e63fde906a704b (diff)
downloadxorg-driver-xf86-video-nouveau-27323ce68d58fcb82a648ab14abbc99acdc36f44.tar.gz
nouveau: add gpu identifier to connector names for secondary gpus
this avoids clashes with identifiers from other GPUs. Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--src/drmmode_display.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 570a9e4..3563b2a 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1098,6 +1098,10 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num)
if (koutput->connector_type >= NUM_OUTPUT_NAMES)
snprintf(name, 32, "Unknown%d-%d", koutput->connector_type,
koutput->connector_type_id);
+ 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);
else
snprintf(name, 32, "%s-%d",
output_names[koutput->connector_type],