isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-09 15:37:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

renderer/native: Check primary GPU supports EGL

Browse Source 
Since "renderer/native: make EGL initialization failure not fatal" it is
possible, under specific failure conditions, to end up with a primary GPU whose
EGL initialization failed. That cannot work.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/521
This commit is contained in:
Pekka Paalanen 2019-04-03 13:34:09 +03:00
parent 3b46a8cd70
commit 28419cdedf
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/backends/native/meta-renderer-native.c
View File

@ -4152,8 +4152,8 @@ on_gpu_added (MetaMonitorManager *monitor_manager,
} }
static MetaGpuKms * static MetaGpuKms *
choose_primary_gpu (MetaMonitorManager *manager, choose_primary_gpu_unchecked (MetaMonitorManager *manager,
MetaRendererNative *renderer_native) MetaRendererNative *renderer_native)
{ {
GList *gpus = meta_monitor_manager_get_gpus (manager); GList *gpus = meta_monitor_manager_get_gpus (manager);
GList *l; GList *l;
@ -4202,6 +4202,28 @@ choose_primary_gpu (MetaMonitorManager *manager,
return NULL; return NULL;
} }
static MetaGpuKms *
choose_primary_gpu (MetaMonitorManager *manager,
MetaRendererNative *renderer_native,
GError **error)
{
MetaGpuKms *gpu_kms;
MetaRendererNativeGpuData *renderer_gpu_data;
gpu_kms = choose_primary_gpu_unchecked (manager, renderer_native);
renderer_gpu_data = meta_renderer_native_get_gpu_data (renderer_native,
gpu_kms);
if (renderer_gpu_data->egl_display == EGL_NO_DISPLAY)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"The GPU %s chosen as primary is not supported by EGL.",
meta_gpu_kms_get_file_path (gpu_kms));
return NULL;
}
return gpu_kms;
}
static gboolean static gboolean
meta_renderer_native_initable_init (GInitable *initable, meta_renderer_native_initable_init (GInitable *initable,
GCancellable *cancellable, GCancellable *cancellable,
@ -4225,7 +4247,10 @@ meta_renderer_native_initable_init (GInitable *initable,
} }
renderer_native->primary_gpu_kms = choose_primary_gpu (monitor_manager, renderer_native->primary_gpu_kms = choose_primary_gpu (monitor_manager,
renderer_native); renderer_native,
error);
if (!renderer_native->primary_gpu_kms)
return FALSE;
return TRUE; return TRUE;
} }