geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

exynos/fimg2d: add message prefix 

Add a prefix to the messages printed to the console via
printf() and fprintf() so that one can easily see where
the message comes from.

Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
main
Tobias Jakobi 2015-09-08 17:22:33 +02:00 committed by Emil Velikov
parent bf666b5e99
commit ce4a4f6e21
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
exynos/exynos_fimg2d.c
View File

@ -42,6 +42,8 @@
#define MIN(a, b) ((a) < (b) ? (a) : (b))
#define MSG_PREFIX "exynos/fimg2d: "
enum g2d_base_addr_reg {
g2d_dst = 0,
g2d_src
@ -255,7 +257,7 @@ static int g2d_flush(struct g2d_context *ctx)
return 0;
if (ctx->cmdlist_nr >= G2D_MAX_CMD_LIST_NR) {
fprintf(stderr, "Overflow cmdlist.\n");
fprintf(stderr, MSG_PREFIX "command list overflow.\n");
return -EINVAL;
}
@ -271,7 +273,7 @@ static int g2d_flush(struct g2d_context *ctx)
ret = drmIoctl(ctx->fd, DRM_IOCTL_EXYNOS_G2D_SET_CMDLIST, &cmdlist);
if (ret < 0) {
fprintf(stderr, "failed to set cmdlist.\n");
fprintf(stderr, MSG_PREFIX "failed to set cmdlist.\n");
return ret;
}
@ -293,7 +295,7 @@ struct g2d_context *g2d_init(int fd)
ctx = calloc(1, sizeof(*ctx));
if (!ctx) {
fprintf(stderr, "failed to allocate context.\n");
fprintf(stderr, MSG_PREFIX "failed to allocate context.\n");
return NULL;
}
@ -301,7 +303,7 @@ struct g2d_context *g2d_init(int fd)
ret = drmIoctl(fd, DRM_IOCTL_EXYNOS_G2D_GET_VER, &ver);
if (ret < 0) {
fprintf(stderr, "failed to get version.\n");
fprintf(stderr, MSG_PREFIX "failed to get version.\n");
free(ctx);
return NULL;
}
@ -309,7 +311,7 @@ struct g2d_context *g2d_init(int fd)
ctx->major = ver.major;
ctx->minor = ver.minor;
printf("g2d version(%d.%d).\n", ctx->major, ctx->minor);
printf(MSG_PREFIX "G2D version (%d.%d).\n", ctx->major, ctx->minor);
return ctx;
}
@ -335,7 +337,7 @@ int g2d_exec(struct g2d_context *ctx)
ret = drmIoctl(ctx->fd, DRM_IOCTL_EXYNOS_G2D_EXEC, &exec);
if (ret < 0) {
fprintf(stderr, "failed to execute.\n");
fprintf(stderr, MSG_PREFIX "failed to execute.\n");
return ret;
}
@ -436,7 +438,7 @@ g2d_copy(struct g2d_context *ctx, struct g2d_image *src,
h = MIN(src_h, dst_h);
if (w <= 0 || h <= 0) {
fprintf(stderr, "invalid width or height.\n");
fprintf(stderr, MSG_PREFIX "invalid width or height.\n");
return -EINVAL;
}
@ -532,7 +534,7 @@ g2d_copy_with_scale(struct g2d_context *ctx, struct g2d_image *src,
dst_h = dst->height - dst_y;
if (src_w <= 0 || src_h <= 0 || dst_w <= 0 || dst_h <= 0) {
fprintf(stderr, "invalid width or height.\n");
fprintf(stderr, MSG_PREFIX "invalid width or height.\n");
return -EINVAL;
}
@ -633,17 +635,17 @@ g2d_blend(struct g2d_context *ctx, struct g2d_image *src,
h = MIN(src_h, dst_h);
if (w <= 0 || h <= 0) {
fprintf(stderr, "invalid width or height.\n");
fprintf(stderr, MSG_PREFIX "invalid width or height.\n");
return -EINVAL;
}
if (!g2d_validate_select_mode(src->select_mode)) {
fprintf(stderr , "invalid select mode for source.\n");
fprintf(stderr , MSG_PREFIX "invalid select mode for source.\n");
return -EINVAL;
}
if (!g2d_validate_blending_op(op)) {
fprintf(stderr , "unsupported blending operation.\n");
fprintf(stderr , MSG_PREFIX "unsupported blending operation.\n");
return -EINVAL;
}
@ -752,17 +754,17 @@ g2d_scale_and_blend(struct g2d_context *ctx, struct g2d_image *src,
dst_h = dst->height - dst_y;
if (src_w <= 0 || src_h <= 0 || dst_w <= 0 || dst_h <= 0) {
fprintf(stderr, "invalid width or height.\n");
fprintf(stderr, MSG_PREFIX "invalid width or height.\n");
return -EINVAL;
}
if (!g2d_validate_select_mode(src->select_mode)) {
fprintf(stderr , "invalid select mode for source.\n");
fprintf(stderr , MSG_PREFIX "invalid select mode for source.\n");
return -EINVAL;
}
if (!g2d_validate_blending_op(op)) {
fprintf(stderr , "unsupported blending operation.\n");
fprintf(stderr , MSG_PREFIX "unsupported blending operation.\n");
return -EINVAL;
}