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

kms/device: Move universal plane cap check to mode set init

Browse Source 
This leaves only the atomic mode setting cap check before creating the
impl device, aiming to make it possible to create a non-mode-setting
MetaKmsImplDevice implementation.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1698>
This commit is contained in:
Jonas Ådahl 2021-01-18 18:30:02 +01:00 committed by Marge Bot
parent 7c25953c65
commit 34b0f9c124
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/backends/native/meta-kms-device.c
View File

@ -281,22 +281,12 @@ meta_create_kms_impl_device (MetaKmsDevice *device,
{ {
GType impl_device_type; GType impl_device_type;
gboolean supports_atomic_mode_setting; gboolean supports_atomic_mode_setting;
int ret;
g_autofree char *driver_name = NULL; g_autofree char *driver_name = NULL;
g_autofree char *driver_description = NULL; g_autofree char *driver_description = NULL;
const char *atomic_kms_enable_env; const char *atomic_kms_enable_env;
meta_assert_in_kms_impl (meta_kms_impl_get_kms (impl)); meta_assert_in_kms_impl (meta_kms_impl_get_kms (impl));
ret = drmSetClientCap (fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1);
if (ret != 0)
{
g_set_error (error, G_IO_ERROR, g_io_error_from_errno (-ret),
"Failed to activate universal planes: %s",
g_strerror (-ret));
return NULL;
}
if (!get_driver_info (fd, &driver_name, &driver_description)) if (!get_driver_info (fd, &driver_name, &driver_description))
{ {
driver_name = g_strdup ("unknown"); driver_name = g_strdup ("unknown");
@ -340,6 +330,8 @@ meta_create_kms_impl_device (MetaKmsDevice *device,
} }
else else
{ {
int ret;
ret = drmSetClientCap (fd, DRM_CLIENT_CAP_ATOMIC, 1); ret = drmSetClientCap (fd, DRM_CLIENT_CAP_ATOMIC, 1);
if (ret == 0) if (ret == 0)
supports_atomic_mode_setting = TRUE; supports_atomic_mode_setting = TRUE;

10
src/backends/native/meta-kms-impl-device.c
View File

@ -787,8 +787,18 @@ meta_kms_impl_device_init_mode_setting (MetaKmsImplDevice *impl_device,
{ {
MetaKmsImplDevicePrivate *priv = MetaKmsImplDevicePrivate *priv =
meta_kms_impl_device_get_instance_private (impl_device); meta_kms_impl_device_get_instance_private (impl_device);
int ret;
drmModeRes *drm_resources; drmModeRes *drm_resources;
ret = drmSetClientCap (priv->fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1);
if (ret != 0)
{
g_set_error (error, G_IO_ERROR, g_io_error_from_errno (-ret),
"Failed to activate universal planes: %s",
g_strerror (-ret));
return FALSE;
}
drm_resources = drmModeGetResources (priv->fd); drm_resources = drmModeGetResources (priv->fd);
if (!drm_resources) if (!drm_resources)
{ {