Merge "disp: msm: dsi: Fix num of displays for firmware approach" (95955d98) · Commits · e / devices / android_kernel_fairphone_FP5

msm/dsi/dsi_display.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -5858,7 +5858,8 @@ int dsi_display_get_num_of_displays(void)
		for (i = 0; i < MAX_DSI_ACTIVE_DISPLAY; i++) {
		struct dsi_display *display = boot_displays[i].disp;

		if (display && display->panel_node)
		if ((display && display->panel_node) \|\|
		(display && display->fw))
		count++;
		}

		@@ -5877,7 +5878,8 @@ int dsi_display_get_active_displays(void **display_array, u32 max_display_count)
		for (index = 0; index < MAX_DSI_ACTIVE_DISPLAY; index++) {
		struct dsi_display *display = boot_displays[index].disp;

		if (display && display->panel_node)
		if ((display && display->panel_node) \|\|
		(display && display->fw))
		display_array[count++] = display;
		}