Merge "video: driver: allow five 4K resolution video sessions"

driver/platform/kalama/src/msm_vidc_kalama.c

@@ -60,8 +60,8 @@ static struct msm_platform_core_capability core_data_kalama[] = {
 	{DEC_CODECS, H264|HEVC|VP9|AV1|HEIC},
 	{MAX_SESSION_COUNT, 16},
 	{MAX_NUM_720P_SESSIONS, 16},
-	{MAX_NUM_1080P_SESSIONS, 8},
-	{MAX_NUM_4K_SESSIONS, 6},
+	{MAX_NUM_1080P_SESSIONS, 10},
+	{MAX_NUM_4K_SESSIONS, 5},
 	{MAX_NUM_8K_SESSIONS, 2},
 	{MAX_SECURE_SESSION_COUNT, 3},
 	{MAX_RT_MBPF, 173056},	/* (8192x4320)/256 + (4096x2176)/256*/

driver/vidc/src/msm_vidc_driver.c

@@ -5908,8 +5908,7 @@ static int msm_vidc_check_resolution_supported(struct msm_vidc_inst *inst)
 static int msm_vidc_check_max_sessions(struct msm_vidc_inst *inst)
 {
 	u32 width = 0, height = 0;
-	u32 num_720p_sessions = 0, num_1080p_sessions = 0;
-	u32 num_4k_sessions = 0, num_8k_sessions = 0;
+	u32 num_1080p_sessions = 0, num_4k_sessions = 0, num_8k_sessions = 0;
 	struct msm_vidc_inst *i;
 	struct msm_vidc_core *core;
 
@@ -5956,16 +5955,11 @@ static int msm_vidc_check_max_sessions(struct msm_vidc_inst *inst)
 			num_8k_sessions += 1;
 			num_4k_sessions += 2;
 			num_1080p_sessions += 4;
-			num_720p_sessions += 8;
 		} else if (res_is_greater_than(width, height, 1920 + (1920 >> 1), 1088 + (1088 >> 1))) {
 			num_4k_sessions += 1;
 			num_1080p_sessions += 2;
-			num_720p_sessions += 4;
 		} else if (res_is_greater_than(width, height, 1280 + (1280 >> 1), 736 + (736 >> 1))) {
 			num_1080p_sessions += 1;
-			num_720p_sessions += 2;
-		} else {
-			num_720p_sessions += 1;
 		}
 	}
 	core_unlock(core, __func__);
@@ -5991,13 +5985,6 @@ static int msm_vidc_check_max_sessions(struct msm_vidc_inst *inst)
 		return -ENOMEM;
 	}
 
-	if (num_720p_sessions > core->capabilities[MAX_NUM_720P_SESSIONS].value) {
-		i_vpr_e(inst, "%s: total sessions(<=720p) %d, exceeded max limit %d\n",
-			__func__, num_720p_sessions,
-			core->capabilities[MAX_NUM_720P_SESSIONS].value);
-		return -ENOMEM;
-	}
-
 	return 0;
 }