* 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
}
EXTERN tdm_error
+tdm_layer_get_index(tdm_layer *layer, int *index)
+{
+ LAYER_FUNC_ENTRY();
+
+ TDM_RETURN_VAL_IF_FAIL(index != NULL, TDM_ERROR_INVALID_PARAMETER);
+
+ _pthread_mutex_lock(&private_display->lock);
+
+ *index = private_layer->index;
+
+ _pthread_mutex_unlock(&private_display->lock);
+
+ return ret;
+}
+
+EXTERN tdm_error
tdm_layer_get_capabilities(tdm_layer *layer, tdm_layer_capability *capabilities)
{
LAYER_FUNC_ENTRY();
func_layer = &private_module->func_layer;
if (private_layer->usable)
- TDM_INFO("layer(%d) not usable", private_layer->index);
+ TDM_INFO("layer(%p,%d) not usable", private_layer, private_layer->index);
private_layer->usable = 0;
func_layer = &private_module->func_layer;
if (private_layer->usable)
- TDM_INFO("layer(%p) not usable", private_layer);
+ TDM_INFO("layer(%p,%d) not usable", private_layer, private_layer->index);
private_layer->usable = 0;
else
snprintf(fmtstr, 128, "NONE");
- TDM_INFO("layer(%p) info: src(%ux%u %u,%u %ux%u %s) dst(%u,%u %ux%u) trans(%d)",
- private_layer, info->src_config.size.h, info->src_config.size.v,
+ TDM_INFO("layer(%p,%d) info: src(%ux%u %u,%u %ux%u %s) dst(%u,%u %ux%u) trans(%d)",
+ private_layer, private_layer->index,
+ info->src_config.size.h, info->src_config.size.v,
info->src_config.pos.x, info->src_config.pos.y,
info->src_config.pos.w, info->src_config.pos.h,
fmtstr,
private_layer->waiting_buffer = NULL;
if (tdm_debug_module & TDM_DEBUG_BUFFER)
- TDM_INFO("layer(%p) waiting_buffer(%p)",
- private_layer, private_layer->waiting_buffer);
+ TDM_INFO("layer(%p,%d) waiting_buffer(%p)",
+ private_layer, private_layer->index, private_layer->waiting_buffer);
}
if (private_layer->committed_buffer) {
private_layer->committed_buffer = NULL;
if (tdm_debug_module & TDM_DEBUG_BUFFER)
- TDM_INFO("layer(%p) committed_buffer(%p)",
- private_layer, private_layer->committed_buffer);
+ TDM_INFO("layer(%p,%d) committed_buffer(%p)",
+ private_layer, private_layer->index, private_layer->committed_buffer);
}
if (private_layer->showing_buffer) {
private_layer->showing_buffer = NULL;
if (tdm_debug_module & TDM_DEBUG_BUFFER)
- TDM_INFO("layer(%p) showing_buffer(%p)",
- private_layer, private_layer->showing_buffer);
+ TDM_INFO("layer(%p,%d) showing_buffer(%p)",
+ private_layer, private_layer->index, private_layer->showing_buffer);
}
LIST_FOR_EACH_ENTRY_SAFE(lm, lmm, &private_output->layer_commit_handler_list, link) {
func_layer = &private_module->func_layer;
if (private_layer->usable)
- TDM_INFO("layer(%p) not usable", private_layer);
+ TDM_INFO("layer(%p,%d) not usable", private_layer, private_layer->index);
private_layer->usable = 0;
if (private_layer->pending_buffer) {
if (tdm_debug_module & TDM_DEBUG_BUFFER)
- TDM_INFO("layer(%p) pending_buffer(%p) skipped",
- private_layer, private_layer->pending_buffer);
+ TDM_INFO("layer(%p,%d) pending_buffer(%p) skipped",
+ private_layer, private_layer->index, private_layer->pending_buffer);
if (tdm_ttrace_module & TDM_TTRACE_LAYER) {
tbm_bo bo = tbm_surface_internal_get_bo(private_layer->pending_buffer, 0);
tbm_surface_internal_ref(buffer);
private_layer->pending_buffer = buffer;
- if (tdm_debug_module & TDM_DEBUG_BUFFER)
- TDM_INFO("layer(%p) pending_buffer(%p)",
- private_layer, private_layer->pending_buffer);
+ if (tdm_debug_module & TDM_DEBUG_BUFFER) {
+ tbm_bo bo = tbm_surface_internal_get_bo(private_layer->pending_buffer, 0);
+ int flags = tbm_bo_get_flags(bo);
+ TDM_INFO("layer(%p,%d) pending_buffer(%p) bo_flags(%x)",
+ private_layer, private_layer->index, private_layer->pending_buffer, flags);
+ }
if (tdm_ttrace_module & TDM_TTRACE_LAYER) {
tbm_bo bo = tbm_surface_internal_get_bo(private_layer->pending_buffer, 0);
private_layer->usable = 1;
if (private_layer->usable)
- TDM_INFO("layer(%p) now usable", private_layer);
+ TDM_INFO("layer(%p,%d) now usable", private_layer, private_layer->index);
if (!func_layer->layer_unset_buffer) {
/* LCOV_EXCL_START */
if (private_layer->fps_stamp == 0) {
private_layer->fps_stamp = curr;
} else if ((curr - private_layer->fps_stamp) > 1.0) {
- TDM_INFO("output(%d) layer(%d) fps: %d", private_output->index, private_layer->index, private_layer->fps_count);
+ TDM_INFO("output(%d) layer(%p,%d) fps: %d",
+ private_output->index, private_layer, private_layer->index, private_layer->fps_count);
private_layer->fps_count = 0;
private_layer->fps_stamp = curr;
} else
*committed_buffer = NULL;
if (tdm_debug_module & TDM_DEBUG_BUFFER)
- TDM_INFO("layer(%p) committed_buffer(%p) showing_buffer(%p)",
- private_layer, *committed_buffer,
+ TDM_INFO("layer(%p,%d) committed_buffer(%p) showing_buffer(%p)",
+ private_layer, private_layer->index, *committed_buffer,
(private_layer->showing_buffer) ? private_layer->showing_buffer->buffer : NULL);
}
LIST_FOR_EACH_ENTRY_SAFE(lm, lmm, &clone_list, link) {
if (tdm_debug_module & TDM_DEBUG_COMMIT)
- TDM_INFO("layer(%p) committed. handle(%p) commited_buffer(%p)",
- lm->private_layer, lm, (lm->committed_buffer) ? lm->committed_buffer->buffer : NULL);
+ TDM_INFO("layer(%p,%d) committed. handle(%p) commited_buffer(%p)",
+ lm->private_layer, lm->private_layer->index, lm, (lm->committed_buffer) ? lm->committed_buffer->buffer : NULL);
LIST_DEL(&lm->link);
tdm_layer_committed(lm->private_layer, &lm->committed_buffer);
private_layer->committing = 0;
if (tdm_debug_module & TDM_DEBUG_COMMIT)
- TDM_INFO("layer(%p) commit: output(%d) committed. handle(%p)",
- private_layer, private_output->pipe, layer_commit_handler);
+ TDM_INFO("layer(%p,%d) commit: output(%d) committed. handle(%p)",
+ private_layer, private_layer->index, private_output->pipe, layer_commit_handler);
_pthread_mutex_lock(&private_display->lock);
*/
if (!LIST_IS_EMPTY(&private_output->layer_commit_handler_list)) {
if (tdm_debug_module & TDM_DEBUG_COMMIT)
- TDM_INFO("layer(%p) commit: not possible(previous commit)", private_layer);
+ TDM_INFO("layer(%p,%d) commit: not possible(previous commit)",
+ private_layer, private_layer->index);
return 0;
}
if (private_output->commit_per_vblank == 1 && _tdm_lauer_get_output_used_layer_count(private_output) > 1) {
if (tdm_debug_module & TDM_DEBUG_COMMIT)
- TDM_INFO("layer(%p) commit: not possible(more than 2 layers)", private_layer);
+ TDM_INFO("layer(%p,%d) commit: not possible(more than 2 layers)",
+ private_layer, private_layer->index);
return 0;
}
if (tdm_debug_module & TDM_DEBUG_COMMIT)
- TDM_INFO("layer(%p) commit: possible", private_layer);
+ TDM_INFO("layer(%p,%d) commit: possible", private_layer, private_layer->index);
return 1;
}
TDM_WARNING_IF_FAIL(ret == TDM_ERROR_NONE);
if (tdm_debug_module & TDM_DEBUG_BUFFER)
- TDM_INFO("layer(%p) pending_buffer(%p) committed",
- private_layer, private_layer->pending_buffer);
+ TDM_INFO("layer(%p,%d) pending_buffer(%p) committed",
+ private_layer, private_layer->index, private_layer->pending_buffer);
if (ret == TDM_ERROR_NONE) {
if (private_layer->waiting_buffer)
private_layer->waiting_buffer = layer_buffer;
private_layer->waiting_buffer->buffer = tdm_buffer_ref_backend(private_layer->pending_buffer);
if (tdm_debug_module & TDM_DEBUG_BUFFER)
- TDM_INFO("layer(%p) waiting_buffer(%p)",
- private_layer, private_layer->waiting_buffer->buffer);
+ TDM_INFO("layer(%p,%d) waiting_buffer(%p)",
+ private_layer, private_layer->index, private_layer->waiting_buffer->buffer);
} else
tdm_layer_free_buffer(private_layer, layer_buffer);
}
}
if (tdm_debug_module & TDM_DEBUG_COMMIT)
- TDM_INFO("layer(%p) commit: handle(%p)", private_layer, layer_commit_handler);
+ TDM_INFO("layer(%p,%d) commit: handle(%p)", private_layer, private_layer->index, layer_commit_handler);
LIST_INITHEAD(&layer_commit_handler->link);
layer_commit_handler->private_layer = private_layer;
layer_commit_handler->committed_buffer = private_layer->waiting_buffer;
private_layer->waiting_buffer = NULL;
+ if (!private_layer->committing && layer_commit_handler->committed_buffer)
+ private_layer->commiting_buffer = layer_commit_handler->committed_buffer->buffer;
+
if (private_layer->committing)
- TDM_WRN("layer(%d) too many commit", private_layer->index);
+ TDM_WRN("layer(%p,%d) too many commit", private_layer, private_layer->index);
else
private_layer->committing = 1;
if (tdm_debug_module & TDM_DEBUG_BUFFER)
- TDM_INFO("layer(%p) waiting_buffer(%p) committed_buffer(%p)",
- private_layer, private_layer->waiting_buffer,
+ TDM_INFO("layer(%p,%d) waiting_buffer(%p) committed_buffer(%p)",
+ private_layer, private_layer->index, private_layer->waiting_buffer,
(layer_commit_handler->committed_buffer) ? layer_commit_handler->committed_buffer->buffer : NULL);
if (!private_output->commit_per_vblank) {
TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, commit_failed);
if (tdm_debug_module & TDM_DEBUG_COMMIT)
- TDM_INFO("layer(%p) commit: no commit-per-vblank", private_layer);
+ TDM_INFO("layer(%p,%d) commit: no commit-per-vblank", private_layer, private_layer->index);
} else {
TDM_GOTO_IF_FAIL(private_output->commit_type == TDM_COMMIT_TYPE_LAYER, commit_failed);
TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, commit_failed);
if (tdm_debug_module & TDM_DEBUG_COMMIT)
- TDM_INFO("layer(%p) commit: output", private_layer);
+ TDM_INFO("layer(%p,%d) commit: output", private_layer, private_layer->index);
} else {
/* add to pending_commit_handler_list. It will be commited when a vblank occurs */
LIST_ADDTAIL(&layer_commit_handler->link, &private_output->pending_commit_handler_list);
if (tdm_debug_module & TDM_DEBUG_COMMIT)
- TDM_INFO("layer(%p) commit: pending", private_layer);
+ TDM_INFO("layer(%p,%d) commit: pending", private_layer, private_layer->index);
}
if (!private_output->vblank) {
private_output->layer_waiting_vblank = 1;
if (tdm_debug_module & TDM_DEBUG_COMMIT)
- TDM_INFO("layer(%p) commit: wait vblank", private_layer);
+ TDM_INFO("layer(%p,%d) commit: wait vblank", private_layer, private_layer->index);
}
}
}
if (TDM_OUTPUT_DPMS_VSYNC_IS_OFF(private_output->current_dpms_value)) {
- TDM_ERR("layer(%p)'s output(%d) dpms: %s", private_layer, private_output->pipe,
+ TDM_ERR("layer(%p,%d)'s output(%d) dpms: %s", private_layer, private_layer->index, private_output->pipe,
tdm_dpms_str(private_output->current_dpms_value));
return TDM_ERROR_DPMS_OFF;
}
/* don't call this inside of _tdm_layer_commit */
ret = tdm_layer_commit_pending_data(private_layer);
if (ret != TDM_ERROR_NONE) {
- TDM_ERR("layer(%p) committing pending data failed", private_layer);
+ TDM_ERR("layer(%p,%d) committing pending data failed", private_layer, private_layer->index);
return ret;
}
buffer = private_layer->showing_buffer->buffer;
} else {
_pthread_mutex_unlock(&private_display->lock);
- TDM_DBG("layer(%p) showing_buffer is null", private_layer);
+ TDM_DBG("layer(%p,%d) showing_buffer is null", private_layer, private_layer->index);
return NULL;
}
_pthread_mutex_unlock(&private_display->lock);
if (TBM_SURFACE_QUEUE_ERROR_NONE != tbm_surface_queue_acquire(private_layer->buffer_queue, &buffer) ||
buffer == NULL) {
/* LCOV_EXCL_START */
- TDM_ERR("layer(%p) tbm_surface_queue_acquire() failed surface:%p",
- private_layer, buffer);
+ TDM_ERR("layer(%p,%d) tbm_surface_queue_acquire() failed surface:%p",
+ private_layer, private_layer->index, buffer);
_pthread_mutex_unlock(&private_display->lock);
return;
/* LCOV_EXCL_STOP */
func_layer = &private_module->func_layer;
if (private_layer->usable)
- TDM_INFO("layer(%p) not usable", private_layer);
+ TDM_INFO("layer(%p,%d) not usable", private_layer, private_layer->index);
private_layer->usable = 0;
private_layer->waiting_buffer = NULL;
if (tdm_debug_module & TDM_DEBUG_BUFFER)
- TDM_INFO("layer(%p) waiting_buffer(%p)",
- private_layer, private_layer->waiting_buffer);
+ TDM_INFO("layer(%p,%d) waiting_buffer(%p)",
+ private_layer, private_layer->index, private_layer->waiting_buffer);
}
private_layer->buffer_queue = buffer_queue;
return ret;
}
+tdm_error
+tdm_layer_get_own_buffer_queue(tdm_layer *layer, tbm_surface_queue_h *buffer_queue)
+{
+ LAYER_FUNC_ENTRY();
+
+ TDM_RETURN_VAL_IF_FAIL(buffer_queue != NULL, TDM_ERROR_INVALID_PARAMETER);
+
+ _pthread_mutex_lock(&private_display->lock);
+
+ _pthread_mutex_unlock(&private_display->lock);
+
+ return ret;
+}
+
EXTERN tdm_error
tdm_layer_unset_buffer_queue(tdm_layer *layer)
{
func_layer = &private_module->func_layer;
if (!(private_layer->caps.capabilities & TDM_LAYER_CAPABILITY_VIDEO)) {
- TDM_ERR("layer(%p) is not video layer", private_layer);
+ TDM_ERR("layer(%p,%d) is not video layer", private_layer, private_layer->index);
_pthread_mutex_unlock(&private_display->lock);
return TDM_ERROR_BAD_REQUEST;
}
if (!func_layer->layer_set_video_pos) {
/* LCOV_EXCL_START */
_pthread_mutex_unlock(&private_display->lock);
- TDM_ERR("not implemented!!");
+ TDM_ERR("layer(%p,%d) not implemented!!", private_layer, private_layer->index);
return TDM_ERROR_NOT_IMPLEMENTED;
/* LCOV_EXCL_STOP */
}