Merge b71e9dc15f on remote branch

Change-Id: Iaba2002234fde8309d038f2bf48b99e0015dbf0e
This commit is contained in:
Linux Build Service Account 2021-11-15 02:19:31 -08:00
commit 2627dc980f

View file

@ -918,9 +918,10 @@ static int _sde_encoder_atomic_check_reserve(struct drm_encoder *drm_enc,
}
/* Skip RM allocation for Primary during CWB usecase */
if (!crtc_state->mode_changed && !crtc_state->active_changed &&
if ((!crtc_state->mode_changed && !crtc_state->active_changed &&
crtc_state->connectors_changed && (conn_state->crtc ==
conn_state->connector->state->crtc))
conn_state->connector->state->crtc)) ||
(crtc_state->active_changed && !crtc_state->active))
goto skip_reserve;
/* Reserve dynamic resources, indicating atomic_check phase */