From 06d5aa57809864e45e4c59460ab4e064fd1e2df7 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Sat, 9 May 2020 16:50:50 +0200 Subject: backend/drm: GAMMA_LUT_SIZE isn't atomic GAMMA_LUT_SIZE isn't an atomic property. It can be used with the legacy interface too. So we can unify both codepaths and remove wlr_drm_interface.crtc_get_gamma_size. It's no guaranteed to exist though, so we still need to keep the fallback. --- include/backend/drm/iface.h | 3 --- include/backend/drm/properties.h | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'include/backend/drm') diff --git a/include/backend/drm/iface.h b/include/backend/drm/iface.h index 6393579c..9377af03 100644 --- a/include/backend/drm/iface.h +++ b/include/backend/drm/iface.h @@ -16,9 +16,6 @@ struct wlr_drm_interface { // Commit al pending changes on a CRTC. bool (*crtc_commit)(struct wlr_drm_backend *drm, struct wlr_drm_connector *conn, uint32_t flags); - // Get the gamma lut size of a crtc - size_t (*crtc_get_gamma_size)(struct wlr_drm_backend *drm, - struct wlr_drm_crtc *crtc); }; extern const struct wlr_drm_interface atomic_iface; diff --git a/include/backend/drm/properties.h b/include/backend/drm/properties.h index 810a03a3..fba444aa 100644 --- a/include/backend/drm/properties.h +++ b/include/backend/drm/properties.h @@ -31,13 +31,13 @@ union wlr_drm_crtc_props { uint32_t rotation; uint32_t scaling_mode; uint32_t vrr_enabled; + uint32_t gamma_lut; + uint32_t gamma_lut_size; // atomic-modesetting only uint32_t active; uint32_t mode_id; - uint32_t gamma_lut; - uint32_t gamma_lut_size; }; uint32_t props[6]; }; -- cgit v1.2.3