diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c index 3fd9fa8882b..5f77718249b 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c @@ -922,9 +922,8 @@ void amdgpu_bo_slab_free(struct amdgpu_winsys *aws, struct pb_slab *slab) static void sparse_dump(struct amdgpu_bo_sparse *bo, const char *func) { - fprintf(stderr, "%s: %p (size=%"PRIu64", num_va_pages=%u) @ %s\n" - "Commitments:\n", - __func__, bo, bo->b.base.size, bo->num_va_pages, func); + mesa_logi("%s: %p (size=%"PRIu64", num_va_pages=%u) @ %s\n" + "Commitments:\n", __func__, bo, bo->b.base.size, bo->num_va_pages, func); struct amdgpu_sparse_backing *span_backing = NULL; uint32_t span_first_backing_page = 0; @@ -943,10 +942,9 @@ sparse_dump(struct amdgpu_bo_sparse *bo, const char *func) if (span_backing && (backing != span_backing || backing_page != span_first_backing_page + (va_page - span_first_va_page))) { - fprintf(stderr, " %u..%u: backing=%p:%u..%u\n", - span_first_va_page, va_page - 1, span_backing, - span_first_backing_page, - span_first_backing_page + (va_page - span_first_va_page) - 1); + mesa_logi(" %u..%u: backing=%p:%u..%u\n", span_first_va_page, va_page - 1, span_backing, + span_first_backing_page, + span_first_backing_page + (va_page - span_first_va_page) - 1); span_backing = NULL; } @@ -963,12 +961,12 @@ sparse_dump(struct amdgpu_bo_sparse *bo, const char *func) va_page++; } - fprintf(stderr, "Backing:\n"); + mesa_logi("Backing:\n"); list_for_each_entry(struct amdgpu_sparse_backing, backing, &bo->backing, list) { - fprintf(stderr, " %p (size=%"PRIu64")\n", backing, backing->bo->b.base.size); + mesa_logi(" %p (size=%"PRIu64")\n", backing, backing->bo->b.base.size); for (unsigned i = 0; i < backing->num_chunks; ++i) - fprintf(stderr, " %u..%u\n", backing->chunks[i].begin, backing->chunks[i].end); + mesa_logi(" %u..%u\n", backing->chunks[i].begin, backing->chunks[i].end); } } #endif diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_userq.c b/src/gallium/winsys/amdgpu/drm/amdgpu_userq.c index 276addbddeb..9355e0d2e60 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_userq.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_userq.c @@ -8,6 +8,7 @@ #include "amdgpu_cs.h" #include "ac_linux_drm.h" #include "sid.h" +#include "util/log.h" static void update_vm_timeline_point_to_wait(uint64_t *vm_timeline_point_to_wait, struct pb_buffer_lean *_buf) @@ -96,7 +97,7 @@ amdgpu_userq_deinit(struct amdgpu_winsys *aws, struct amdgpu_userq *userq) radeon_bo_reference(&aws->dummy_sws.base, &userq->sdma_data.csa_bo, NULL); break; default: - fprintf(stderr, "amdgpu: userq unsupported for ip = %d\n", userq->ip_type); + mesa_loge("amdgpu: userq unsupported for ip = %d\n", userq->ip_type); } } @@ -177,7 +178,7 @@ amdgpu_userq_init(struct amdgpu_winsys *aws, struct amdgpu_userq *userq, enum am update_vm_timeline_point_to_wait(&vm_timeline_point_to_wait, userq->sdma_data.csa_bo); break; default: - fprintf(stderr, "amdgpu: userq unsupported for ip = %d\n", userq->ip_type); + mesa_loge("amdgpu: userq unsupported for ip = %d\n", userq->ip_type); goto fail; } @@ -197,7 +198,7 @@ amdgpu_userq_init(struct amdgpu_winsys *aws, struct amdgpu_userq *userq, enum am INT64_MAX, DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL | DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT, NULL); if (r) { - fprintf(stderr, "amdgpu: waiting for vm fences failed\n"); + mesa_loge("amdgpu: waiting for vm fences failed\n"); goto fail; } @@ -221,7 +222,7 @@ amdgpu_userq_init(struct amdgpu_winsys *aws, struct amdgpu_userq *userq, enum am } if (r) { - fprintf(stderr, "amdgpu: failed to create userq\n"); + mesa_loge("amdgpu: failed to create userq\n"); goto fail; } diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c index 1150b55f2c8..e15fd24bdeb 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c @@ -15,6 +15,7 @@ #include "util/u_cpu_detect.h" #include "util/u_hash_table.h" #include "util/hash_table.h" +#include "util/log.h" #include "util/thread_sched.h" #include "util/xmlconfig.h" #include "drm-uapi/amdgpu_drm.h" @@ -37,13 +38,13 @@ static bool do_winsys_init(struct amdgpu_winsys *aws, int fd) { if (ac_query_gpu_info(fd, aws->dev, &aws->info, false) != AC_QUERY_GPU_INFO_SUCCESS) { - fprintf(stderr, "amdgpu: ac_query_gpu_info failed.\n"); + mesa_loge("amdgpu: ac_query_gpu_info failed.\n"); goto fail; } aws->addrlib = ac_addrlib_create(&aws->info, &aws->info.max_alignment); if (!aws->addrlib) { - fprintf(stderr, "amdgpu: Cannot create addrlib.\n"); + mesa_loge("amdgpu: Cannot create addrlib.\n"); goto fail; } @@ -400,8 +401,7 @@ amdgpu_winsys_create(int fd, const struct pipe_screen_config *config, * for the same fd. */ r = ac_drm_device_initialize(fd, is_virtio, &drm_major, &drm_minor, &dev); if (r) { - fprintf(stderr, "amdgpu: amd%s_device_initialize failed.\n", - is_virtio ? "vgpu" : "gpu"); + mesa_loge("amdgpu: amd%s_device_initialize failed.\n", is_virtio ? "vgpu" : "gpu"); goto fail; }