Merge "disp: msm: sde: update max_dp_dsc_count in dsc switch case"

msm/sde/sde_crtc.c

@@ -7154,11 +7154,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,

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 ?