Commit 9b5edbf7 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Dave Airlie

drm/atomic: Clear crtc_state->active in drm_atomic_helper_set_config.

This fixes some regressions in i915 when converting to atomic.
set_config failed with -EINVAL, and I received the following warning
in dmesg:

[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
here.

Cc: dri-devel@lists.freedesktop.org
Reviewed-by: default avatarRob Clark <robdclark@gmail.com>
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 531e63e1
...@@ -1563,6 +1563,8 @@ static int update_output_state(struct drm_atomic_state *state, ...@@ -1563,6 +1563,8 @@ static int update_output_state(struct drm_atomic_state *state,
crtc_state->enable = crtc_state->enable =
drm_atomic_connectors_for_crtc(state, crtc); drm_atomic_connectors_for_crtc(state, crtc);
if (!crtc_state->enable)
crtc_state->active = false;
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment