When assigning a mixer, we will iterate through the entire list looking for a suitable match. This results in selecting the last match. We should stop at the first match, since lower numbered mixers will typically have more capabilities, and are likely to be what the bootloader used, if we are looking to reuse the bootloader config in future. Signed-off-by: Jeffrey Hugo <jeffrey.l.hugo@xxxxxxxxx> --- drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.c index 954db683ae44..1638042ad974 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.c @@ -96,6 +96,17 @@ int mdp5_mixer_assign(struct drm_atomic_state *s, struct drm_crtc *crtc, */ if (!(*mixer) || cur->caps & MDP_LM_CAP_PAIR) *mixer = cur; + + /* + * We have everything we could want, exit early. + * We have a valid mixer, that mixer pairs with another if we + * need that ability in future, and we have a right mixer if + * needed. + * Later LMs could be less optimal + */ + if (*mixer && (*mixer)->caps & MDP_LM_CAP_PAIR && + ((r_mixer && *r_mixer) || !r_mixer)) + break; } if (!(*mixer)) -- 2.17.1
