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

kms-impl-device: Fail if we can't enable universal planes

Browse Source 
We currently don't handle the lack of DRM_CLIENT_CAP_UNIVERSAL_PLANES
KMS capability. Fail constructing a device that can't handle this up
front, so later made assumptions, such as presence of a primary plane,
are actually valid.

If we want to support lack of said capability, the required planes need
to be emulated by a dummy MetaKmsPlane object.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/665
This commit is contained in:
Jonas Ådahl 2019-07-01 10:49:03 +02:00
parent f2f4af0d50
commit 1c25b75571
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,7 +156,9 @@ create_impl_device_in_impl (MetaKmsImpl *impl,
CreateImplDeviceData *data = user_data; CreateImplDeviceData *data = user_data;
MetaKmsImplDevice *impl_device; MetaKmsImplDevice *impl_device;
impl_device = meta_kms_impl_device_new (data->device, impl, data->fd); impl_device = meta_kms_impl_device_new (data->device, impl, data->fd, error);
if (!impl_device)
return FALSE;
data->out_impl_device = impl_device; data->out_impl_device = impl_device;
data->out_crtcs = meta_kms_impl_device_copy_crtcs (impl_device); data->out_crtcs = meta_kms_impl_device_copy_crtcs (impl_device);

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

@ -309,21 +309,30 @@ meta_kms_impl_device_update_states (MetaKmsImplDevice *impl_device)
MetaKmsImplDevice * MetaKmsImplDevice *
meta_kms_impl_device_new (MetaKmsDevice *device, meta_kms_impl_device_new (MetaKmsDevice *device,
MetaKmsImpl *impl, MetaKmsImpl *impl,
int fd) int fd,
GError **error)
{ {
MetaKms *kms = meta_kms_impl_get_kms (impl); MetaKms *kms = meta_kms_impl_get_kms (impl);
MetaKmsImplDevice *impl_device; MetaKmsImplDevice *impl_device;
int ret;
drmModeRes *drm_resources; drmModeRes *drm_resources;
meta_assert_in_kms_impl (kms); meta_assert_in_kms_impl (kms);
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;
}
impl_device = g_object_new (META_TYPE_KMS_IMPL_DEVICE, NULL); impl_device = g_object_new (META_TYPE_KMS_IMPL_DEVICE, NULL);
impl_device->device = device; impl_device->device = device;
impl_device->impl = impl; impl_device->impl = impl;
impl_device->fd = fd; impl_device->fd = fd;
drmSetClientCap (fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1);
drm_resources = drmModeGetResources (fd); drm_resources = drmModeGetResources (fd);
init_crtcs (impl_device, drm_resources); init_crtcs (impl_device, drm_resources);

3
src/backends/native/meta-kms-impl-device.h
View File

@ -59,6 +59,7 @@ int meta_kms_impl_device_close (MetaKmsImplDevice *impl_device);
MetaKmsImplDevice * meta_kms_impl_device_new (MetaKmsDevice *device, MetaKmsImplDevice * meta_kms_impl_device_new (MetaKmsDevice *device,
MetaKmsImpl *kms_impl, MetaKmsImpl *kms_impl,
int fd); int fd,
GError **error);
#endif /* META_KMS_IMPL_DEVICE_H */ #endif /* META_KMS_IMPL_DEVICE_H */