From 5792eb97d136d3db084dd1bfc63c3f884e9b38a9 Mon Sep 17 00:00:00 2001 From: Yashwanth Date: Thu, 23 Apr 2020 13:53:27 +0530 Subject: [PATCH] disp: msm: sde: add check for max encoder limit during allocation This change checks max limit while allocating encoders during display init. Change-Id: I48736667c2b83f916f09f9e81cb1b24a9fef215a Signed-off-by: Yashwanth --- msm/sde/sde_kms.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/msm/sde/sde_kms.c b/msm/sde/sde_kms.c index c770ba015b35..ade246cd11cf 100644 --- a/msm/sde/sde_kms.c +++ b/msm/sde/sde_kms.c @@ -1489,7 +1489,9 @@ static int _sde_kms_setup_displays(struct drm_device *dev, /* update display cap to MST_MODE for DP MST encoders */ info.capabilities |= MSM_DISPLAY_CAP_MST_MODE; - for (idx = 0; idx < sde_kms->dp_stream_count; idx++) { + + for (idx = 0; idx < sde_kms->dp_stream_count && + priv->num_encoders < max_encoders; idx++) { info.h_tile_instance[0] = idx; encoder = sde_encoder_init(dev, &info); if (IS_ERR_OR_NULL(encoder)) {