Merge "disp: msm: dsi: fix mode count for POMS enabled video mode panel"

msm/dsi/dsi_display.c

@@ -7286,7 +7286,10 @@ int dsi_display_get_modes_helper(struct dsi_display *display,
 
 			dsi_display_get_dfps_timing(display, sub_mode,
 					curr_refresh_rate);
-			sub_mode->panel_mode_caps = DSI_OP_VIDEO_MODE;
+
+			/* Avoid override for first sub mode in POMS enabled video mode usecase */
+			if ((i != start) && support_cmd_mode && support_video_mode)
+				sub_mode->panel_mode_caps = DSI_OP_VIDEO_MODE;
 		}
 		end = array_idx;
 

msm/dsi/dsi_panel.c

@@ -4009,17 +4009,9 @@ int dsi_panel_get_mode_count(struct dsi_panel *panel)
 	num_dfps_rates = !panel->dfps_caps.dfps_support ? 1 :
 					panel->dfps_caps.dfps_list_len;
 
-	/*
-	 * Inflate num_of_modes by fps in dfps.
-	 * Single command mode for video mode panels supporting
-	 * panel operating mode switch.
-	 */
+	/* Inflate num_of_modes by fps in dfps. */
 	num_video_modes = num_video_modes * num_dfps_rates;
 
-	if ((panel->panel_mode == DSI_OP_VIDEO_MODE) &&
-			(panel->panel_mode_switch_enabled))
-		num_cmd_modes  = 1;
-
 	panel->num_display_modes = num_video_modes + num_cmd_modes;
 
 error: