* Taeheon Kim <th908.kim@samsung.com>,
* YoungJun Cho <yj44.cho@samsung.com>,
* SooChan Lim <sc1.lim@samsung.com>,
- * Boram Park <sc1.lim@samsung.com>
+ * Boram Park <boram1288.park@samsung.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
tdm_private_display *private_display; \
tdm_private_output *private_output; \
tdm_error ret = TDM_ERROR_NONE; /* default TDM_ERROR_NONE */\
- TDM_RETURN_VAL_IF_FAIL(tdm_output_is_valid(output), TDM_ERROR_INVALID_PARAMETER); \
+ TDM_RETURN_VAL_IF_FAIL(output != NULL, TDM_ERROR_INVALID_PARAMETER); \
private_output = (tdm_private_output*)output; \
private_display = private_output->private_display
tdm_private_display *private_display; \
tdm_private_output *private_output; \
tdm_error ret = TDM_ERROR_NONE; /* default TDM_ERROR_NONE */\
- TDM_RETURN_VAL_IF_FAIL_WITH_ERROR(tdm_output_is_valid(output), TDM_ERROR_INVALID_PARAMETER, NULL); \
+ TDM_RETURN_VAL_IF_FAIL_WITH_ERROR(output != NULL, TDM_ERROR_INVALID_PARAMETER, NULL); \
private_output = (tdm_private_output*)output; \
private_display = private_output->private_display
_tdm_output_call_thread_cb_status(tdm_private_output *private_output, tdm_output_conn_status status)
{
tdm_thread_cb_output_status output_status;
+ pid_t caller_tid = syscall(SYS_gettid);
tdm_error ret;
memset(&output_status, 0, sizeof output_status);
output_status.base.length = sizeof output_status;
output_status.base.object_stamp = private_output->stamp;
output_status.base.data = NULL;
- output_status.base.sync = 1;
+ if (tdm_thread_in_display_thread(caller_tid))
+ output_status.base.sync = 0;
+ else
+ output_status.base.sync = 1;
output_status.status = status;
- ret = tdm_thread_cb_call(private_output, &output_status.base);
+ ret = tdm_thread_cb_call(private_output, &output_status.base, 1);
TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
return TDM_ERROR_NONE;
output_dpms.base.sync = 0;
output_dpms.dpms = dpms;
- ret = tdm_thread_cb_call(private_output, &output_dpms.base);
+ ret = tdm_thread_cb_call(private_output, &output_dpms.base, 1);
TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
return TDM_ERROR_NONE;
tdm_private_output *private_output;
tdm_private_output_change_handler *change_handler = NULL, *hh = NULL;
- TDM_RETURN_IF_FAIL(tdm_output_is_valid(output));
+ TDM_RETURN_IF_FAIL(output != NULL);
TDM_RETURN_IF_FAIL(func != NULL);
private_output = (tdm_private_output*)output;
if (tdm_debug_module & TDM_DEBUG_COMMIT)
TDM_INFO("output(%d) wait_vblank: handler(%p)", vblank_handler->private_output->pipe, vblank_handler);
- ret = tdm_thread_cb_call(vblank_handler->private_output, &output_vblank.base);
+ ret = tdm_thread_cb_call(vblank_handler->private_output, &output_vblank.base, 1);
TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
}
output_commit.tv_sec = tv_sec;
output_commit.tv_usec = tv_usec;
- ret = tdm_thread_cb_call(private_output, &output_commit.base);
+ ret = tdm_thread_cb_call(private_output, &output_commit.base, 1);
TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
}
tdm_output_dpms dpms_value = TDM_OUTPUT_DPMS_ON;
tdm_error ret = TDM_ERROR_NONE;
- TDM_RETURN_VAL_IF_FAIL(tdm_output_is_valid(output), TDM_ERROR_INVALID_PARAMETER);
+ TDM_RETURN_VAL_IF_FAIL(output != NULL, TDM_ERROR_INVALID_PARAMETER);
private_output = (tdm_private_output*)output;
private_module = private_output->private_module;
if (!private_layer->waiting_buffer)
continue;
- if (private_layer->committed_buffer)
+ if (private_layer->committed_buffer) {
tdm_layer_free_buffer(private_layer, private_layer->committed_buffer);
+ private_layer->committed_buffer = NULL;
+ if (tdm_debug_module & TDM_DEBUG_BUFFER)
+ TDM_INFO("layer(%p) waiting_buffer(%p) committed_buffer(%p)",
+ private_layer, private_layer->waiting_buffer->buffer,
+ private_layer->committed_buffer);
+ }
private_layer->committed_buffer = private_layer->waiting_buffer;
private_layer->waiting_buffer = NULL;
if (private_output->current_dpms_value != dpms_value) {
private_output->current_dpms_value = dpms_value;
_tdm_output_call_thread_cb_dpms(private_output, dpms_value);
- TDM_INFO("output(%d) dpms '%s' done", private_output->pipe, tdm_dpms_str(dpms_value));
}
+ TDM_INFO("output(%d) dpms '%s' done", private_output->pipe, tdm_dpms_str(dpms_value));
} else {
tdm_output_dpms temp = TDM_OUTPUT_DPMS_OFF;
tdm_func_output *func_output;
tdm_error ret = TDM_ERROR_NONE;
- TDM_RETURN_VAL_IF_FAIL(tdm_output_is_valid(output), TDM_ERROR_INVALID_PARAMETER);
+ TDM_RETURN_VAL_IF_FAIL(output != NULL, TDM_ERROR_INVALID_PARAMETER);
private_output = (tdm_private_output*)output;
ev.base.data = NULL;
ev.base.sync = 0;
- ret = tdm_thread_cb_call(private_output, &ev.base);
+ ret = tdm_thread_cb_call(private_output, &ev.base, 1);
TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
TDM_INFO("tdm-thread: get a 'need to revalidate' event for the ouptut:%p.", private_output);