X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Ftdm_display.c;h=0d6e2749fed66fc7ffc799c425eb7f0f14cea4b4;hb=f70d6e1e8c43a47e72c195d171abe893d6629836;hp=4a2d25efc1703a972a62a98e3a6368f68460965d;hpb=079e504c8b39826dbc840df05a3a41bef876ae72;p=platform%2Fcore%2Fuifw%2Flibtdm.git

diff --git a/src/tdm_display.c b/src/tdm_display.c
index 4a2d25e..0d6e274 100644
--- a/src/tdm_display.c
+++ b/src/tdm_display.c
@@ -497,7 +497,7 @@ tdm_output_add_change_handler(tdm_output *output,
 
 	if (!private_output->regist_change_cb) {
 		_pthread_mutex_unlock(&private_display->lock);
-		TDM_DBG("failed: not implemented!!");
+		TDM_ERR("not implemented!!");
 		return TDM_ERROR_NOT_IMPLEMENTED;
 	}
 
@@ -757,7 +757,7 @@ tdm_output_set_property(tdm_output *output, unsigned int id, tdm_value value)
 
 	if (!func_output->output_set_property) {
 		_pthread_mutex_unlock(&private_display->lock);
-		TDM_DBG("failed: not implemented!!");
+		TDM_ERR("not implemented!!");
 		return TDM_ERROR_NOT_IMPLEMENTED;
 	}
 
@@ -783,7 +783,7 @@ tdm_output_get_property(tdm_output *output, unsigned int id, tdm_value *value)
 
 	if (!func_output->output_get_property) {
 		_pthread_mutex_unlock(&private_display->lock);
-		TDM_DBG("failed: not implemented!!");
+		TDM_ERR("not implemented!!");
 		return TDM_ERROR_NOT_IMPLEMENTED;
 	}
 
@@ -918,7 +918,7 @@ tdm_output_wait_vblank(tdm_output *output, int interval, int sync,
 	_pthread_mutex_lock(&private_display->lock);
 
 	if (private_output->current_dpms_value > TDM_OUTPUT_DPMS_ON) {
-		TDM_WRN("output(%d) dpms: %s", private_output->pipe,
+		TDM_ERR("output(%d) dpms: %s", private_output->pipe,
 		        dpms_str(private_output->current_dpms_value));
 		_pthread_mutex_unlock(&private_display->lock);
 		return TDM_ERROR_BAD_REQUEST;
@@ -928,7 +928,7 @@ tdm_output_wait_vblank(tdm_output *output, int interval, int sync,
 
 	if (!func_output->output_wait_vblank) {
 		_pthread_mutex_unlock(&private_display->lock);
-		TDM_DBG("failed: not implemented!!");
+		TDM_ERR("not implemented!!");
 		return TDM_ERROR_NOT_IMPLEMENTED;
 	}
 
@@ -974,7 +974,7 @@ _tdm_output_commit(tdm_output *output, int sync, tdm_output_commit_handler func,
 	func_output = &private_display->func_output;
 
 	if (!func_output->output_commit) {
-		TDM_DBG("failed: not implemented!!");
+		TDM_ERR("not implemented!!");
 		return TDM_ERROR_NOT_IMPLEMENTED;
 	}
 
@@ -1012,7 +1012,7 @@ tdm_output_commit(tdm_output *output, int sync, tdm_output_commit_handler func,
 	_pthread_mutex_lock(&private_display->lock);
 
 	if (private_output->current_dpms_value > TDM_OUTPUT_DPMS_ON) {
-		TDM_WRN("output(%d) dpms: %s", private_output->pipe,
+		TDM_ERR("output(%d) dpms: %s", private_output->pipe,
 		        dpms_str(private_output->current_dpms_value));
 		_pthread_mutex_unlock(&private_display->lock);
 		return TDM_ERROR_BAD_REQUEST;
@@ -1039,7 +1039,7 @@ tdm_output_set_mode(tdm_output *output, const tdm_output_mode *mode)
 
 	if (!func_output->output_set_mode) {
 		_pthread_mutex_unlock(&private_display->lock);
-		TDM_DBG("failed: not implemented!!");
+		TDM_ERR("not implemented!!");
 		return TDM_ERROR_NOT_IMPLEMENTED;
 	}
 
@@ -1064,7 +1064,7 @@ tdm_output_get_mode(tdm_output *output, const tdm_output_mode **mode)
 
 	if (!func_output->output_get_mode) {
 		_pthread_mutex_unlock(&private_display->lock);
-		TDM_DBG("failed: not implemented!!");
+		TDM_ERR("not implemented!!");
 		return TDM_ERROR_NOT_IMPLEMENTED;
 	}
 
@@ -1097,8 +1097,9 @@ tdm_output_set_dpms(tdm_output *output, tdm_output_dpms dpms_value)
 
 	if (!func_output->output_set_dpms) {
 		_pthread_mutex_unlock(&private_display->lock);
-		TDM_DBG("failed: not implemented!!");
-		return TDM_ERROR_NOT_IMPLEMENTED;
+		private_output->current_dpms_value = dpms_value;
+		TDM_WRN("not implemented!!");
+		return TDM_ERROR_NONE;
 	}
 
 	ret = func_output->output_set_dpms(private_output->output_backend, dpms_value);
@@ -1132,9 +1133,10 @@ tdm_output_get_dpms(tdm_output *output, tdm_output_dpms *dpms_value)
 	func_output = &private_display->func_output;
 
 	if (!func_output->output_get_dpms) {
+		*dpms_value = private_output->current_dpms_value;
 		_pthread_mutex_unlock(&private_display->lock);
-		TDM_DBG("failed: not implemented!!");
-		return TDM_ERROR_NOT_IMPLEMENTED;
+		TDM_WRN("not implemented!!");
+		return TDM_ERROR_NONE;
 	}
 
 	ret = func_output->output_get_dpms(private_output->output_backend, dpms_value);
@@ -1279,7 +1281,7 @@ tdm_layer_set_property(tdm_layer *layer, unsigned int id, tdm_value value)
 
 	if (!func_layer->layer_set_property) {
 		_pthread_mutex_unlock(&private_display->lock);
-		TDM_DBG("failed: not implemented!!");
+		TDM_ERR("not implemented!!");
 		return TDM_ERROR_NOT_IMPLEMENTED;
 	}
 
@@ -1304,7 +1306,7 @@ tdm_layer_get_property(tdm_layer *layer, unsigned int id, tdm_value *value)
 
 	if (!func_layer->layer_get_property) {
 		_pthread_mutex_unlock(&private_display->lock);
-		TDM_DBG("failed: not implemented!!");
+		TDM_ERR("not implemented!!");
 		return TDM_ERROR_NOT_IMPLEMENTED;
 	}
 
@@ -1331,7 +1333,7 @@ tdm_layer_set_info(tdm_layer *layer, tdm_info_layer *info)
 
 	if (!func_layer->layer_set_info) {
 		_pthread_mutex_unlock(&private_display->lock);
-		TDM_DBG("failed: not implemented!!");
+		TDM_ERR("not implemented!!");
 		return TDM_ERROR_NOT_IMPLEMENTED;
 	}
 
@@ -1366,7 +1368,7 @@ tdm_layer_get_info(tdm_layer *layer, tdm_info_layer *info)
 
 	if (!func_layer->layer_get_info) {
 		_pthread_mutex_unlock(&private_display->lock);
-		TDM_DBG("failed: not implemented!!");
+		TDM_ERR("not implemented!!");
 		return TDM_ERROR_NOT_IMPLEMENTED;
 	}
 
@@ -1386,20 +1388,21 @@ _tdm_layer_dump_buffer(tdm_layer *layer, tbm_surface_h buffer)
 	int count;
 	unsigned int pipe;
 	int zpos;
+	char fullpath[PATH_MAX];
 	tbm_surface_info_s info;
 	tbm_surface_error_e err;
 
 	path = tdm_helper_get_dump_path();
-	TDM_RETURN_IF_FAIL(path != NULL);
+	if (!path)
+		return;
 
 	count = tdm_helper_get_dump_count();
-	TDM_RETURN_IF_FAIL(count != 0);
+	if (count <= 0)
+		return;
 
 	err = tbm_surface_map(buffer, TBM_SURF_OPTION_READ, &info);
 	TDM_RETURN_IF_FAIL(err == TBM_SURFACE_ERROR_NONE);
 
-	char fullpath[PATH_MAX] = {0, };
-
 	pipe = private_output->pipe;
 	zpos = private_layer->caps.zpos;
 
@@ -1435,7 +1438,7 @@ tdm_layer_set_buffer(tdm_layer *layer, tbm_surface_h buffer)
 
 	if (!func_layer->layer_set_buffer) {
 		_pthread_mutex_unlock(&private_display->lock);
-		TDM_DBG("failed: not implemented!!");
+		TDM_ERR("not implemented!!");
 		return TDM_ERROR_NOT_IMPLEMENTED;
 	}
 
@@ -1443,7 +1446,8 @@ tdm_layer_set_buffer(tdm_layer *layer, tbm_surface_h buffer)
 	TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
 
 	/* dump buffer */
-	_tdm_layer_dump_buffer(layer, buffer);
+	if (tdm_dump_enable)
+		_tdm_layer_dump_buffer(layer, buffer);
 
 	if (ret == TDM_ERROR_NONE) {
 		/* FIXME: should save to pending_buffer first. And after committing
@@ -1502,7 +1506,7 @@ tdm_layer_unset_buffer(tdm_layer *layer)
 
 	if (!func_layer->layer_unset_buffer) {
 		_pthread_mutex_unlock(&private_display->lock);
-		TDM_DBG("failed: not implemented!!");
+		TDM_ERR("not implemented!!");
 		return TDM_ERROR_NOT_IMPLEMENTED;
 	}
 
@@ -1605,7 +1609,7 @@ tdm_layer_set_buffer_queue(tdm_layer *layer, tbm_surface_queue_h buffer_queue)
 
 	if (!func_layer->layer_set_buffer) {
 		_pthread_mutex_unlock(&private_display->lock);
-		TDM_DBG("failed: not implemented!!");
+		TDM_ERR("not implemented!!");
 		return TDM_ERROR_NOT_IMPLEMENTED;
 	}
 
@@ -1682,7 +1686,7 @@ tdm_layer_unset_buffer_queue(tdm_layer *layer)
 
 	if (!func_layer->layer_unset_buffer) {
 		_pthread_mutex_unlock(&private_display->lock);
-		TDM_DBG("failed: not implemented!!");
+		TDM_ERR("not implemented!!");
 		return TDM_ERROR_NOT_IMPLEMENTED;
 	}
 
@@ -1727,7 +1731,7 @@ tdm_layer_set_video_pos(tdm_layer *layer, int zpos)
 
 	if (!func_layer->layer_set_video_pos) {
 		_pthread_mutex_unlock(&private_display->lock);
-		TDM_DBG("failed: not implemented!!");
+		TDM_ERR("not implemented!!");
 		return TDM_ERROR_NOT_IMPLEMENTED;
 	}