summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2018-07-11 19:10:20 +0200
committerMichel Dänzer <michel@daenzer.net>2018-07-12 18:13:18 +0200
commitb4f0f44a9f67f2eafd4a2b5ab919e6ea7fa2acf7 (patch)
tree65decaba7b1c687dedadf160fc6e3837c42071b0
parent612bda0a5e769f23478b364cf89620222cfac349 (diff)
modesetting: Create CONNECTOR_ID properties for outputs [v2]
This lets a DRM client map between X outputs and kernel connectors. v2: Change CONNECTOR_ID to enum -- Adam Jackson <ajax@nwnk.net> Signed-off-by: Keith Packard <keithp@keithp.com> (Ported from xserver commit 023d4aba8d45e9e3630b944ecfb650c081799b96) Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> (Ported from amdgpu commit ab7e39c5a03e24c3ce3ee2f22ada7572bc2d9aa7) Acked-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--src/drmmode_display.c27
1 files changed, 27 insertions, 0 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 27aa5a6c..d4bd76e1 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1643,6 +1643,33 @@ drmmode_output_create_resources(xf86OutputPtr output)
RADEONEntPtr pRADEONEnt = RADEONEntPriv(output->scrn);
drmModePropertyPtr drmmode_prop, tearfree_prop;
int i, j, err;
+ Atom name;
+
+ /* Create CONNECTOR_ID property */
+ name = MakeAtom("CONNECTOR_ID", 12, TRUE);
+ if (name != BAD_RESOURCE) {
+ INT32 value = mode_output->connector_id;
+
+ err = RRConfigureOutputProperty(output->randr_output, name,
+ FALSE, FALSE, TRUE, 1, &value);
+ if (err != Success) {
+ xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
+ "RRConfigureOutputProperty error, %d\n", err);
+ }
+
+ err = RRChangeOutputProperty(output->randr_output, name,
+ XA_INTEGER, 32, PropModeReplace, 1,
+ &value, FALSE, FALSE);
+ if (err != Success) {
+ xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
+ "RRChangeOutputProperty error, %d\n", err);
+ }
+ }
+
+ drmmode_output->props =
+ calloc(mode_output->count_props + 1, sizeof(drmmode_prop_rec));
+ if (!drmmode_output->props)
+ return;
drmmode_output->props = calloc(mode_output->count_props + 1, sizeof(drmmode_prop_rec));
if (!drmmode_output->props)