diff options
| author | Benjamin Berg <bberg@redhat.com> | 2020-09-07 16:15:30 +0200 |
|---|---|---|
| committer | Georges Basile Stavracas Neto <georges.stavracas@gmail.com> | 2020-09-15 11:31:57 +0000 |
| commit | d586d06b39085d1b725ed1a0d72df3f41d4d8f9a (patch) | |
| tree | bbc5c84209c5a7e56ff1a067332eccb561ee592a | |
| parent | 827f545c274be48f2084ad86f58d404b7a2ca262 (diff) | |
| download | mutter-d586d06b39085d1b725ed1a0d72df3f41d4d8f9a.tar.gz | |
kms/crtc: Always consider gamma state valid
The gamma curve remains valid even if the CRTC is turned off. As such,
there is no need to clear it and doing so breaks reading the gamma curve
while the screens are turned off using DPMS.
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1420
Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1392
| -rw-r--r-- | src/backends/native/meta-kms-crtc.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/src/backends/native/meta-kms-crtc.c b/src/backends/native/meta-kms-crtc.c index f5547567b..ebdd8ed9d 100644 --- a/src/backends/native/meta-kms-crtc.c +++ b/src/backends/native/meta-kms-crtc.c @@ -156,13 +156,10 @@ void meta_kms_crtc_predict_state (MetaKmsCrtc *crtc, MetaKmsUpdate *update) { - gboolean is_gamma_valid; GList *mode_sets; GList *crtc_gammas; GList *l; - is_gamma_valid = TRUE; - mode_sets = meta_kms_update_get_mode_sets (update); for (l = mode_sets; l; l = l->next) { @@ -190,8 +187,6 @@ meta_kms_crtc_predict_state (MetaKmsCrtc *crtc, crtc->current_state.drm_mode = (drmModeModeInfo) { 0 }; } - is_gamma_valid = FALSE; - break; } @@ -212,35 +207,8 @@ meta_kms_crtc_predict_state (MetaKmsCrtc *crtc, crtc->current_state.gamma.blue = g_memdup (gamma->blue, gamma->size * sizeof (uint16_t)); - is_gamma_valid = TRUE; break; } - - if (!is_gamma_valid) - { - if (crtc->current_state.is_drm_mode_valid) - { - MetaKmsImplDevice *impl_device; - drmModeCrtc *drm_crtc; - - impl_device = meta_kms_device_get_impl_device (crtc->device); - drm_crtc = drmModeGetCrtc (meta_kms_impl_device_get_fd (impl_device), - crtc->id); - if (drm_crtc) - { - read_gamma_state (crtc, impl_device, drm_crtc); - drmModeFreeCrtc (drm_crtc); - } - else - { - clear_gamma_state (crtc); - } - } - else - { - clear_gamma_state (crtc); - } - } } MetaKmsCrtc * |