Merge "drm/msm/dp: return number of displays as 0 if dp node is disabled" into dev/msm-4.14-display

drivers/gpu/drm/msm/dp/dp_display.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2114,6 +2114,9 @@ int dp_display_get_displays(void **displays, int count)

	int dp_display_get_num_of_displays(void)		int dp_display_get_num_of_displays(void)
	{		{
			if (!g_dp_display)
			return 0;

	return 1;		return 1;
	}		}