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

monitor-manager-kms: Check if GPUs can have outputs

Browse Source 
We need a way for mutter to exit if no available GPUs are going to work.
For example if gdm starts gnome-shell and we're using a DRM driver that
doesn't work with KMS then we should exit so that GDM can try with Xorg,
rather than operating in headless mode.

Related: https://gitlab.gnome.org/GNOME/mutter/issues/223

(cherry picked from commit deb541ef5a)
This commit is contained in:
Iain Lane 2018-08-13 10:22:22 +00:00 committed by Ray Strode
parent 2fb46fd078
commit b2cc2b1064
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backends/native/meta-gpu-kms.c
View File

@ -797,6 +797,12 @@ meta_gpu_kms_read_current (MetaGpu *gpu,
return TRUE; return TRUE;
} }
gboolean
meta_gpu_kms_can_have_outputs (MetaGpuKms *gpu_kms)
{
return gpu_kms->n_connectors > 0;
}
MetaGpuKms * MetaGpuKms *
meta_gpu_kms_new (MetaMonitorManagerKms *monitor_manager_kms, meta_gpu_kms_new (MetaMonitorManagerKms *monitor_manager_kms,
const char *kms_file_path, const char *kms_file_path,
@ -860,6 +866,8 @@ meta_gpu_kms_new (MetaMonitorManagerKms *monitor_manager_kms,
drmSetClientCap (gpu_kms->fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1); drmSetClientCap (gpu_kms->fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1);
meta_gpu_kms_read_current (META_GPU (gpu_kms), NULL);
source = g_source_new (&kms_event_funcs, sizeof (MetaKmsSource)); source = g_source_new (&kms_event_funcs, sizeof (MetaKmsSource));
kms_source = (MetaKmsSource *) source; kms_source = (MetaKmsSource *) source;
kms_source->fd_tag = g_source_add_unix_fd (source, kms_source->fd_tag = g_source_add_unix_fd (source,

2
src/backends/native/meta-gpu-kms.h
View File

@ -59,6 +59,8 @@ gboolean meta_gpu_kms_apply_crtc_mode (MetaGpuKms *gpu_kms,
int y, int y,
uint32_t fb_id); uint32_t fb_id);
gboolean meta_gpu_kms_can_have_outputs (MetaGpuKms *gpu_kms);
gboolean meta_gpu_kms_is_crtc_active (MetaGpuKms *gpu_kms, gboolean meta_gpu_kms_is_crtc_active (MetaGpuKms *gpu_kms,
MetaCrtc *crtc); MetaCrtc *crtc);

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

@ -642,10 +642,12 @@ meta_monitor_manager_kms_initable_init (GInitable *initable,
GError **error) GError **error)
{ {
MetaMonitorManagerKms *manager_kms = META_MONITOR_MANAGER_KMS (initable); MetaMonitorManagerKms *manager_kms = META_MONITOR_MANAGER_KMS (initable);
MetaMonitorManager *manager = META_MONITOR_MANAGER (manager_kms);
const char *subsystems[2] = { "drm", NULL }; const char *subsystems[2] = { "drm", NULL };
GList *gpu_paths; GList *gpu_paths;
g_autofree char *primary_gpu_path = NULL; g_autofree char *primary_gpu_path = NULL;
GList *l; GList *l;
gboolean can_have_outputs;
manager_kms->udev = g_udev_client_new (subsystems); manager_kms->udev = g_udev_client_new (subsystems);
@ -694,6 +696,24 @@ meta_monitor_manager_kms_initable_init (GInitable *initable,
} }
g_list_free_full (gpu_paths, g_free); g_list_free_full (gpu_paths, g_free);
can_have_outputs = FALSE;
for (l = meta_monitor_manager_get_gpus (manager); l; l = l->next)
{
MetaGpuKms *gpu_kms = l->data;
if (meta_gpu_kms_can_have_outputs (gpu_kms))
{
can_have_outputs = TRUE;
break;
}
}
if (!can_have_outputs)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
"No GPUs with outputs found");
return FALSE;
}
return TRUE; return TRUE;
} }