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

monitor-manager/kms: Some naming fixes

Browse Source 
Prefix external types (e.g mode -> drm_mode) and rename a search
function to not refer to a local type as ".._meta_..".

https://bugzilla.gnome.org/show_bug.cgi?id=785381
This commit is contained in:
Jonas Ådahl 2017-03-28 16:44:57 +08:00
parent f64fab1d2d
commit f44b6c772a
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/backends/native/meta-monitor-manager-kms.c
View File

@ -406,8 +406,8 @@ output_get_tile_info (MetaMonitorManagerKms *manager_kms,
} }
static MetaCrtcMode * static MetaCrtcMode *
find_meta_mode (MetaMonitorManager *manager, mode_from_drm_mode (MetaMonitorManager *manager,
const drmModeModeInfo *drm_mode) const drmModeModeInfo *drm_mode)
{ {
unsigned k; unsigned k;
@ -625,7 +625,7 @@ static void
add_common_modes (MetaMonitorManager *manager, add_common_modes (MetaMonitorManager *manager,
MetaOutput *output) MetaOutput *output)
{ {
const drmModeModeInfo *mode; const drmModeModeInfo *drm_mode;
GPtrArray *array; GPtrArray *array;
unsigned i; unsigned i;
unsigned max_hdisplay = 0; unsigned max_hdisplay = 0;
@ -634,10 +634,10 @@ add_common_modes (MetaMonitorManager *manager,
for (i = 0; i < output->n_modes; i++) for (i = 0; i < output->n_modes; i++)
{ {
mode = output->modes[i]->driver_private; drm_mode = output->modes[i]->driver_private;
max_hdisplay = MAX (max_hdisplay, mode->hdisplay); max_hdisplay = MAX (max_hdisplay, drm_mode->hdisplay);
max_vdisplay = MAX (max_vdisplay, mode->vdisplay); max_vdisplay = MAX (max_vdisplay, drm_mode->vdisplay);
max_vrefresh = MAX (max_vrefresh, drm_mode_vrefresh (mode)); max_vrefresh = MAX (max_vrefresh, drm_mode_vrefresh (drm_mode));
} }
max_vrefresh = MAX (max_vrefresh, 60.0); max_vrefresh = MAX (max_vrefresh, 60.0);
@ -646,13 +646,13 @@ add_common_modes (MetaMonitorManager *manager,
array = g_ptr_array_new (); array = g_ptr_array_new ();
for (i = 0; i < G_N_ELEMENTS (meta_default_drm_mode_infos); i++) for (i = 0; i < G_N_ELEMENTS (meta_default_drm_mode_infos); i++)
{ {
mode = &meta_default_drm_mode_infos[i]; drm_mode = &meta_default_drm_mode_infos[i];
if (mode->hdisplay > max_hdisplay || if (drm_mode->hdisplay > max_hdisplay ||
mode->vdisplay > max_vdisplay || drm_mode->vdisplay > max_vdisplay ||
drm_mode_vrefresh (mode) > max_vrefresh) drm_mode_vrefresh (drm_mode) > max_vrefresh)
continue; continue;
g_ptr_array_add (array, find_meta_mode (manager, mode)); g_ptr_array_add (array, mode_from_drm_mode (manager, drm_mode));
} }
output->modes = g_renew (MetaCrtcMode *, output->modes, output->modes = g_renew (MetaCrtcMode *, output->modes,
@ -753,7 +753,7 @@ create_output (MetaMonitorManager *manager,
output->n_modes = connector->count_modes; output->n_modes = connector->count_modes;
output->modes = g_new0 (MetaCrtcMode *, output->n_modes); output->modes = g_new0 (MetaCrtcMode *, output->n_modes);
for (i = 0; i < output->n_modes; i++) { for (i = 0; i < output->n_modes; i++) {
output->modes[i] = find_meta_mode (manager, &connector->modes[i]); output->modes[i] = mode_from_drm_mode (manager, &connector->modes[i]);
if (connector->modes[i].type & DRM_MODE_TYPE_PREFERRED) if (connector->modes[i].type & DRM_MODE_TYPE_PREFERRED)
output->preferred_mode = output->modes[i]; output->preferred_mode = output->modes[i];
} }