X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Ftdm_layer.c;h=0885abbba102335552b673ff55817d9c32e97d7f;hb=0941cfe10233193d1ba97b321fadc7badd93eaff;hp=93fe90c953ba79595557c3a8378e1b2db67a7cb3;hpb=c207a7469c409c109bb1b0e47fb3eb7d2ab0327a;p=platform%2Fcore%2Fuifw%2Flibtdm.git diff --git a/src/tdm_layer.c b/src/tdm_layer.c index 93fe90c..0885abb 100644 --- a/src/tdm_layer.c +++ b/src/tdm_layer.c @@ -9,7 +9,7 @@ * Taeheon Kim , * YoungJun Cho , * SooChan Lim , - * Boram Park + * Boram Park * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the @@ -195,7 +195,7 @@ tdm_layer_set_property(tdm_layer *layer, unsigned int id, tdm_value value) func_layer = &private_module->func_layer; if (private_layer->usable) - TDM_INFO("layer(%p,%d) not usable", private_layer, private_layer->caps.zpos); + TDM_INFO("layer(%p,%d) not usable", private_layer, private_layer->index); private_layer->usable = 0; @@ -254,7 +254,7 @@ tdm_layer_set_info_internal(tdm_private_layer *private_layer, tdm_info_layer *in func_layer = &private_module->func_layer; if (private_layer->usable) - TDM_INFO("layer(%p,%d) not usable", private_layer, private_layer->caps.zpos); + TDM_INFO("layer(%p,%d) not usable", private_layer, private_layer->index); private_layer->usable = 0; @@ -271,7 +271,7 @@ tdm_layer_set_info_internal(tdm_private_layer *private_layer, tdm_info_layer *in snprintf(fmtstr, 128, "NONE"); 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->caps.zpos, + 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, @@ -401,7 +401,7 @@ _tdm_layer_free_all_buffers(tdm_private_layer *private_layer) if (tdm_debug_module & TDM_DEBUG_BUFFER) TDM_INFO("layer(%p,%d) waiting_buffer(%p)", - private_layer, private_layer->caps.zpos, private_layer->waiting_buffer); + private_layer, private_layer->index, private_layer->waiting_buffer); } if (private_layer->committed_buffer) { @@ -410,7 +410,7 @@ _tdm_layer_free_all_buffers(tdm_private_layer *private_layer) if (tdm_debug_module & TDM_DEBUG_BUFFER) TDM_INFO("layer(%p,%d) committed_buffer(%p)", - private_layer, private_layer->caps.zpos, private_layer->committed_buffer); + private_layer, private_layer->index, private_layer->committed_buffer); } if (private_layer->showing_buffer) { @@ -419,7 +419,7 @@ _tdm_layer_free_all_buffers(tdm_private_layer *private_layer) if (tdm_debug_module & TDM_DEBUG_BUFFER) TDM_INFO("layer(%p,%d) showing_buffer(%p)", - private_layer, private_layer->caps.zpos, private_layer->showing_buffer); + private_layer, private_layer->index, private_layer->showing_buffer); } LIST_FOR_EACH_ENTRY_SAFE(lm, lmm, &private_output->layer_commit_handler_list, link) { @@ -482,7 +482,7 @@ tdm_layer_set_buffer_internal(tdm_private_layer *private_layer, tbm_surface_h bu func_layer = &private_module->func_layer; if (private_layer->usable) - TDM_INFO("layer(%p,%d) not usable", private_layer, private_layer->caps.zpos); + TDM_INFO("layer(%p,%d) not usable", private_layer, private_layer->index); private_layer->usable = 0; @@ -499,7 +499,7 @@ tdm_layer_set_buffer_internal(tdm_private_layer *private_layer, tbm_surface_h bu if (tdm_debug_module & TDM_DEBUG_BUFFER) TDM_INFO("layer(%p,%d) pending_buffer(%p) skipped", - private_layer, private_layer->caps.zpos, private_layer->pending_buffer); + 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); @@ -512,9 +512,12 @@ tdm_layer_set_buffer_internal(tdm_private_layer *private_layer, tbm_surface_h bu tbm_surface_internal_ref(buffer); private_layer->pending_buffer = buffer; - if (tdm_debug_module & TDM_DEBUG_BUFFER) - TDM_INFO("layer(%p,%d) pending_buffer(%p)", - private_layer, private_layer->caps.zpos, 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); @@ -555,7 +558,7 @@ tdm_layer_unset_buffer_internal(tdm_private_layer *private_layer) private_layer->usable = 1; if (private_layer->usable) - TDM_INFO("layer(%p,%d) now usable", private_layer, private_layer->caps.zpos); + TDM_INFO("layer(%p,%d) now usable", private_layer, private_layer->index); if (!func_layer->layer_unset_buffer) { /* LCOV_EXCL_START */ @@ -598,7 +601,7 @@ tdm_layer_committed(tdm_private_layer *private_layer, tdm_private_layer_buffer * private_layer->fps_stamp = curr; } else if ((curr - private_layer->fps_stamp) > 1.0) { TDM_INFO("output(%d) layer(%p,%d) fps: %d", - private_output->index, private_layer, private_layer->caps.zpos, private_layer->fps_count); + private_output->index, private_layer, private_layer->index, private_layer->fps_count); private_layer->fps_count = 0; private_layer->fps_stamp = curr; } else @@ -623,7 +626,7 @@ tdm_layer_committed(tdm_private_layer *private_layer, tdm_private_layer_buffer * if (tdm_debug_module & TDM_DEBUG_BUFFER) TDM_INFO("layer(%p,%d) committed_buffer(%p) showing_buffer(%p)", - private_layer, private_layer->caps.zpos, *committed_buffer, + private_layer, private_layer->index, *committed_buffer, (private_layer->showing_buffer) ? private_layer->showing_buffer->buffer : NULL); } @@ -658,7 +661,7 @@ _tdm_layer_got_output_vblank(tdm_private_output *private_output, unsigned int se LIST_FOR_EACH_ENTRY_SAFE(lm, lmm, &clone_list, link) { if (tdm_debug_module & TDM_DEBUG_COMMIT) TDM_INFO("layer(%p,%d) committed. handle(%p) commited_buffer(%p)", - lm->private_layer, lm->private_layer->caps.zpos, lm, (lm->committed_buffer) ? lm->committed_buffer->buffer : NULL); + 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); @@ -761,7 +764,7 @@ _tdm_layer_cb_output_commit(tdm_output *output, unsigned int sequence, if (tdm_debug_module & TDM_DEBUG_COMMIT) TDM_INFO("layer(%p,%d) commit: output(%d) committed. handle(%p)", - private_layer, private_layer->caps.zpos, private_output->pipe, layer_commit_handler); + private_layer, private_layer->index, private_output->pipe, layer_commit_handler); _pthread_mutex_lock(&private_display->lock); @@ -801,7 +804,7 @@ _tdm_layer_cb_wait_vblank(tdm_vblank *vblank, tdm_error error, unsigned int sequ } static unsigned int -_tdm_lauer_get_output_used_layer_count(tdm_private_output *private_output) +_tdm_layer_get_output_used_layer_count(tdm_private_output *private_output) { tdm_private_layer *private_layer = NULL; unsigned int count = 0; @@ -833,19 +836,19 @@ _tdm_layer_commit_possible(tdm_private_layer *private_layer) if (!LIST_IS_EMPTY(&private_output->layer_commit_handler_list)) { if (tdm_debug_module & TDM_DEBUG_COMMIT) TDM_INFO("layer(%p,%d) commit: not possible(previous commit)", - private_layer, private_layer->caps.zpos); + 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 (private_output->commit_per_vblank == 1 && _tdm_layer_get_output_used_layer_count(private_output) > 1) { if (tdm_debug_module & TDM_DEBUG_COMMIT) TDM_INFO("layer(%p,%d) commit: not possible(more than 2 layers)", - private_layer, private_layer->caps.zpos); + private_layer, private_layer->index); return 0; } if (tdm_debug_module & TDM_DEBUG_COMMIT) - TDM_INFO("layer(%p,%d) commit: possible", private_layer, private_layer->caps.zpos); + TDM_INFO("layer(%p,%d) commit: possible", private_layer, private_layer->index); return 1; } @@ -891,7 +894,7 @@ tdm_layer_commit_pending_data(tdm_private_layer *private_layer) if (tdm_debug_module & TDM_DEBUG_BUFFER) TDM_INFO("layer(%p,%d) pending_buffer(%p) committed", - private_layer, private_layer->caps.zpos, private_layer->pending_buffer); + private_layer, private_layer->index, private_layer->pending_buffer); if (ret == TDM_ERROR_NONE) { if (private_layer->waiting_buffer) @@ -901,7 +904,7 @@ tdm_layer_commit_pending_data(tdm_private_layer *private_layer) private_layer->waiting_buffer->buffer = tdm_buffer_ref_backend(private_layer->pending_buffer); if (tdm_debug_module & TDM_DEBUG_BUFFER) TDM_INFO("layer(%p,%d) waiting_buffer(%p)", - private_layer, private_layer->caps.zpos, private_layer->waiting_buffer->buffer); + private_layer, private_layer->index, private_layer->waiting_buffer->buffer); } else tdm_layer_free_buffer(private_layer, layer_buffer); } @@ -931,7 +934,7 @@ _tdm_layer_commit(tdm_layer *layer, tdm_layer_commit_handler func, void *user_da } if (tdm_debug_module & TDM_DEBUG_COMMIT) - TDM_INFO("layer(%p,%d) commit: handle(%p)", private_layer, private_layer->caps.zpos, 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; @@ -941,14 +944,17 @@ _tdm_layer_commit(tdm_layer *layer, tdm_layer_commit_handler func, void *user_da 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(%p,%d) too many commit", private_layer, private_layer->caps.zpos); + 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,%d) waiting_buffer(%p) committed_buffer(%p)", - private_layer, private_layer->caps.zpos, private_layer->waiting_buffer, + 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) { @@ -959,7 +965,7 @@ _tdm_layer_commit(tdm_layer *layer, tdm_layer_commit_handler func, void *user_da TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, commit_failed); if (tdm_debug_module & TDM_DEBUG_COMMIT) - TDM_INFO("layer(%p,%d) commit: no commit-per-vblank", private_layer, private_layer->caps.zpos); + 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); @@ -970,13 +976,13 @@ _tdm_layer_commit(tdm_layer *layer, tdm_layer_commit_handler func, void *user_da TDM_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, commit_failed); if (tdm_debug_module & TDM_DEBUG_COMMIT) - TDM_INFO("layer(%p,%d) commit: output", private_layer, private_layer->caps.zpos); + 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,%d) commit: pending", private_layer, private_layer->caps.zpos); + TDM_INFO("layer(%p,%d) commit: pending", private_layer, private_layer->index); } if (!private_output->vblank) { @@ -996,7 +1002,7 @@ _tdm_layer_commit(tdm_layer *layer, tdm_layer_commit_handler func, void *user_da private_output->layer_waiting_vblank = 1; if (tdm_debug_module & TDM_DEBUG_COMMIT) - TDM_INFO("layer(%p,%d) commit: wait vblank", private_layer, private_layer->caps.zpos); + TDM_INFO("layer(%p,%d) commit: wait vblank", private_layer, private_layer->index); } } @@ -1025,7 +1031,7 @@ tdm_layer_commit_internal(tdm_private_layer *private_layer, tdm_layer_commit_han } if (TDM_OUTPUT_DPMS_VSYNC_IS_OFF(private_output->current_dpms_value)) { - TDM_ERR("layer(%p,%d)'s output(%d) dpms: %s", private_layer, private_layer->caps.zpos, 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; } @@ -1033,7 +1039,7 @@ tdm_layer_commit_internal(tdm_private_layer *private_layer, tdm_layer_commit_han /* 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,%d) committing pending data failed", private_layer, private_layer->caps.zpos); + TDM_ERR("layer(%p,%d) committing pending data failed", private_layer, private_layer->index); return ret; } @@ -1135,7 +1141,7 @@ tdm_layer_get_displaying_buffer(tdm_layer *layer, tdm_error *error) buffer = private_layer->showing_buffer->buffer; } else { _pthread_mutex_unlock(&private_display->lock); - TDM_DBG("layer(%p,%d) showing_buffer is null", private_layer, private_layer->caps.zpos); + TDM_DBG("layer(%p,%d) showing_buffer is null", private_layer, private_layer->index); return NULL; } _pthread_mutex_unlock(&private_display->lock); @@ -1169,7 +1175,7 @@ _tbm_layer_queue_acquirable_cb(tbm_surface_queue_h surface_queue, void *data) buffer == NULL) { /* LCOV_EXCL_START */ TDM_ERR("layer(%p,%d) tbm_surface_queue_acquire() failed surface:%p", - private_layer, private_layer->caps.zpos, buffer); + private_layer, private_layer->index, buffer); _pthread_mutex_unlock(&private_display->lock); return; /* LCOV_EXCL_STOP */ @@ -1224,7 +1230,7 @@ tdm_layer_set_buffer_queue(tdm_layer *layer, tbm_surface_queue_h buffer_queue) func_layer = &private_module->func_layer; if (private_layer->usable) - TDM_INFO("layer(%p,%d) not usable", private_layer, private_layer->caps.zpos); + TDM_INFO("layer(%p,%d) not usable", private_layer, private_layer->index); private_layer->usable = 0; @@ -1247,7 +1253,7 @@ tdm_layer_set_buffer_queue(tdm_layer *layer, tbm_surface_queue_h buffer_queue) if (tdm_debug_module & TDM_DEBUG_BUFFER) TDM_INFO("layer(%p,%d) waiting_buffer(%p)", - private_layer, private_layer->caps.zpos, private_layer->waiting_buffer); + private_layer, private_layer->index, private_layer->waiting_buffer); } private_layer->buffer_queue = buffer_queue; @@ -1297,7 +1303,7 @@ tdm_layer_set_video_pos(tdm_layer *layer, int zpos) func_layer = &private_module->func_layer; if (!(private_layer->caps.capabilities & TDM_LAYER_CAPABILITY_VIDEO)) { - TDM_ERR("layer(%p,%d) is not video layer", private_layer, private_layer->caps.zpos); + 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; } @@ -1305,7 +1311,7 @@ tdm_layer_set_video_pos(tdm_layer *layer, int zpos) if (!func_layer->layer_set_video_pos) { /* LCOV_EXCL_START */ _pthread_mutex_unlock(&private_display->lock); - TDM_ERR("layer(%p,%d) not implemented!!", private_layer, private_layer->caps.zpos); + TDM_ERR("layer(%p,%d) not implemented!!", private_layer, private_layer->index); return TDM_ERROR_NOT_IMPLEMENTED; /* LCOV_EXCL_STOP */ }