layer: add more debugging log

Change-Id: Ib2b40f60ce6f0180137684c13f443be55a861722

diff --git a/src/tdm_layer.c b/src/tdm_layer.c
index df7693a02fe5002e2ff915745f5a4354bc5c1fc1..45029f577b5ad6074ee4113bf211f3a49e03fa9a 100644 (file)
--- a/src/tdm_layer.c
+++ b/src/tdm_layer.c
@@ -179,7 +179,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(%d) not usable", private_layer->index);
+               TDM_INFO("layer(%p,%d) not usable", private_layer, private_layer->caps.zpos);
 
        private_layer->usable = 0;
 
@@ -238,7 +238,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) not usable", private_layer);
+               TDM_INFO("layer(%p,%d) not usable", private_layer, private_layer->caps.zpos);
 
        private_layer->usable = 0;
 
@@ -254,8 +254,9 @@ tdm_layer_set_info_internal(tdm_private_layer *private_layer, tdm_info_layer *in
        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->caps.zpos,
+                        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,
@@ -383,8 +384,8 @@ _tdm_layer_free_all_buffers(tdm_private_layer *private_layer)
                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->caps.zpos, private_layer->waiting_buffer);
        }
 
        if (private_layer->committed_buffer) {
@@ -392,8 +393,8 @@ _tdm_layer_free_all_buffers(tdm_private_layer *private_layer)
                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->caps.zpos, private_layer->committed_buffer);
        }
 
        if (private_layer->showing_buffer) {
@@ -401,8 +402,8 @@ _tdm_layer_free_all_buffers(tdm_private_layer *private_layer)
                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->caps.zpos, private_layer->showing_buffer);
        }
 
        LIST_FOR_EACH_ENTRY_SAFE(lm, lmm, &private_output->layer_commit_handler_list, link) {
@@ -465,7 +466,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) not usable", private_layer);
+               TDM_INFO("layer(%p,%d) not usable", private_layer, private_layer->caps.zpos);
 
        private_layer->usable = 0;
 
@@ -481,8 +482,8 @@ tdm_layer_set_buffer_internal(tdm_private_layer *private_layer, tbm_surface_h bu
        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->caps.zpos, private_layer->pending_buffer);
 
                if (tdm_ttrace_module & TDM_TTRACE_LAYER) {
                        tbm_bo bo = tbm_surface_internal_get_bo(private_layer->pending_buffer, 0);
@@ -496,8 +497,8 @@ tdm_layer_set_buffer_internal(tdm_private_layer *private_layer, tbm_surface_h bu
        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);
+               TDM_INFO("layer(%p,%d) pending_buffer(%p)",
+                                private_layer, private_layer->caps.zpos, private_layer->pending_buffer);
 
        if (tdm_ttrace_module & TDM_TTRACE_LAYER) {
                tbm_bo bo = tbm_surface_internal_get_bo(private_layer->pending_buffer, 0);
@@ -538,7 +539,7 @@ tdm_layer_unset_buffer_internal(tdm_private_layer *private_layer)
        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->caps.zpos);
 
        if (!func_layer->layer_unset_buffer) {
                /* LCOV_EXCL_START */
@@ -580,7 +581,8 @@ tdm_layer_committed(tdm_private_layer *private_layer, tdm_private_layer_buffer *
                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->caps.zpos, private_layer->fps_count);
                        private_layer->fps_count = 0;
                        private_layer->fps_stamp = curr;
                } else
@@ -604,8 +606,8 @@ tdm_layer_committed(tdm_private_layer *private_layer, tdm_private_layer_buffer *
        *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->caps.zpos, *committed_buffer,
                                 (private_layer->showing_buffer) ? private_layer->showing_buffer->buffer : NULL);
 }
 
@@ -639,8 +641,8 @@ _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) 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->caps.zpos, lm, (lm->committed_buffer) ? lm->committed_buffer->buffer : NULL);
 
                LIST_DEL(&lm->link);
                tdm_layer_committed(lm->private_layer, &lm->committed_buffer);
@@ -742,8 +744,8 @@ _tdm_layer_cb_output_commit(tdm_output *output, unsigned int sequence,
        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->caps.zpos, private_output->pipe, layer_commit_handler);
 
        _pthread_mutex_lock(&private_display->lock);
 
@@ -814,18 +816,20 @@ _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) commit: not possible(previous commit)", private_layer);
+                       TDM_INFO("layer(%p,%d) commit: not possible(previous commit)",
+                                        private_layer, private_layer->caps.zpos);
                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->caps.zpos);
                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->caps.zpos);
 
        return 1;
 }
@@ -870,8 +874,8 @@ tdm_layer_commit_pending_data(tdm_private_layer *private_layer)
                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->caps.zpos, private_layer->pending_buffer);
 
                if (ret == TDM_ERROR_NONE) {
                        if (private_layer->waiting_buffer)
@@ -880,8 +884,8 @@ tdm_layer_commit_pending_data(tdm_private_layer *private_layer)
                        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->caps.zpos, private_layer->waiting_buffer->buffer);
                } else
                        tdm_layer_free_buffer(private_layer, layer_buffer);
        }
@@ -911,7 +915,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) commit: handle(%p)", private_layer, layer_commit_handler);
+               TDM_INFO("layer(%p,%d) commit: handle(%p)", private_layer, private_layer->caps.zpos, layer_commit_handler);
 
        LIST_INITHEAD(&layer_commit_handler->link);
        layer_commit_handler->private_layer = private_layer;
@@ -922,13 +926,13 @@ _tdm_layer_commit(tdm_layer *layer, tdm_layer_commit_handler func, void *user_da
        private_layer->waiting_buffer = NULL;
 
        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->caps.zpos);
        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->caps.zpos, private_layer->waiting_buffer,
                                 (layer_commit_handler->committed_buffer) ? layer_commit_handler->committed_buffer->buffer : NULL);
 
        if (!private_output->commit_per_vblank) {
@@ -939,7 +943,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) commit: no commit-per-vblank", private_layer);
+                       TDM_INFO("layer(%p,%d) commit: no commit-per-vblank", private_layer, private_layer->caps.zpos);
        } else {
                TDM_GOTO_IF_FAIL(private_output->commit_type == TDM_COMMIT_TYPE_LAYER, commit_failed);
 
@@ -950,13 +954,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) commit: output", private_layer);
+                               TDM_INFO("layer(%p,%d) commit: output", private_layer, private_layer->caps.zpos);
                } 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->caps.zpos);
                }
 
                if (!private_output->vblank) {
@@ -976,7 +980,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) commit: wait vblank", private_layer);
+                               TDM_INFO("layer(%p,%d) commit: wait vblank", private_layer, private_layer->caps.zpos);
                }
        }
 
@@ -1005,7 +1009,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)'s output(%d) dpms: %s", private_layer, private_output->pipe,
+               TDM_ERR("layer(%p,%d)'s output(%d) dpms: %s", private_layer, private_layer->caps.zpos, private_output->pipe,
                                tdm_dpms_str(private_output->current_dpms_value));
                return TDM_ERROR_DPMS_OFF;
        }
@@ -1013,7 +1017,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) committing pending data failed", private_layer);
+               TDM_ERR("layer(%p,%d) committing pending data failed", private_layer, private_layer->caps.zpos);
                return ret;
        }
 
@@ -1115,7 +1119,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) showing_buffer is null", private_layer);
+               TDM_DBG("layer(%p,%d) showing_buffer is null", private_layer, private_layer->caps.zpos);
                return NULL;
        }
        _pthread_mutex_unlock(&private_display->lock);
@@ -1148,8 +1152,8 @@ _tbm_layer_queue_acquirable_cb(tbm_surface_queue_h surface_queue, void *data)
        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->caps.zpos, buffer);
                _pthread_mutex_unlock(&private_display->lock);
                return;
                /* LCOV_EXCL_STOP */
@@ -1204,7 +1208,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) not usable", private_layer);
+               TDM_INFO("layer(%p,%d) not usable", private_layer, private_layer->caps.zpos);
 
        private_layer->usable = 0;
 
@@ -1226,8 +1230,8 @@ tdm_layer_set_buffer_queue(tdm_layer *layer, tbm_surface_queue_h buffer_queue)
                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->caps.zpos, private_layer->waiting_buffer);
        }
 
        private_layer->buffer_queue = buffer_queue;
@@ -1277,7 +1281,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) is not video layer", private_layer);
+               TDM_ERR("layer(%p,%d) is not video layer", private_layer, private_layer->caps.zpos);
                _pthread_mutex_unlock(&private_display->lock);
                return TDM_ERROR_BAD_REQUEST;
        }
@@ -1285,7 +1289,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("not implemented!!");
+               TDM_ERR("layer(%p,%d) not implemented!!", private_layer, private_layer->caps.zpos);
                return TDM_ERROR_NOT_IMPLEMENTED;
                /* LCOV_EXCL_STOP */
        }