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

kms/crtc: Always consider gamma state valid

Browse Source 
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
This commit is contained in:
Benjamin Berg 2020-09-07 16:15:30 +02:00 committed by Georges Basile Stavracas Neto
parent 827f545c27
commit d586d06b39
1 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/backends/native/meta-kms-crtc.c
View File

@ -156,13 +156,10 @@ void
meta_kms_crtc_predict_state (MetaKmsCrtc *crtc, meta_kms_crtc_predict_state (MetaKmsCrtc *crtc,
MetaKmsUpdate *update) MetaKmsUpdate *update)
{ {
gboolean is_gamma_valid;
GList *mode_sets; GList *mode_sets;
GList *crtc_gammas; GList *crtc_gammas;
GList *l; GList *l;
is_gamma_valid = TRUE;
mode_sets = meta_kms_update_get_mode_sets (update); mode_sets = meta_kms_update_get_mode_sets (update);
for (l = mode_sets; l; l = l->next) 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 }; crtc->current_state.drm_mode = (drmModeModeInfo) { 0 };
} }
is_gamma_valid = FALSE;
break; break;
} }
@ -212,35 +207,8 @@ meta_kms_crtc_predict_state (MetaKmsCrtc *crtc,
crtc->current_state.gamma.blue = crtc->current_state.gamma.blue =
g_memdup (gamma->blue, gamma->size * sizeof (uint16_t)); g_memdup (gamma->blue, gamma->size * sizeof (uint16_t));
is_gamma_valid = TRUE;
break; 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 * MetaKmsCrtc *