Skip to content

Commit 3a84f2c

Browse files
vsyrjalajnikula
authored andcommitted
drm/i915: Preserve crtc_state->inherited during state clearing
intel_crtc_prepare_cleared_state() is unintentionally losing the "inherited" flag. This will happen if intel_initial_commit() is forced to go through the full modeset calculations for whatever reason. Afterwards the first real commit from userspace will not get forced to the full modeset path, and thus eg. audio state may not get recomputed properly. So if the monitor was already enabled during boot audio will not work until userspace itself does an explicit full modeset. Cc: [email protected] Tested-by: Lee Shawn C <[email protected]> Signed-off-by: Ville Syrjälä <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Reviewed-by: Uma Shankar <[email protected]> (cherry picked from commit 2553bac) Signed-off-by: Jani Nikula <[email protected]>
1 parent ed00eba commit 3a84f2c

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

drivers/gpu/drm/i915/display/intel_display.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5145,6 +5145,7 @@ intel_crtc_prepare_cleared_state(struct intel_atomic_state *state,
51455145
* only fields that are know to not cause problems are preserved. */
51465146

51475147
saved_state->uapi = crtc_state->uapi;
5148+
saved_state->inherited = crtc_state->inherited;
51485149
saved_state->scaler_state = crtc_state->scaler_state;
51495150
saved_state->shared_dpll = crtc_state->shared_dpll;
51505151
saved_state->dpll_hw_state = crtc_state->dpll_hw_state;

0 commit comments

Comments
 (0)