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

monitor-manager/native: Bail if gamma LUT size differs

Browse Source 
Don't attempt to set a CRTC GAMMA LUT with a different size than what is
already there.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2141>
This commit is contained in:
Jonas Ådahl 2021-10-26 11:09:41 +02:00 committed by Marge Bot
parent b6aea1318d
commit 15bbded86b
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/backends/native/meta-monitor-manager-native.c
View File

@ -493,6 +493,7 @@ meta_monitor_manager_native_set_crtc_gamma (MetaMonitorManager *manager,
META_MONITOR_MANAGER_NATIVE (manager); META_MONITOR_MANAGER_NATIVE (manager);
MetaCrtcKms *crtc_kms; MetaCrtcKms *crtc_kms;
MetaKmsCrtc *kms_crtc; MetaKmsCrtc *kms_crtc;
const MetaKmsCrtcState *crtc_state;
g_autofree char *gamma_ramp_string = NULL; g_autofree char *gamma_ramp_string = NULL;
MetaBackend *backend = meta_monitor_manager_get_backend (manager); MetaBackend *backend = meta_monitor_manager_get_backend (manager);
ClutterStage *stage = CLUTTER_STAGE (meta_backend_get_stage (backend)); ClutterStage *stage = CLUTTER_STAGE (meta_backend_get_stage (backend));
@ -501,6 +502,17 @@ meta_monitor_manager_native_set_crtc_gamma (MetaMonitorManager *manager,
crtc_kms = META_CRTC_KMS (crtc); crtc_kms = META_CRTC_KMS (crtc);
kms_crtc = meta_crtc_kms_get_kms_crtc (META_CRTC_KMS (crtc)); kms_crtc = meta_crtc_kms_get_kms_crtc (META_CRTC_KMS (crtc));
crtc_state = meta_kms_crtc_get_current_state (kms_crtc);
if (size != crtc_state->gamma.size)
{
MetaKmsDevice *kms_device = meta_kms_crtc_get_device (kms_crtc);
g_warning ("Tried to set a different gamma LUT size on %u (%s)",
meta_kms_crtc_get_id (kms_crtc),
meta_kms_device_get_path (kms_device));
return;
}
g_hash_table_replace (manager_native->crtc_gamma_cache, g_hash_table_replace (manager_native->crtc_gamma_cache,
GUINT_TO_POINTER (meta_crtc_get_id (crtc)), GUINT_TO_POINTER (meta_crtc_get_id (crtc)),