From 9a96017f9ac30a980702604b4e934784ff7e30e6 Mon Sep 17 00:00:00 2001 From: Raviteja Tamatam Date: Tue, 8 Jun 2021 20:07:26 +0530 Subject: [PATCH] disp: msm: sde: update max_dp_dsc_count in dsc switch case max_dp_dsc_count needs to be updated to total dsc count only if dsc_switch_support is present. Updated allowed_dsc_reservation_switch just after connector_init before max_dp_dsc_count value is modified. Change-Id: I878cde62b4940c629293eba0a3794f4dc2996b4f Signed-off-by: Raviteja Tamatam --- msm/sde/sde_crtc.c | 5 ----- msm/sde/sde_kms.c | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/msm/sde/sde_crtc.c b/msm/sde/sde_crtc.c index 0ba53efe92..0f22b14603 100644 --- a/msm/sde/sde_crtc.c +++ b/msm/sde/sde_crtc.c @@ -7155,11 +7155,6 @@ struct drm_crtc *sde_crtc_init(struct drm_device *dev, struct drm_plane *plane) return ERR_PTR(rc); } - if (kms->catalog->allowed_dsc_reservation_switch && !kms->dsc_switch_support) { - SDE_DEBUG("dsc switch not supported\n"); - kms->catalog->allowed_dsc_reservation_switch = 0; - } - /* create CRTC properties */ msm_property_init(&sde_crtc->property_info, &crtc->base, dev, priv->crtc_property, sde_crtc->property_data, diff --git a/msm/sde/sde_kms.c b/msm/sde/sde_kms.c index a6020506c0..66d56be583 100644 --- a/msm/sde/sde_kms.c +++ b/msm/sde/sde_kms.c @@ -1929,6 +1929,12 @@ static int _sde_kms_setup_displays(struct drm_device *dev, sde_kms->dsc_switch_support = true; } + if (sde_kms->catalog->allowed_dsc_reservation_switch && + !sde_kms->dsc_switch_support) { + SDE_DEBUG("dsc switch not supported\n"); + sde_kms->catalog->allowed_dsc_reservation_switch = 0; + } + max_dp_mixer_count = sde_kms->catalog->mixer_count > mixer_count ? sde_kms->catalog->mixer_count - mixer_count : 0; max_dp_dsc_count = sde_kms->catalog->dsc_count > dsc_count ?