sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

backend/native: Don't warn on EACCES if headless

Browse source 
Since commit 1bf70334 "tests/runner: Make test runner use the headless
backend", tests are run with the native backend in headless mode, which
will attempt to open each GPU and show a warning (fatal during tests)
if it cannot.

However, in headless mode we might not be logged in on any seat (for
example we might be logged in via ssh instead), which means we might
legitimately not have permission to use any GPUs, even if they exist.
Downgrade the warning to a debug message in this case.

Resolves: https://gitlab.gnome.org/GNOME/mutter/-/issues/2381
Signed-off-by: Simon McVittie <smcv@debian.org>
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2584>
This commit is contained in:
Simon McVittie 2022-08-18 10:41:01 +01:00 committed by Marge Bot
parent 9a2c5d7d74
commit 64a67aa00b
1 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/backends/native/meta-backend-native.c
View file

@ -525,8 +525,20 @@ on_udev_device_added (MetaUdev *udev,
new_gpu_kms = create_gpu_from_udev_device (native, device, &error); new_gpu_kms = create_gpu_from_udev_device (native, device, &error);
if (!new_gpu_kms) if (!new_gpu_kms)
{ {
g_warning ("Failed to hotplug secondary gpu '%s': %s", if (meta_backend_is_headless (backend) &&
device_path, error->message); g_error_matches (error, G_IO_ERROR,
G_IO_ERROR_PERMISSION_DENIED))
{
meta_topic (META_DEBUG_BACKEND,
"Ignoring unavailable secondary gpu '%s': %s",
device_path, error->message);
}
else
{
g_warning ("Failed to hotplug secondary gpu '%s': %s",
device_path, error->message);
}
return; return;
} }
@ -563,9 +575,22 @@ init_gpus (MetaBackendNative *native,
if (!gpu_kms) if (!gpu_kms)
{ {
g_warning ("Failed to open gpu '%s': %s", if (meta_backend_is_headless (backend) &&
g_udev_device_get_device_file (device), g_error_matches (local_error, G_IO_ERROR,
local_error->message); G_IO_ERROR_PERMISSION_DENIED))
{
meta_topic (META_DEBUG_BACKEND,
"Ignoring unavailable gpu '%s': %s'",
g_udev_device_get_device_file (device),
local_error->message);
}
else
{
g_warning ("Failed to open gpu '%s': %s",
g_udev_device_get_device_file (device),
local_error->message);
}
g_clear_error (&local_error); g_clear_error (&local_error);
continue; continue;
} }