Merge branch 'deprecate_non_atomic' into 'main'

drm: Deprecate non-atomic mode sets

See merge request wayland/weston!2057
This commit is contained in:
Derek Foreman 2026-04-29 13:39:41 -05:00
commit 41a74d1f0b
3 changed files with 19 additions and 0 deletions

View file

@ -2069,6 +2069,15 @@ init_kms_caps(struct drm_device *device)
weston_log("DRM: %s atomic modesetting\n",
device->atomic_modeset ? "supports" : "does not support");
if (!device->atomic_modeset) {
#ifdef ALLOW_DEPRECATED_MODESET
weston_log("DRM Warning: Non-atomic modeset support is deprecated and will be removed.\n");
#else
weston_log("Error: Kernel DRM KMS does not support DRM_CLIENT_CAP_ATOMIC.\n");
return -1;
#endif
}
if (!getenv("WESTON_DISABLE_GBM_MODIFIERS")) {
ret = drmGetCap(device->kms_device->fd, DRM_CAP_ADDFB2_MODIFIERS, &cap);
if (ret == 0)

View file

@ -221,6 +221,9 @@ else
prog_glslang = find_program('', required : false)
endif
if get_option('allow-deprecated-modeset')
config_h.set('ALLOW_DEPRECATED_MODESET', '1')
endif
subdir('include')
subdir('protocol')

View file

@ -209,3 +209,10 @@ option(
value : false,
description : 'Enable performance analysis with Perfetto.'
)
option(
'allow-deprecated-modeset',
type: 'boolean',
value: false,
description: 'DEPRECATED: Non-atomic modeset paths will be removed'
)