[PATCH] drm/atomic: Clear crtc_state->active in drm_atomic_helper_set_config.
maarten.lankhorst at linux.intel.com
Sun May 31 23:59:53 PDT 2015
This fixes some regressions in i915 when converting to atomic.
set_config failed with -EINVAL, and I received the following warning
[drm:drm_atomic_crtc_check] [CRTC:20] active without enabled
Solve this by clearing active when a crtc is disabled.
Because crtc_state->enable implies that connectors are active the
change from disabled->enabled can only happen for the crtc that's
being set_config'd, and checking for !crtc_state->enable is sufficient
Cc: dri-devel at lists.freedesktop.org
Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index ab5cb9b4f2d8..c3999dd41c20 100644
@@ -1572,6 +1572,8 @@ static int update_output_state(struct drm_atomic_state *state,
+ if (!crtc_state->enable)
+ crtc_state->active = false;
More information about the dri-devel