summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathon Jongsma <jjongsma@redhat.com>2018-11-12 14:06:13 -0600
committerChristophe Fergeau <cfergeau@redhat.com>2018-11-13 10:45:12 +0100
commit505a8bb0cd82e2a50fcf18ed4647788adacef6ee (patch)
tree723898d9c7741851cf7a22dda322ee85f846cc0c
parentee8f904ab0d590c741e640e9548c472e6a58b3cc (diff)
Make output name numbering 1-based
The QXL driver names its outputs starting at 0 (e.g. Virtual-0, Virtual-1, etc). This code was presumably copy/pasted from a different driver, and is not necessary for the QXL driver. Other drivers simply use the kernel connector_type_id which starts at 1. For example, the modesetting driver changed from 0-based names to 1-based names for the same reason in xserver commit 139e36dd. This will help to make it easier to identify which xrandr outputs belong to which drm connector without requiring as many driver-specific special-cases. This change might effect custom xorg configurations that references a specific output name. But the same change was made in modesetting driver despite that possibility. Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com> Acked-by: Frediano Ziglio <fziglio@redhat.com>
-rw-r--r--src/qxl_drmmode.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qxl_drmmode.c b/src/qxl_drmmode.c
index a2f84b1..a814859 100644
--- a/src/qxl_drmmode.c
+++ b/src/qxl_drmmode.c
@@ -765,8 +765,7 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num)
}
}
- /* need to do smart conversion here for compat with non-kms ATI driver */
- snprintf(name, 32, "%s-%d", output_names[koutput->connector_type], koutput->connector_type_id - 1);
+ snprintf(name, 32, "%s-%d", output_names[koutput->connector_type], koutput->connector_type_id);
output = xf86OutputCreate (pScrn, &drmmode_output_funcs, name);