AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

panfrost: Use DBG macro to avoid noise in the console

Browse Source 
It pollutes the output of programs that use Panfrost and can confuse its
callers, such as test runners.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3625>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3625>
This commit is contained in:
Tomeu Vizoso
2020-01-06 10:48:20 +01:00
committed by Marge Bot
parent 2504206221
commit d902e23d80
6 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/panfrost/pan_blit.c
+2 -3
View File
@@ -28,6 +28,7 @@
*/
#include "pan_context.h"
#include "pan_util.h"
#include "util/format/u_format.h"
static void
@@ -67,7 +68,7 @@ panfrost_u_blitter_blit(struct pipe_context *pipe,
struct panfrost_context *ctx = pan_context(pipe);
if (!util_blitter_is_blit_supported(ctx->blitter, info)) {
fprintf(stderr, "blit unsupported %s -> %s\n",
DBG("blit unsupported %s -> %s\n",
util_format_short_name(info->src.resource->format),
util_format_short_name(info->dst.resource->format));
return false;
@@ -92,8 +93,6 @@ panfrost_blit(struct pipe_context *pipe,
if (panfrost_u_blitter_blit(pipe, info))
return;
fprintf(stderr, "Unhandled blit");
return;
}
src/gallium/drivers/panfrost/pan_bo.c
+1 -1
View File
@@ -73,7 +73,7 @@ panfrost_bo_alloc(struct panfrost_screen *screen, size_t size,
ret = drmIoctl(screen->fd, DRM_IOCTL_PANFROST_CREATE_BO, &create_bo);
if (ret) {
fprintf(stderr, "DRM_IOCTL_PANFROST_CREATE_BO failed: %m\n");
DBG("DRM_IOCTL_PANFROST_CREATE_BO failed: %m\n");
return NULL;
}
src/gallium/drivers/panfrost/pan_context.c
+1 -1
View File
@@ -2506,7 +2506,7 @@ panfrost_begin_query(struct pipe_context *pipe, struct pipe_query *q)
break;
default:
fprintf(stderr, "Skipping query %u\n", query->type);
DBG("Skipping query %u\n", query->type);
break;
}
src/gallium/drivers/panfrost/pan_format.c
+1 -1
View File
@@ -99,7 +99,7 @@ panfrost_translate_channel_width(unsigned size)
case 32:
return MALI_CHANNEL_32;
default: {
printf ("Invalid width: %d\n", size);
fprintf(stderr, "Invalid width: %d\n", size);
assert(0);
}
}
src/gallium/drivers/panfrost/pan_job.c
+3 -3
View File
@@ -893,7 +893,7 @@ panfrost_batch_submit_ioctl(struct panfrost_batch *batch,
free(in_syncs);
if (ret) {
fprintf(stderr, "Error submitting: %m\n");
DBG("Error submitting: %m\n");
return errno;
}
@@ -907,7 +907,7 @@ panfrost_batch_submit_ioctl(struct panfrost_batch *batch,
status = header->exception_status;
if (status && status != 0x1) {
fprintf(stderr, "Job %" PRIx64 " failed: source ID: 0x%x access: %s exception: 0x%x (exception_status 0x%x) fault_pointer 0x%" PRIx64 " \n",
DBG("Job %" PRIx64 " failed: source ID: 0x%x access: %s exception: 0x%x (exception_status 0x%x) fault_pointer 0x%" PRIx64 " \n",
first_job_desc,
(status >> 16) & 0xFFFF,
pandecode_exception_access((status >> 8) & 0x3),
@@ -995,7 +995,7 @@ panfrost_batch_submit(struct panfrost_batch *batch)
ret = panfrost_batch_submit_jobs(batch);
if (ret)
fprintf(stderr, "panfrost_batch_submit failed: %d\n", ret);
DBG("panfrost_batch_submit failed: %d\n", ret);
/* We must reset the damage info of our render targets here even
* though a damage reset normally happens when the DRI layer swaps
src/gallium/drivers/panfrost/pan_screen.c
+2 -2
View File
@@ -357,7 +357,7 @@ panfrost_get_shader_param(struct pipe_screen *screen,
return 0;
default:
fprintf(stderr, "unknown shader param %d\n", param);
DBG("unknown shader param %d\n", param);
return 0;
}
@@ -734,7 +734,7 @@ panfrost_create_screen(int fd, struct renderonly *ro)
if (ro) {
screen->ro = renderonly_dup(ro);
if (!screen->ro) {
fprintf(stderr, "Failed to dup renderonly object\n");
DBG("Failed to dup renderonly object\n");
free(screen);
return NULL;
}