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

kms/connector: Don't use MetaConnectorType for connector type

Browse Source 
Use uint32_t as that is what it is in the drm layer. MetaConnectorType
will be less suitable, as it will grow custom connector types that can't
be mapped.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1698>
This commit is contained in:
Jonas Ådahl
2021-03-09 19:19:47 +01:00
committed by Marge Bot
parent ba38057067
commit e7ae1978f8
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -267,6 +267,12 @@ init_output_modes (MetaOutputInfo *output_info,
return TRUE;
}
static MetaConnectorType
meta_kms_connector_type_from_drm (uint32_t drm_connector_type)
{
return (MetaConnectorType) drm_connector_type;
}
MetaOutputKms *
meta_output_kms_new (MetaGpuKms *gpu_kms,
MetaKmsConnector *kms_connector,
@ -279,6 +285,7 @@ meta_output_kms_new (MetaGpuKms *gpu_kms,
g_autoptr (MetaOutputInfo) output_info = NULL;
MetaOutput *output;
MetaOutputKms *output_kms;
uint32_t drm_connector_type;
const MetaKmsConnectorState *connector_state;
GArray *crtcs;
GList *l;
@ -331,7 +338,9 @@ meta_output_kms_new (MetaGpuKms *gpu_kms,
meta_output_info_parse_edid (output_info, connector_state->edid_data);
output_info->connector_type = meta_kms_connector_get_connector_type (kms_connector);
drm_connector_type = meta_kms_connector_get_connector_type (kms_connector);
output_info->connector_type =
meta_kms_connector_type_from_drm (drm_connector_type);
output_info->tile_info = connector_state->tile_info;