brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

output/kms: Make winsys_id unique

Browse Source 
We were using the connector_id for the winsys_id, but different
devices could have connectors with the same id. Since we use
winsys_id to uniquely identify outputs, use both the connector
id and the device id to avoid having outputs with the same id.
This commit is contained in:
Emilio Pozuelo Monfort 2018-10-11 16:20:00 +02:00 committed by Emilio Pozuelo Monfort
parent 5e005316ef
commit fb8dc91893
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backends/native/meta-output-kms.c
View File

@ -512,6 +512,7 @@ meta_create_kms_output (MetaGpuKms *gpu_kms,
unsigned int i; unsigned int i;
unsigned int crtc_mask; unsigned int crtc_mask;
int fd; int fd;
uint32_t id;
output = g_object_new (META_TYPE_OUTPUT, NULL); output = g_object_new (META_TYPE_OUTPUT, NULL);
@ -520,9 +521,11 @@ meta_create_kms_output (MetaGpuKms *gpu_kms,
output->driver_notify = (GDestroyNotify) meta_output_destroy_notify; output->driver_notify = (GDestroyNotify) meta_output_destroy_notify;
output->gpu = gpu; output->gpu = gpu;
output->winsys_id = connector->connector_id;
output->name = make_output_name (connector); output->name = make_output_name (connector);
id = meta_gpu_kms_get_id (gpu_kms);
output->winsys_id = ((uint64_t) id << 32) | connector->connector_id;
switch (connector->subpixel) switch (connector->subpixel)
{ {
case DRM_MODE_SUBPIXEL_NONE: case DRM_MODE_SUBPIXEL_NONE: