#endif
#include <png.h>
-#include <string.h>
-#include <tbm_surface.h>
-#include <tbm_surface_internal.h>
-#include <string.h>
-#include <time.h>
#include <pixman.h>
-#include "tdm.h"
#include "tdm_private.h"
-#include "tdm_helper.h"
#define PNG_DEPTH 8
return 0;
}
+static int
+_tdm_helper_check_file_is_symbolic_link(const char* path)
+{
+ struct stat sb;
+
+ if (!path)
+ return 0;
+
+ if (stat(path, &sb) != 0)
+ return 0;
+
+ if (S_ISLNK(sb.st_mode))
+ return 1;
+
+ return 0;
+}
+
static void
_tdm_helper_dump_raw(const char *file, void *data1, int size1, void *data2,
int size2, void *data3, int size3)
{
unsigned int *blocks;
- FILE *fp = fopen(file, "w+");
+ FILE *fp;
+
+ if (_tdm_helper_check_file_is_symbolic_link(file)) {
+ TDM_ERR("'%s' may be symbolic link\n", file);
+ return;
+ }
+
+ fp = fopen(file, "w+");
TDM_RETURN_IF_FAIL(fp != NULL);
blocks = (unsigned int *)data1;
_tdm_helper_dump_png(const char *file, const void *data, int width,
int height)
{
- FILE *fp = fopen(file, "wb");
+ FILE *fp;
+
+ if (_tdm_helper_check_file_is_symbolic_link(file)) {
+ TDM_ERR("'%s' may be symbolic link\n", file);
+ return;
+ }
+
+ fp = fopen(file, "wb");
TDM_RETURN_IF_FAIL(fp != NULL);
png_structp pPngStruct =
const int pixel_size = 4; // RGBA
png_bytep *row_pointers =
png_malloc(pPngStruct, height * sizeof(png_byte *));
+ if (!row_pointers) {
+ png_destroy_write_struct(&pPngStruct, &pPngInfo);
+ fclose(fp);
+ return;
+ }
unsigned int *blocks = (unsigned int *)data;
int y = 0;
for (; y < height; ++y) {
png_bytep row =
png_malloc(pPngStruct, sizeof(png_byte) * width * pixel_size);
+ if (!row) {
+ for (x = 0; x < y; x++)
+ png_free(pPngStruct, row_pointers[x]);
+ png_free(pPngStruct, row_pointers);
+ png_destroy_write_struct(&pPngStruct, &pPngInfo);
+ fclose(fp);
+ return;
+ }
+
row_pointers[y] = (png_bytep)row;
for (x = 0; x < width; ++x) {
unsigned int curBlock = blocks[y * width + x];
fclose(fp);
}
+/* LCOV_EXCL_START */
INTERN char *
tdm_helper_dump_make_directory(const char *path, char *reply, int *len)
{
TDM_GOTO_IF_FAIL(t != NULL, failed_make);
snprintf(fullpath, TDM_PATH_LEN, "%s/dump_%04d%02d%02d.%02d%02d%02d", path,
- t->tm_year+1900, t->tm_mon+1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
+ t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
if ((mkdir(fullpath, 0755)) < 0) {
TDM_ERR("mkdir '%s' fail\n", fullpath);
return NULL;
}
-INTERN void
+EXTERN void
tdm_helper_dump_buffer_str(tbm_surface_h buffer, char *dir, char *str)
{
tbm_surface_info_s info;
- const char *ext;
char file[TDM_PATH_LEN];
- int ret, bw;
+ int ret, bw, bh;
TDM_RETURN_IF_FAIL(buffer != NULL);
- TDM_RETURN_IF_FAIL(dir != NULL);
TDM_RETURN_IF_FAIL(str != NULL);
+ if (!dir)
+ dir = ".";
+
ret = tbm_surface_get_info(buffer, &info);
TDM_RETURN_IF_FAIL(ret == TBM_SURFACE_ERROR_NONE);
- if (info.format == TBM_FORMAT_ARGB8888 || info.format == TBM_FORMAT_XRGB8888) {
- ext = file_exts[0];
- bw = info.planes[0].stride >> 2;
- } else {
- ext = file_exts[1];
- bw = info.planes[0].stride;
- }
+ tdm_helper_get_buffer_full_size(buffer, &bw, &bh);
- snprintf(file, TDM_PATH_LEN, "%s/%c%c%c%c_%dx%d_%s.%s",
- dir, FOURCC_STR(info.format), bw, info.height, str, ext);
+ snprintf(file, TDM_PATH_LEN, "%s/%c%c%c%c_%dx%d_%dx%d_%s",
+ dir, FOURCC_STR(info.format), bw, bh, info.width, info.height, str);
tdm_helper_dump_buffer(buffer, file);
}
+/* LCOV_EXCL_STOP */
EXTERN void
tdm_helper_dump_buffer(tbm_surface_h buffer, const char *file)
{
+ char temp[TDM_PATH_LEN] = {0,};
tbm_surface_info_s info;
int len, ret;
const char *ext;
+ int bo_cnt;
+ int bw, bh;
+ char *dot, *p = temp;
TDM_RETURN_IF_FAIL(buffer != NULL);
TDM_RETURN_IF_FAIL(file != NULL);
ret = tbm_surface_map(buffer, TBM_OPTION_READ, &info);
TDM_RETURN_IF_FAIL(ret == TBM_SURFACE_ERROR_NONE);
- len = strnlen(file, 1024);
- if (info.format == TBM_FORMAT_ARGB8888 || info.format == TBM_FORMAT_XRGB8888)
+ if (IS_RGB(info.format))
ext = file_exts[0];
else
ext = file_exts[1];
- if (strncmp(file + (len - 3), ext, 3)) {
- TDM_ERR("can't dump to '%s' file", file + (len - 3));
- tbm_surface_unmap(buffer);
- return;
+ dot = strrchr(file, '.');
+ if (!dot || strlen(dot + 1) != 3 || strncmp(dot + 1, ext, 3)) {
+ len = strnlen(file, TDM_PATH_LEN - 5);
+ strncat(p, file, len);
+ p += len;
+ *(p++) = '.';
+ strncat(p, ext, 3);
+ p += 3;
+ *p = '\0';
}
+ tdm_helper_get_buffer_full_size(buffer, &bw, &bh);
+
+ bo_cnt = tbm_surface_internal_get_num_bos(buffer);
+ TDM_DBG("buffer: bo_cnt(%d) %dx%d(%dx%d) %c%c%c%c, plane: (%p+%d, %d,%d) (%p+%d, %d,%d) (%p+%d, %d,%d)",
+ bo_cnt, bw, bh, info.width, info.height, FOURCC_STR(info.format),
+ info.planes[0].ptr, info.planes[0].offset, info.planes[0].stride, info.planes[0].size,
+ info.planes[1].ptr, info.planes[1].offset, info.planes[1].stride, info.planes[1].size,
+ info.planes[2].ptr, info.planes[2].offset, info.planes[2].stride, info.planes[2].size);
+
switch (info.format) {
case TBM_FORMAT_ARGB8888:
case TBM_FORMAT_XRGB8888:
- _tdm_helper_dump_png(file, info.planes[0].ptr,
- info.planes[0].stride >> 2, info.height);
+ _tdm_helper_dump_png(temp, info.planes[0].ptr, bw, bh);
break;
case TBM_FORMAT_YVU420:
case TBM_FORMAT_YUV420:
- _tdm_helper_dump_raw(file,
+ _tdm_helper_dump_raw((const char*)temp,
info.planes[0].ptr,
- info.planes[0].stride * info.height,
+ info.planes[0].size,
info.planes[1].ptr,
- info.planes[1].stride * (info.height >> 1),
+ info.planes[1].size,
info.planes[2].ptr,
- info.planes[2].stride * (info.height >> 1));
+ info.planes[2].size);
break;
case TBM_FORMAT_NV12:
case TBM_FORMAT_NV21:
- _tdm_helper_dump_raw(file,
+ _tdm_helper_dump_raw((const char*)temp,
info.planes[0].ptr,
- info.planes[0].stride * info.height,
+ info.planes[0].size,
info.planes[1].ptr,
- info.planes[1].stride * (info.height >> 1), NULL,
+ info.planes[1].size, NULL,
0);
break;
case TBM_FORMAT_YUYV:
case TBM_FORMAT_UYVY:
- _tdm_helper_dump_raw(file,
+ _tdm_helper_dump_raw((const char*)temp,
info.planes[0].ptr,
- info.planes[0].stride * info.height, NULL, 0,
+ info.planes[0].size, NULL, 0,
NULL, 0);
break;
default:
tbm_surface_unmap(buffer);
- TDM_INFO("dump %s", file);
+ TDM_INFO("dump %s", temp);
}
-void
-tdm_helper_clear_buffer_pos(tbm_surface_h buffer, tdm_pos *pos)
+EXTERN void
+tdm_helper_clear_buffer_color(tbm_surface_h buffer, tdm_pos *pos, unsigned int color)
{
tbm_surface_info_s info;
int ret;
for (y = pos->y; y <= (pos->y + pos->h); y++) {
p = info.planes[0].ptr + info.planes[0].stride * y;
for (x = pos->x; x <= (pos->x + pos->w); x++) {
- int *ibuf = (int*)p;
- ibuf[x] = 0x00000000;
+ unsigned int *ibuf = (unsigned int*)p;
+ ibuf[x] = color;
}
}
}
}
EXTERN void
+tdm_helper_clear_buffer_pos(tbm_surface_h buffer, tdm_pos *pos)
+{
+ TDM_RETURN_IF_FAIL(buffer != NULL);
+
+ tdm_helper_clear_buffer_color(buffer, pos, 0);
+}
+
+EXTERN void
tdm_helper_clear_buffer(tbm_surface_h buffer)
{
TDM_RETURN_IF_FAIL(buffer != NULL);
tdm_helper_clear_buffer_pos(buffer, NULL);
}
+EXTERN void
+tdm_helper_get_buffer_full_size(tbm_surface_h buffer, int *buffer_w, int *buffer_h)
+{
+ tbm_surface_info_s info;
+ int ret;
+
+ TDM_RETURN_IF_FAIL(buffer != NULL);
+
+ ret = tbm_surface_get_info(buffer, &info);
+ TDM_RETURN_IF_FAIL(ret == TBM_SURFACE_ERROR_NONE);
+
+ if (buffer_w) {
+ if (IS_RGB(info.format))
+ *buffer_w = info.planes[0].stride >> 2;
+ else
+ *buffer_w = info.planes[0].stride;
+ }
+
+ if (buffer_h)
+ *buffer_h = info.planes[0].size / info.planes[0].stride;
+}
+
static pixman_format_code_t
_tdm_helper_pixman_format_get(tbm_format format)
{
if (rotate_step > 0) {
int c, s, tx = 0, ty = 0;
switch (rotate_step) {
- case 1:
- c = 0, s = -1, tx = -dstpos->w;
- break;
- case 2:
- c = -1, s = 0, tx = -dstpos->w, ty = -dstpos->h;
- break;
- case 3:
- c = 0, s = 1, ty = -dstpos->h;
- break;
- default:
- break;
+ case 1:
+ c = 0, s = -1, tx = -dstpos->w;
+ break;
+ case 2:
+ c = -1, s = 0, tx = -dstpos->w, ty = -dstpos->h;
+ break;
+ case 3:
+ c = 0, s = 1, ty = -dstpos->h;
+ break;
}
pixman_f_transform_translate(&ft, NULL, tx, ty);
pixman_f_transform_rotate(&ft, NULL, c, s);
return ret;
}
+/* LCOV_EXCL_START */
EXTERN int
tdm_helper_get_fd(const char *env)
{
- const char *value;
- int fd, newfd, flags, ret;
-
- value = (const char*)getenv(env);
- if (!value)
- return -1;
-
- ret = sscanf(value, "%d", &fd);
- if (ret < 0) {
- TDM_ERR("sscanf failed: %m");
- return -1;
- }
-
- flags = fcntl(fd, F_GETFD);
- if (flags == -1) {
- TDM_ERR("fcntl failed: %m");
- return -1;
- }
-
- newfd = dup(fd);
- if (newfd < 0) {
- TDM_ERR("dup failed: %m");
+ if (strncmp(env, "TBM_DRM_MASTER_FD", 17) && strncmp(env, "TDM_DRM_MASTER_FD", 17)) {
+ TDM_INFO("DEPRECATED! '%s'", env);
return -1;
}
- TDM_INFO("%s: fd(%d) newfd(%d)", env, fd, newfd);
-
- fcntl(newfd, F_SETFD, flags | FD_CLOEXEC);
-
- return newfd;
+ return tbm_drm_helper_get_master_fd();
}
EXTERN void
tdm_helper_set_fd(const char *env, int fd)
{
- char buf[32];
- int ret;
-
- snprintf(buf, sizeof(buf), "%d", fd);
-
- ret = setenv(env, (const char*)buf, 1);
- if (ret) {
- TDM_ERR("setenv failed: %m");
+ if (strncmp(env, "TBM_DRM_MASTER_FD", 17) && strncmp(env, "TDM_DRM_MASTER_FD", 17)) {
+ TDM_INFO("DEPRECATED! '%s'", env);
return;
}
- if (fd >= 0)
- TDM_INFO("%s: fd(%d)", env, fd);
+ tbm_drm_helper_set_tbm_master_fd(fd);
}
+/* LCOV_EXCL_STOP */
EXTERN void
tdm_helper_dump_start(char *dumppath, int *count)
TDM_DBG("tdm_helper_dump stop.");
}
+/* LCOV_EXCL_START */
static tdm_error
_tdm_helper_buffer_convert(tbm_surface_h srcbuf, tbm_surface_h dstbuf,
int dx, int dy, int dw, int dh, int count)
TDM_RETURN_VAL_IF_FAIL(srcbuf != NULL, TDM_ERROR_INVALID_PARAMETER);
TDM_RETURN_VAL_IF_FAIL(dstbuf != NULL, TDM_ERROR_INVALID_PARAMETER);
- if (tbm_surface_map(srcbuf, TBM_SURF_OPTION_READ, &src_info)
- != TBM_SURFACE_ERROR_NONE) {
+ if (tbm_surface_map(srcbuf, TBM_SURF_OPTION_READ, &src_info) != TBM_SURFACE_ERROR_NONE) {
TDM_ERR("cannot mmap srcbuf\n");
return TDM_ERROR_OPERATION_FAILED;
}
- if (tbm_surface_map(dstbuf, TBM_SURF_OPTION_WRITE, &dst_info)
- != TBM_SURFACE_ERROR_NONE) {
+ if (tbm_surface_map(dstbuf, TBM_SURF_OPTION_WRITE, &dst_info) != TBM_SURFACE_ERROR_NONE) {
TDM_ERR("cannot mmap dstbuf\n");
tbm_surface_unmap(srcbuf);
return TDM_ERROR_OPERATION_FAILED;
return TDM_ERROR_OPERATION_FAILED;
}
+/* LCOV_EXCL_STOP */
+
EXTERN tdm_error
tdm_helper_capture_output(tdm_output *output, tbm_surface_h dst_buffer,
TDM_RETURN_VAL_IF_FAIL(w >= 0, TDM_ERROR_INVALID_PARAMETER);
TDM_RETURN_VAL_IF_FAIL(h >= 0, TDM_ERROR_INVALID_PARAMETER);
TDM_RETURN_VAL_IF_FAIL(func != NULL, TDM_ERROR_INVALID_PARAMETER);
- TDM_RETURN_VAL_IF_FAIL(data != NULL, TDM_ERROR_INVALID_PARAMETER);
err = tdm_output_get_layer_count(output, &count);
if (err != TDM_ERROR_NONE) {
private_display = dpy;
func_output = &private_display->func_output;
func_layer = &private_display->func_layer;
- _pthread_mutex_lock(&private_display->lock);
/* module information */
module_data = private_display->module_data;
TDM_SNPRINTF(reply, len, "idx maker model name type status dpms subpixel align_w min max phy(mm)\n");
TDM_SNPRINTF(reply, len, "--------------------------------------------------------------------------------------------\n");
LIST_FOR_EACH_ENTRY(private_output, &private_display->output_list, link) {
- TDM_SNPRINTF(reply, len, "%d %s %s %s %s %s %s %d %d %dx%d %dx%d %dx%d\n",
+ TDM_SNPRINTF(reply, len, "%d %s %s %s %s %s %s %u %d %dx%d %dx%d %ux%u\n",
private_output->index, private_output->caps.maker,
private_output->caps.model, private_output->caps.name,
tdm_conn_str(private_output->caps.type),
TDM_FRONT_VALUE(private_output->caps.max_h),
private_output->caps.mmWidth, private_output->caps.mmHeight);
- TDM_SNPRINTF(reply, len, "\t%d modes:\n", private_output->caps.mode_count);
+ TDM_SNPRINTF(reply, len, "\t%u modes:\n", private_output->caps.mode_count);
if (private_output->caps.mode_count > 0) {
const tdm_output_mode *current_mode = NULL;
- TDM_DBG_GOTO_IF_FAIL(func_output->output_get_mode, unlock);
+ TDM_DBG_RETURN_IF_FAIL(func_output->output_get_mode);
ret = func_output->output_get_mode(private_output->output_backend, ¤t_mode);
- TDM_DBG_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, unlock);
+ TDM_DBG_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
TDM_SNPRINTF(reply, len, "\t\t name refresh (Hz) clk hdisp hss hse htot vdisp vss vse vtot vscan\n");
for (i = 0; i < private_output->caps.mode_count; i++) {
char *current = (current_mode == private_output->caps.modes + i) ? "*" : " ";
- TDM_SNPRINTF(reply, len, "\t\t%s%s %d %d %d %d %d %d %d %d %d %d %d ",
+ TDM_SNPRINTF(reply, len, "\t\t%s%s %u %u %u %u %u %u %u %u %u %u %u ",
current,
private_output->caps.modes[i].name,
private_output->caps.modes[i].vrefresh,
TDM_SNPRINTF(reply, len, "\t%d properties:\n", private_output->caps.prop_count);
if (private_output->caps.prop_count > 0) {
- TDM_SNPRINTF(reply, len, "\t\tname\tidx\tvalue\n");
+ TDM_SNPRINTF(reply, len, "\t\tname\ttype\tidx\tvalue\n");
for (i = 0; i < private_output->caps.prop_count; i++) {
tdm_value value;
- TDM_DBG_GOTO_IF_FAIL(func_output->output_get_property, unlock);
+ TDM_DBG_RETURN_IF_FAIL(func_output->output_get_property);
ret = func_output->output_get_property(private_output->output_backend,
private_output->caps.props[i].id,
&value);
- TDM_DBG_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, unlock);
- TDM_SNPRINTF(reply, len, "\t\t%s\t%d\t%d\n",
+ TDM_DBG_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
+ TDM_SNPRINTF(reply, len, "\t\t%s\t%s\t%u\t",
private_output->caps.props[i].name,
- private_output->caps.props[i].id,
- value.u32);
+ tdm_value_type_str(private_output->caps.props[i].type),
+ private_output->caps.props[i].id);
+ switch (private_output->caps.props[i].type) {
+ case TDM_VALUE_TYPE_PTR:
+ TDM_SNPRINTF(reply, len, "%p\n", value.ptr);
+ break;
+ case TDM_VALUE_TYPE_INT32:
+ TDM_SNPRINTF(reply, len, "%d\n", value.s32);
+ break;
+ case TDM_VALUE_TYPE_INT64:
+ TDM_SNPRINTF(reply, len, "%"PRId64"\n", value.s64);
+ break;
+ case TDM_VALUE_TYPE_UINT64:
+ TDM_SNPRINTF(reply, len, "%"PRIu64"\n", value.u64);
+ break;
+ case TDM_VALUE_TYPE_UINT32:
+ default:
+ TDM_SNPRINTF(reply, len, "%u\n", value.u32);
+ break;
+ }
}
}
}
tdm_size size;
tbm_surface_info_s buf_info;
- TDM_DBG_GOTO_IF_FAIL(func_layer->layer_get_info, unlock);
+ TDM_DBG_RETURN_IF_FAIL(func_layer->layer_get_info);
memset(&info, 0, sizeof info);
ret = func_layer->layer_get_info(private_layer->layer_backend, &info);
- TDM_DBG_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, unlock);
+ TDM_DBG_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
+
+ if (!private_layer->showing_buffer)
+ continue;
- format = tbm_surface_get_format(private_layer->showing_buffer);
- tbm_surface_get_info(private_layer->showing_buffer, &buf_info);
+ format = tbm_surface_get_format(private_layer->showing_buffer->buffer);
+ tbm_surface_get_info(private_layer->showing_buffer->buffer, &buf_info);
if (IS_RGB(format))
size.h = buf_info.planes[0].stride >> 2;
else
size.h = buf_info.planes[0].stride;
- size.v = tbm_surface_get_height(private_layer->showing_buffer);
+ size.v = tbm_surface_get_height(private_layer->showing_buffer->buffer);
if (info.src_config.format)
- format = (info.src_config.format)?:format;
+ format = (info.src_config.format) ? : format;
- TDM_SNPRINTF(reply, len, "%d %d %d %p %c%c%c%c %dx%d %dx%d+%d+%d %dx%d+%d+%d %s\n",
+ TDM_SNPRINTF(reply, len, "%d %d %d %p %c%c%c%c %ux%u %ux%u+%u+%u %ux%u+%u+%u %s\n",
private_layer->index,
private_output->index,
private_layer->caps.zpos,
- private_layer->showing_buffer, FOURCC_STR(format), size.h, size.v,
+ private_layer->showing_buffer->buffer, FOURCC_STR(format), size.h, size.v,
info.src_config.pos.w, info.src_config.pos.h, info.src_config.pos.x, info.src_config.pos.y,
info.dst_pos.w, info.dst_pos.h, info.dst_pos.x, info.dst_pos.y,
tdm_transform_str(info.transform));
TDM_SNPRINTF(reply, len, "\n");
}
- TDM_SNPRINTF(reply, len, "\t%d properties:\n", private_layer->caps.prop_count);
+ TDM_SNPRINTF(reply, len, "\t%u properties:\n", private_layer->caps.prop_count);
if (private_layer->caps.prop_count > 0) {
- TDM_SNPRINTF(reply, len, "\t\tname\tidx\tvalue\n");
+ TDM_SNPRINTF(reply, len, "\t\tname\ttype\tidx\tvalue\n");
for (i = 0; i < private_layer->caps.prop_count; i++) {
tdm_value value;
- TDM_DBG_GOTO_IF_FAIL(func_layer->layer_get_property, unlock);
+ TDM_DBG_RETURN_IF_FAIL(func_layer->layer_get_property);
ret = func_layer->layer_get_property(private_layer->layer_backend,
private_layer->caps.props[i].id,
&value);
- TDM_DBG_GOTO_IF_FAIL(ret == TDM_ERROR_NONE, unlock);
- TDM_SNPRINTF(reply, len, "\t\t%s\t%d\t%d\n",
+ TDM_DBG_RETURN_IF_FAIL(ret == TDM_ERROR_NONE);
+ TDM_SNPRINTF(reply, len, "\t\t%s\t%s\t%u\t",
private_layer->caps.props[i].name,
- private_layer->caps.props[i].id,
- value.u32);
+ tdm_value_type_str(private_output->caps.props[i].type),
+ private_layer->caps.props[i].id);
+ switch (private_layer->caps.props[i].type) {
+ case TDM_VALUE_TYPE_PTR:
+ TDM_SNPRINTF(reply, len, "%p\n", value.ptr);
+ break;
+ case TDM_VALUE_TYPE_INT32:
+ TDM_SNPRINTF(reply, len, "%d\n", value.s32);
+ break;
+ case TDM_VALUE_TYPE_INT64:
+ TDM_SNPRINTF(reply, len, "%"PRId64"\n", value.s64);
+ break;
+ case TDM_VALUE_TYPE_UINT64:
+ TDM_SNPRINTF(reply, len, "%"PRIu64"\n", value.u64);
+ break;
+ case TDM_VALUE_TYPE_UINT32:
+ default:
+ TDM_SNPRINTF(reply, len, "%u\n", value.u32);
+ break;
+ }
}
}
}
TDM_SNPRINTF(reply, len, "src(format size crop) | dst(format size crop) | transform\n");
TDM_SNPRINTF(reply, len, "-------------------------------------------------------------\n");
LIST_FOR_EACH_ENTRY(private_pp, &private_display->pp_list, link) {
- TDM_SNPRINTF(reply, len, "%c%c%c%c %dx%d %dx%d+%d+%d | %c%c%c%c %dx%d %dx%d+%d+%d | %s\n",
+ TDM_SNPRINTF(reply, len, "%c%c%c%c %ux%u %ux%u+%u+%u | %c%c%c%c %ux%u %ux%u+%u+%u | %s\n",
FOURCC_STR(private_pp->info.src_config.format),
private_pp->info.src_config.size.h,
private_pp->info.src_config.size.v,
TDM_SNPRINTF(reply, len, "dst(format size crop) | transform\n");
TDM_SNPRINTF(reply, len, "-----------------------------------\n");
LIST_FOR_EACH_ENTRY(private_capture, &private_display->capture_list, link) {
- TDM_SNPRINTF(reply, len, "%c%c%c%c %dx%d %dx%d+%d+%d | %s\n",
+ TDM_SNPRINTF(reply, len, "%c%c%c%c %ux%u %ux%u+%u+%u | %s\n",
FOURCC_STR(private_capture->info.dst_config.format),
private_capture->info.dst_config.size.h,
private_capture->info.dst_config.size.v,
TDM_SNPRINTF(reply, len, "[No Capture capability]\n");
}
TDM_SNPRINTF(reply, len, "\n");
+}
-unlock:
- _pthread_mutex_unlock(&private_display->lock);
+/* LCOV_EXCL_START */
+EXTERN int
+tdm_helper_commit_per_vblank_enabled(tdm_display *dpy)
+{
+ TDM_ERR("the deprecated function, use 'tdm_helper_output_commit_per_vblank_enabled' instead.");
+
+ return 0;
}
+/* LCOV_EXCL_STOP */
+
+EXTERN int
+tdm_helper_output_commit_per_vblank_enabled(tdm_output *output)
+{
+ tdm_private_output *private_output = output;
+
+ TDM_RETURN_VAL_IF_FAIL(private_output != NULL, -1);
+
+ return !!private_output->commit_per_vblank;
+}
+