From: deasung.kim <deasung.kim@samsung.com>
Date: Tue, 1 Nov 2016 05:14:24 +0000 (+0900)
Subject: surface: fix segfault when tdm display init failed
X-Git-Tag: submit/submit/tizen/20170906.070327/20170906.070422~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F86%2F102986%2F2;p=platform%2Fcore%2Fuifw%2Fvulkan-wsi-tizen.git

surface: fix segfault when tdm display init failed

	if tdm display init failed and app use display surface
		then occur segfault in surface funcs

Change-Id: I2559e7df32196b20f5efe00e46e1bf19ca29e11c
---

diff --git a/src/wsi/surface.c b/src/wsi/surface.c
index b1b0487..5a91849 100644
--- a/src/wsi/surface.c
+++ b/src/wsi/surface.c
@@ -93,10 +93,16 @@ static VkResult
 tdm_get_surface_capabilities(VkIcdSurfaceDisplay		*sfc,
 							 VkSurfaceCapabilitiesKHR	*caps)
 {
-	int32_t			 minw, minh, maxw, maxh;
+	int32_t				 minw, minh, maxw, maxh;
 	tdm_error			 tdm_err;
-	vk_display_mode_t	*disp_mode = (vk_display_mode_t *)(uintptr_t)sfc->displayMode;
-	vk_display_t		*disp = disp_mode->display;
+	vk_display_mode_t	*disp_mode;
+	vk_display_t		*disp;
+
+	disp_mode = (vk_display_mode_t *)(uintptr_t)sfc->displayMode;
+	VK_CHECK(disp_mode, return VK_ERROR_DEVICE_LOST, "not supported display mode");
+
+	disp = disp_mode->display;
+	VK_CHECK(disp, return VK_ERROR_DEVICE_LOST, "not supported display");
 
 	tdm_err = tdm_output_get_available_size(disp->tdm_output, &minw, &minh,
 											&maxw, &maxh, NULL);
@@ -229,8 +235,19 @@ tdm_get_surface_formats(VkIcdSurfaceDisplay	*sfc,
 	uint32_t			 surface_format_count = 0, i;
 	VkSurfaceFormatKHR	 surface_formats[ARRAY_LENGTH(supported_formats)];
 	tdm_error			 tdm_err;
-	vk_display_mode_t	*disp_mode = (vk_display_mode_t *)(uintptr_t)sfc->displayMode;
-	tdm_layer			*layer = disp_mode->display->pdev->planes[sfc->planeIndex].tdm_layer;
+	vk_display_mode_t	*disp_mode;
+	tdm_layer			*layer;
+
+	disp_mode = (vk_display_mode_t *)(uintptr_t)sfc->displayMode;
+	VK_CHECK(disp_mode, return VK_ERROR_DEVICE_LOST, "not supported display mode");
+	VK_CHECK(disp_mode->display && disp_mode->display->pdev,
+			 return VK_ERROR_DEVICE_LOST, "not supported display");
+	VK_CHECK(disp_mode->display->pdev->plane_count > sfc->planeIndex,
+			 return VK_ERROR_DEVICE_LOST, "not supported display plainIndex");
+
+	layer = disp_mode->display->pdev->planes[sfc->planeIndex].tdm_layer;
+	VK_CHECK(disp_mode->display->pdev->plane_count > sfc->planeIndex,
+			 return VK_ERROR_DEVICE_LOST, "tdm_layer is NULL");
 
 	tdm_err = tdm_layer_get_available_formats(layer, &tbm_formats, &tbm_format_count);
 	VK_CHECK(tdm_err == TDM_ERROR_NONE, return VK_ERROR_DEVICE_LOST,