aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2015-02-19 06:35:56 -0500
committerThierry Reding <treding@nvidia.com>2015-02-19 08:21:43 -0500
commit567a3cd1d75e3f282759af3bd05a7369daef2b2a (patch)
treeb232d137f71babe4538b5b4a69499465566d9244
parentc03bf1bfd3a5448a4474f02b839f2195e3719cd9 (diff)
drm/tegra: dc: Reset state's active_changed field
Commit eab3bbeffd15 ("drm/atomic: Add drm_crtc_state->active") added the field to track the DPMS state. However, the Tegra driver was in modified in parallel and subclasses the CRTC atomic state, so needed to duplicate the code in the atomic helpers. After the addition of the active_changed field it became out of sync and doesn't reset it when duplicating state. This causes a full modeset on things like page-flips, which will in turn cause warnings due to the VBLANK machinery being disabled when it really should remain on. Tested-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--drivers/gpu/drm/tegra/dc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
index 3aaa84ae2681..ec84bd486561 100644
--- a/drivers/gpu/drm/tegra/dc.c
+++ b/drivers/gpu/drm/tegra/dc.c
@@ -1012,6 +1012,7 @@ tegra_crtc_atomic_duplicate_state(struct drm_crtc *crtc)
1012 return NULL; 1012 return NULL;
1013 1013
1014 copy->base.mode_changed = false; 1014 copy->base.mode_changed = false;
1015 copy->base.active_changed = false;
1015 copy->base.planes_changed = false; 1016 copy->base.planes_changed = false;
1016 copy->base.event = NULL; 1017 copy->base.event = NULL;
1017 1018