diff --git a/amdgpu.c b/amdgpu.c index 47ffcf5..989ffa6 100644 --- a/amdgpu.c +++ b/amdgpu.c @@ -278,7 +278,7 @@ static int sdma_copy(struct amdgpu_priv *priv, int fd, uint32_t src_handle, uint ret = drmCommandWriteRead(fd, DRM_AMDGPU_CS, &cs, sizeof(cs)); if (ret) { - drv_log("SDMA copy command buffer submission failed %d\n", ret); + drv_loge("SDMA copy command buffer submission failed %d\n", ret); goto unmap_dst; } @@ -289,9 +289,9 @@ static int sdma_copy(struct amdgpu_priv *priv, int fd, uint32_t src_handle, uint ret = drmCommandWriteRead(fd, DRM_AMDGPU_WAIT_CS, &wait_cs, sizeof(wait_cs)); if (ret) { - drv_log("Could not wait for CS to finish\n"); + drv_loge("Could not wait for CS to finish\n"); } else if (wait_cs.out.status) { - drv_log("Infinite wait timed out, likely GPU hang.\n"); + drv_loge("Infinite wait timed out, likely GPU hang.\n"); ret = -ENODEV; } @@ -380,7 +380,7 @@ static int amdgpu_init(struct driver *drv) /* Continue on failure, as we can still succesfully map things without SDMA. */ if (sdma_init(priv, drv_get_fd(drv))) - drv_log("SDMA init failed\n"); + drv_loge("SDMA init failed\n"); metadata.tiling = TILE_TYPE_LINEAR; metadata.priority = 1; @@ -691,7 +691,7 @@ static void *amdgpu_map_bo(struct bo *bo, struct vma *vma, size_t plane, uint32_ ret = drmCommandWriteRead(bo->drv->fd, DRM_AMDGPU_GEM_CREATE, &gem_create, sizeof(gem_create)); if (ret < 0) { - drv_log("GEM create failed\n"); + drv_loge("GEM create failed\n"); free(priv); return MAP_FAILED; } @@ -702,7 +702,7 @@ static void *amdgpu_map_bo(struct bo *bo, struct vma *vma, size_t plane, uint32_ ret = sdma_copy(bo->drv->priv, bo->drv->fd, bo->handles[0].u32, priv->handle, bo_info.bo_size); if (ret) { - drv_log("SDMA copy for read failed\n"); + drv_loge("SDMA copy for read failed\n"); goto fail; } } @@ -710,7 +710,7 @@ static void *amdgpu_map_bo(struct bo *bo, struct vma *vma, size_t plane, uint32_ gem_map.in.handle = handle; ret = drmIoctl(bo->drv->fd, DRM_IOCTL_AMDGPU_GEM_MMAP, &gem_map); if (ret) { - drv_log("DRM_IOCTL_AMDGPU_GEM_MMAP failed\n"); + drv_loge("DRM_IOCTL_AMDGPU_GEM_MMAP failed\n"); goto fail; } @@ -775,12 +775,12 @@ static int amdgpu_bo_invalidate(struct bo *bo, struct mapping *mapping) sizeof(wait_idle)); if (ret < 0) { - drv_log("DRM_AMDGPU_GEM_WAIT_IDLE failed with %d\n", ret); + drv_loge("DRM_AMDGPU_GEM_WAIT_IDLE failed with %d\n", ret); return ret; } if (ret == 0 && wait_idle.out.status) - drv_log("DRM_AMDGPU_GEM_WAIT_IDLE BO is busy\n"); + drv_loge("DRM_AMDGPU_GEM_WAIT_IDLE BO is busy\n"); return 0; } diff --git a/dri.c b/dri.c index 7257c31..e4bf85d 100644 --- a/dri.c +++ b/dri.c @@ -78,7 +78,7 @@ static void close_gem_handle(uint32_t handle, int fd) gem_close.handle = handle; ret = drmIoctl(fd, DRM_IOCTL_GEM_CLOSE, &gem_close); if (ret) - drv_log("DRM_IOCTL_GEM_CLOSE failed (handle=%x) error %d\n", handle, ret); + drv_loge("DRM_IOCTL_GEM_CLOSE failed (handle=%x) error %d\n", handle, ret); } /* @@ -135,7 +135,7 @@ static int import_into_minigbm(struct dri_driver *dri, struct bo *bo) close(prime_fd); if (ret) { - drv_log("drmPrimeFDToHandle failed with %s\n", strerror(errno)); + drv_loge("drmPrimeFDToHandle failed with %s\n", strerror(errno)); goto cleanup; } diff --git a/drv.c b/drv.c index 7a5a5f7..9cfdbfb 100644 --- a/drv.c +++ b/drv.c @@ -258,7 +258,7 @@ static void drv_bo_mapping_destroy(struct bo *bo) if (ret) { pthread_mutex_unlock(&drv->mappings_lock); assert(ret); - drv_log("munmap failed\n"); + drv_loge("munmap failed\n"); return; } @@ -438,7 +438,7 @@ struct bo *drv_bo_import(struct driver *drv, struct drv_import_fd_data *data) seek_end = lseek(data->fds[plane], 0, SEEK_END); if (seek_end == (off_t)(-1)) { - drv_log("lseek() failed with %s\n", strerror(errno)); + drv_loge("lseek() failed with %s\n", strerror(errno)); goto destroy_bo; } @@ -449,7 +449,7 @@ struct bo *drv_bo_import(struct driver *drv, struct drv_import_fd_data *data) bo->meta.sizes[plane] = data->offsets[plane + 1] - data->offsets[plane]; if ((int64_t)bo->meta.offsets[plane] + bo->meta.sizes[plane] > seek_end) { - drv_log("buffer size is too large.\n"); + drv_loge("buffer size is too large.\n"); goto destroy_bo; } @@ -660,7 +660,7 @@ int drv_bo_get_plane_fd(struct bo *bo, size_t plane) ret = drmPrimeHandleToFD(bo->drv->fd, bo->handles[plane].u32, DRM_CLOEXEC, &fd); if (ret) - drv_log("Failed to get plane fd: %s\n", strerror(errno)); + drv_loge("Failed to get plane fd: %s\n", strerror(errno)); return (ret) ? ret : fd; } diff --git a/drv.h b/drv.h index 0f72c25..52562ec 100644 --- a/drv.h +++ b/drv.h @@ -223,9 +223,6 @@ enum drv_log_level { #define drv_logd(format, ...) _drv_log(DRV_LOGD, format, ##__VA_ARGS__) #define drv_logi(format, ...) _drv_log(DRV_LOGI, format, ##__VA_ARGS__) -/* for backward compability purpose */ -#define drv_log(format, ...) _drv_log(DRV_LOGE, format, ##__VA_ARGS__) - __attribute__((format(printf, 5, 6))) void drv_log_prefix(enum drv_log_level level, const char *prefix, const char *file, int line, const char *format, ...); diff --git a/drv_helpers.c b/drv_helpers.c index 6ea4b8e..7d0cebe 100644 --- a/drv_helpers.c +++ b/drv_helpers.c @@ -163,7 +163,7 @@ static const struct planar_layout *layout_from_format(uint32_t format) return &packed_8bpp_layout; default: - drv_log("UNKNOWN FORMAT %d\n", format); + drv_loge("UNKNOWN FORMAT %d\n", format); return NULL; } } @@ -361,7 +361,7 @@ int drv_dumb_bo_create_ex(struct bo *bo, uint32_t width, uint32_t height, uint32 ret = drmIoctl(bo->drv->fd, DRM_IOCTL_MODE_CREATE_DUMB, &create_dumb); if (ret) { - drv_log("DRM_IOCTL_MODE_CREATE_DUMB failed (%d, %d)\n", bo->drv->fd, errno); + drv_loge("DRM_IOCTL_MODE_CREATE_DUMB failed (%d, %d)\n", bo->drv->fd, errno); return -errno; } @@ -388,7 +388,7 @@ int drv_dumb_bo_destroy(struct bo *bo) destroy_dumb.handle = bo->handles[0].u32; ret = drmIoctl(bo->drv->fd, DRM_IOCTL_MODE_DESTROY_DUMB, &destroy_dumb); if (ret) { - drv_log("DRM_IOCTL_MODE_DESTROY_DUMB failed (handle=%x)\n", bo->handles[0].u32); + drv_loge("DRM_IOCTL_MODE_DESTROY_DUMB failed (handle=%x)\n", bo->handles[0].u32); return -errno; } @@ -414,8 +414,8 @@ int drv_gem_bo_destroy(struct bo *bo) ret = drmIoctl(bo->drv->fd, DRM_IOCTL_GEM_CLOSE, &gem_close); if (ret) { - drv_log("DRM_IOCTL_GEM_CLOSE failed (handle=%x) error %d\n", - bo->handles[plane].u32, ret); + drv_loge("DRM_IOCTL_GEM_CLOSE failed (handle=%x) error %d\n", + bo->handles[plane].u32, ret); error = -errno; } } @@ -436,7 +436,7 @@ int drv_prime_bo_import(struct bo *bo, struct drv_import_fd_data *data) ret = drmIoctl(bo->drv->fd, DRM_IOCTL_PRIME_FD_TO_HANDLE, &prime_handle); if (ret) { - drv_log("DRM_IOCTL_PRIME_FD_TO_HANDLE failed (fd=%u)\n", prime_handle.fd); + drv_loge("DRM_IOCTL_PRIME_FD_TO_HANDLE failed (fd=%u)\n", prime_handle.fd); /* * Need to call GEM close on planes that were opened, @@ -467,7 +467,7 @@ void *drv_dumb_bo_map(struct bo *bo, struct vma *vma, size_t plane, uint32_t map ret = drmIoctl(bo->drv->fd, DRM_IOCTL_MODE_MAP_DUMB, &map_dumb); if (ret) { - drv_log("DRM_IOCTL_MODE_MAP_DUMB failed\n"); + drv_loge("DRM_IOCTL_MODE_MAP_DUMB failed\n"); return MAP_FAILED; } diff --git a/i915.c b/i915.c index 1f7e13d..5ed6edc 100644 --- a/i915.c +++ b/i915.c @@ -363,7 +363,7 @@ static int i915_init(struct driver *drv) get_param.value = &(i915->device_id); ret = drmIoctl(drv->fd, DRM_IOCTL_I915_GETPARAM, &get_param); if (ret) { - drv_log("Failed to get I915_PARAM_CHIPSET_ID\n"); + drv_loge("Failed to get I915_PARAM_CHIPSET_ID\n"); free(i915); return -EINVAL; } @@ -377,7 +377,7 @@ static int i915_init(struct driver *drv) get_param.value = &i915->has_llc; ret = drmIoctl(drv->fd, DRM_IOCTL_I915_GETPARAM, &get_param); if (ret) { - drv_log("Failed to get I915_PARAM_HAS_LLC\n"); + drv_loge("Failed to get I915_PARAM_HAS_LLC\n"); free(i915); return -EINVAL; } @@ -647,8 +647,8 @@ static int i915_bo_create_from_metadata(struct bo *bo) ret = drmIoctl(bo->drv->fd, DRM_IOCTL_I915_GEM_CREATE_EXT, &create_ext); if (ret) { - drv_log("DRM_IOCTL_I915_GEM_CREATE_EXT failed (size=%llu) (ret=%d) \n", - create_ext.size, ret); + drv_loge("DRM_IOCTL_I915_GEM_CREATE_EXT failed (size=%llu) (ret=%d) \n", + create_ext.size, ret); return -errno; } @@ -658,7 +658,7 @@ static int i915_bo_create_from_metadata(struct bo *bo) gem_create.size = bo->meta.total_size; ret = drmIoctl(bo->drv->fd, DRM_IOCTL_I915_GEM_CREATE, &gem_create); if (ret) { - drv_log("DRM_IOCTL_I915_GEM_CREATE failed (size=%llu)\n", gem_create.size); + drv_loge("DRM_IOCTL_I915_GEM_CREATE failed (size=%llu)\n", gem_create.size); return -errno; } @@ -678,7 +678,7 @@ static int i915_bo_create_from_metadata(struct bo *bo) gem_close.handle = bo->handles[0].u32; drmIoctl(bo->drv->fd, DRM_IOCTL_GEM_CLOSE, &gem_close); - drv_log("DRM_IOCTL_I915_GEM_SET_TILING failed with %d\n", errno); + drv_loge("DRM_IOCTL_I915_GEM_SET_TILING failed with %d\n", errno); return -errno; } @@ -709,7 +709,7 @@ static int i915_bo_import(struct bo *bo, struct drv_import_fd_data *data) ret = drmIoctl(bo->drv->fd, DRM_IOCTL_I915_GEM_GET_TILING, &gem_get_tiling); if (ret) { drv_gem_bo_destroy(bo); - drv_log("DRM_IOCTL_I915_GEM_GET_TILING failed.\n"); + drv_loge("DRM_IOCTL_I915_GEM_GET_TILING failed.\n"); return ret; } @@ -765,7 +765,7 @@ static void *i915_bo_map(struct bo *bo, struct vma *vma, size_t plane, uint32_t gem_map.handle = bo->handles[0].u32; ret = drmIoctl(bo->drv->fd, DRM_IOCTL_I915_GEM_MMAP_GTT, &gem_map); if (ret) { - drv_log("DRM_IOCTL_I915_GEM_MMAP_GTT failed\n"); + drv_loge("DRM_IOCTL_I915_GEM_MMAP_GTT failed\n"); return MAP_FAILED; } @@ -774,7 +774,7 @@ static void *i915_bo_map(struct bo *bo, struct vma *vma, size_t plane, uint32_t } if (addr == MAP_FAILED) { - drv_log("i915 GEM mmap failed\n"); + drv_loge("i915 GEM mmap failed\n"); return addr; } @@ -800,7 +800,7 @@ static int i915_bo_invalidate(struct bo *bo, struct mapping *mapping) ret = drmIoctl(bo->drv->fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, &set_domain); if (ret) { - drv_log("DRM_IOCTL_I915_GEM_SET_DOMAIN with %d\n", ret); + drv_loge("DRM_IOCTL_I915_GEM_SET_DOMAIN with %d\n", ret); return ret; } diff --git a/mediatek.c b/mediatek.c index 562b1d1..03bfc47 100644 --- a/mediatek.c +++ b/mediatek.c @@ -149,7 +149,7 @@ static int mediatek_bo_create_with_modifiers(struct bo *bo, uint32_t width, uint if (!drv_has_modifier(modifiers, count, DRM_FORMAT_MOD_LINEAR)) { errno = EINVAL; - drv_log("no usable modifier found\n"); + drv_loge("no usable modifier found\n"); return -EINVAL; } @@ -195,7 +195,7 @@ static int mediatek_bo_create_with_modifiers(struct bo *bo, uint32_t width, uint ret = drmIoctl(bo->drv->fd, DRM_IOCTL_MTK_GEM_CREATE, &gem_create); if (ret) { - drv_log("DRM_IOCTL_MTK_GEM_CREATE failed (size=%" PRIu64 ")\n", gem_create.size); + drv_loge("DRM_IOCTL_MTK_GEM_CREATE failed (size=%" PRIu64 ")\n", gem_create.size); return -errno; } @@ -224,13 +224,13 @@ static void *mediatek_bo_map(struct bo *bo, struct vma *vma, size_t plane, uint3 ret = drmIoctl(bo->drv->fd, DRM_IOCTL_MTK_GEM_MAP_OFFSET, &gem_map); if (ret) { - drv_log("DRM_IOCTL_MTK_GEM_MAP_OFFSET failed\n"); + drv_loge("DRM_IOCTL_MTK_GEM_MAP_OFFSET failed\n"); return MAP_FAILED; } prime_fd = drv_bo_get_plane_fd(bo, 0); if (prime_fd < 0) { - drv_log("Failed to get a prime fd\n"); + drv_loge("Failed to get a prime fd\n"); return MAP_FAILED; } @@ -303,7 +303,7 @@ static int mediatek_bo_invalidate(struct bo *bo, struct mapping *mapping) poll(&fds, 1, -1); if (fds.revents != fds.events) - drv_log("poll prime_fd failed\n"); + drv_loge("poll prime_fd failed\n"); if (priv->cached_addr) memcpy(priv->cached_addr, priv->gem_addr, bo->meta.total_size); diff --git a/msm.c b/msm.c index 790a275..fbe2a6b 100644 --- a/msm.c +++ b/msm.c @@ -204,7 +204,7 @@ static bool should_avoid_ubwc(void) * See b/163137550 */ if (dlsym(RTLD_DEFAULT, "waffle_display_connect")) { - drv_log("WARNING: waffle detected, disabling UBWC\n"); + drv_logi("WARNING: waffle detected, disabling UBWC\n"); return true; } @@ -219,7 +219,7 @@ static bool should_avoid_ubwc(void) * See b/229147702 */ if (!dlsym(RTLD_DEFAULT, "cupsFilePrintf")) { - drv_log("WARNING: virtualization detected, disabling UBWC\n"); + drv_logi("WARNING: virtualization detected, disabling UBWC\n"); return true; } #endif @@ -314,7 +314,7 @@ static int msm_bo_create_for_modifier(struct bo *bo, uint32_t width, uint32_t he ret = drmIoctl(bo->drv->fd, DRM_IOCTL_MSM_GEM_NEW, &req); if (ret) { - drv_log("DRM_IOCTL_MSM_GEM_NEW failed with %s\n", strerror(errno)); + drv_loge("DRM_IOCTL_MSM_GEM_NEW failed with %s\n", strerror(errno)); return -errno; } @@ -353,7 +353,7 @@ static int msm_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_ struct combination *combo = drv_get_combination(bo->drv, format, flags); if (!combo) { - drv_log("invalid format = %d, flags = %" PRIx64 " combination\n", format, flags); + drv_loge("invalid format = %d, flags = %" PRIx64 " combination\n", format, flags); return -EINVAL; } @@ -368,7 +368,7 @@ static void *msm_bo_map(struct bo *bo, struct vma *vma, size_t plane, uint32_t m req.handle = bo->handles[0].u32; ret = drmIoctl(bo->drv->fd, DRM_IOCTL_MSM_GEM_INFO, &req); if (ret) { - drv_log("DRM_IOCLT_MSM_GEM_INFO failed with %s\n", strerror(errno)); + drv_loge("DRM_IOCLT_MSM_GEM_INFO failed with %s\n", strerror(errno)); return MAP_FAILED; } vma->length = bo->meta.total_size; diff --git a/rockchip.c b/rockchip.c index 6d25e3a..11f02d7 100644 --- a/rockchip.c +++ b/rockchip.c @@ -148,7 +148,7 @@ static int rockchip_bo_create_with_modifiers(struct bo *bo, uint32_t width, uint } else { if (!drv_has_modifier(modifiers, count, DRM_FORMAT_MOD_LINEAR)) { errno = EINVAL; - drv_log("no usable modifier found\n"); + drv_loge("no usable modifier found\n"); return -errno; } @@ -172,8 +172,8 @@ static int rockchip_bo_create_with_modifiers(struct bo *bo, uint32_t width, uint ret = drmIoctl(bo->drv->fd, DRM_IOCTL_ROCKCHIP_GEM_CREATE, &gem_create); if (ret) { - drv_log("DRM_IOCTL_ROCKCHIP_GEM_CREATE failed (size=%" PRIu64 ")\n", - gem_create.size); + drv_loge("DRM_IOCTL_ROCKCHIP_GEM_CREATE failed (size=%" PRIu64 ")\n", + gem_create.size); return -errno; } @@ -207,7 +207,7 @@ static void *rockchip_bo_map(struct bo *bo, struct vma *vma, size_t plane, uint3 gem_map.handle = bo->handles[0].u32; ret = drmIoctl(bo->drv->fd, DRM_IOCTL_ROCKCHIP_GEM_MAP_OFFSET, &gem_map); if (ret) { - drv_log("DRM_IOCTL_ROCKCHIP_GEM_MAP_OFFSET failed\n"); + drv_loge("DRM_IOCTL_ROCKCHIP_GEM_MAP_OFFSET failed\n"); return MAP_FAILED; } diff --git a/vc4.c b/vc4.c index 820e4fe..48f0870 100644 --- a/vc4.c +++ b/vc4.c @@ -52,7 +52,7 @@ static int vc4_bo_create_for_modifier(struct bo *bo, uint32_t width, uint32_t he case DRM_FORMAT_MOD_LINEAR: break; case DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED: - drv_log("DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED not supported yet\n"); + drv_loge("DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED not supported yet\n"); return -EINVAL; default: return -EINVAL; @@ -70,7 +70,7 @@ static int vc4_bo_create_for_modifier(struct bo *bo, uint32_t width, uint32_t he ret = drmIoctl(bo->drv->fd, DRM_IOCTL_VC4_CREATE_BO, &bo_create); if (ret) { - drv_log("DRM_IOCTL_VC4_CREATE_BO failed (size=%zu)\n", bo->meta.total_size); + drv_loge("DRM_IOCTL_VC4_CREATE_BO failed (size=%zu)\n", bo->meta.total_size); return -errno; } @@ -113,7 +113,7 @@ static void *vc4_bo_map(struct bo *bo, struct vma *vma, size_t plane, uint32_t m bo_map.handle = bo->handles[0].u32; ret = drmCommandWriteRead(bo->drv->fd, DRM_VC4_MMAP_BO, &bo_map, sizeof(bo_map)); if (ret) { - drv_log("DRM_VC4_MMAP_BO failed\n"); + drv_loge("DRM_VC4_MMAP_BO failed\n"); return MAP_FAILED; } diff --git a/virtgpu_cross_domain.c b/virtgpu_cross_domain.c index cc3cea4..83c0ed8 100644 --- a/virtgpu_cross_domain.c +++ b/virtgpu_cross_domain.c @@ -53,8 +53,8 @@ static void cross_domain_release_private(struct driver *drv) ret = drmIoctl(drv->fd, DRM_IOCTL_GEM_CLOSE, &gem_close); if (ret) { - drv_log("DRM_IOCTL_GEM_CLOSE failed (handle=%x) error %d\n", - priv->ring_handle, ret); + drv_loge("DRM_IOCTL_GEM_CLOSE failed (handle=%x) error %d\n", + priv->ring_handle, ret); } } @@ -121,7 +121,7 @@ static int cross_domain_submit_cmd(struct driver *drv, uint32_t *cmd, uint32_t c ret = drmIoctl(drv->fd, DRM_IOCTL_VIRTGPU_EXECBUFFER, &exec); if (ret < 0) { - drv_log("DRM_IOCTL_VIRTGPU_EXECBUFFER failed with %s\n", strerror(errno)); + drv_loge("DRM_IOCTL_VIRTGPU_EXECBUFFER failed with %s\n", strerror(errno)); return -EINVAL; } @@ -132,7 +132,7 @@ static int cross_domain_submit_cmd(struct driver *drv, uint32_t *cmd, uint32_t c } if (ret < 0) { - drv_log("DRM_IOCTL_VIRTGPU_WAIT failed with %s\n", strerror(errno)); + drv_loge("DRM_IOCTL_VIRTGPU_WAIT failed with %s\n", strerror(errno)); return ret; } @@ -266,7 +266,7 @@ static int cross_domain_init(struct driver *drv) ret = drmIoctl(drv->fd, DRM_IOCTL_VIRTGPU_GET_CAPS, &args); if (ret) { - drv_log("DRM_IOCTL_VIRTGPU_GET_CAPS failed with %s\n", strerror(errno)); + drv_loge("DRM_IOCTL_VIRTGPU_GET_CAPS failed with %s\n", strerror(errno)); goto free_private; } @@ -289,7 +289,7 @@ static int cross_domain_init(struct driver *drv) init.num_params = 2; ret = drmIoctl(drv->fd, DRM_IOCTL_VIRTGPU_CONTEXT_INIT, &init); if (ret) { - drv_log("DRM_IOCTL_VIRTGPU_CONTEXT_INIT failed with %s\n", strerror(errno)); + drv_loge("DRM_IOCTL_VIRTGPU_CONTEXT_INIT failed with %s\n", strerror(errno)); goto free_private; } @@ -300,7 +300,7 @@ static int cross_domain_init(struct driver *drv) ret = drmIoctl(drv->fd, DRM_IOCTL_VIRTGPU_RESOURCE_CREATE_BLOB, &drm_rc_blob); if (ret < 0) { - drv_log("DRM_VIRTGPU_RESOURCE_CREATE_BLOB failed with %s\n", strerror(errno)); + drv_loge("DRM_VIRTGPU_RESOURCE_CREATE_BLOB failed with %s\n", strerror(errno)); goto free_private; } @@ -310,7 +310,7 @@ static int cross_domain_init(struct driver *drv) map.handle = priv->ring_handle; ret = drmIoctl(drv->fd, DRM_IOCTL_VIRTGPU_MAP, &map); if (ret < 0) { - drv_log("DRM_IOCTL_VIRTGPU_MAP failed with %s\n", strerror(errno)); + drv_loge("DRM_IOCTL_VIRTGPU_MAP failed with %s\n", strerror(errno)); goto free_private; } @@ -318,7 +318,7 @@ static int cross_domain_init(struct driver *drv) mmap(0, PAGE_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, drv->fd, map.offset); if (priv->ring_addr == MAP_FAILED) { - drv_log("mmap failed with %s\n", strerror(errno)); + drv_loge("mmap failed with %s\n", strerror(errno)); goto free_private; } @@ -353,7 +353,7 @@ static int cross_domain_bo_create(struct bo *bo, uint32_t width, uint32_t height ret = cross_domain_metadata_query(bo->drv, &bo->meta); if (ret < 0) { - drv_log("Metadata query failed"); + drv_loge("Metadata query failed"); return ret; } @@ -380,7 +380,7 @@ static int cross_domain_bo_create(struct bo *bo, uint32_t width, uint32_t height ret = drmIoctl(bo->drv->fd, DRM_IOCTL_VIRTGPU_RESOURCE_CREATE_BLOB, &drm_rc_blob); if (ret < 0) { - drv_log("DRM_VIRTGPU_RESOURCE_CREATE_BLOB failed with %s\n", strerror(errno)); + drv_loge("DRM_VIRTGPU_RESOURCE_CREATE_BLOB failed with %s\n", strerror(errno)); return -errno; } @@ -398,7 +398,7 @@ static void *cross_domain_bo_map(struct bo *bo, struct vma *vma, size_t plane, u gem_map.handle = bo->handles[0].u32; ret = drmIoctl(bo->drv->fd, DRM_IOCTL_VIRTGPU_MAP, &gem_map); if (ret) { - drv_log("DRM_IOCTL_VIRTGPU_MAP failed with %s\n", strerror(errno)); + drv_loge("DRM_IOCTL_VIRTGPU_MAP failed with %s\n", strerror(errno)); return MAP_FAILED; } diff --git a/virtgpu_virgl.c b/virtgpu_virgl.c index 33cb997..d9a3915 100644 --- a/virtgpu_virgl.c +++ b/virtgpu_virgl.c @@ -97,7 +97,7 @@ static uint32_t translate_format(uint32_t drm_fourcc) case DRM_FORMAT_YVU420_ANDROID: return VIRGL_FORMAT_YV12; default: - drv_log("Unhandled format:%d\n", drm_fourcc); + drv_loge("Unhandled format:%d\n", drm_fourcc); return 0; } } @@ -439,7 +439,7 @@ static uint32_t compute_virgl_bind_flags(uint64_t use_flags, uint32_t format) VIRGL_BIND_MINIGBM_HW_VIDEO_ENCODER); if (use_flags) - drv_log("Unhandled bo use flag: %llx\n", (unsigned long long)use_flags); + drv_loge("Unhandled bo use flag: %llx\n", (unsigned long long)use_flags); return bind; } @@ -495,7 +495,7 @@ static int virgl_3d_bo_create(struct bo *bo, uint32_t width, uint32_t height, ui res_create.size = ALIGN(bo->meta.total_size, PAGE_SIZE); // PAGE_SIZE = 0x1000 ret = drmIoctl(bo->drv->fd, DRM_IOCTL_VIRTGPU_RESOURCE_CREATE, &res_create); if (ret) { - drv_log("DRM_IOCTL_VIRTGPU_RESOURCE_CREATE failed with %s\n", strerror(errno)); + drv_loge("DRM_IOCTL_VIRTGPU_RESOURCE_CREATE failed with %s\n", strerror(errno)); return ret; } @@ -513,7 +513,7 @@ static void *virgl_3d_bo_map(struct bo *bo, struct vma *vma, size_t plane, uint3 gem_map.handle = bo->handles[0].u32; ret = drmIoctl(bo->drv->fd, DRM_IOCTL_VIRTGPU_MAP, &gem_map); if (ret) { - drv_log("DRM_IOCTL_VIRTGPU_MAP failed with %s\n", strerror(errno)); + drv_loge("DRM_IOCTL_VIRTGPU_MAP failed with %s\n", strerror(errno)); return MAP_FAILED; } @@ -550,7 +550,7 @@ static int virgl_get_caps(struct driver *drv, union virgl_caps *caps, int *caps_ ret = drmIoctl(drv->fd, DRM_IOCTL_VIRTGPU_GET_CAPS, &cap_args); if (ret) { - drv_log("DRM_IOCTL_VIRTGPU_GET_CAPS failed with %s\n", strerror(errno)); + drv_loge("DRM_IOCTL_VIRTGPU_GET_CAPS failed with %s\n", strerror(errno)); *caps_is_v2 = 0; // Fallback to v1 @@ -559,7 +559,7 @@ static int virgl_get_caps(struct driver *drv, union virgl_caps *caps, int *caps_ ret = drmIoctl(drv->fd, DRM_IOCTL_VIRTGPU_GET_CAPS, &cap_args); if (ret) - drv_log("DRM_IOCTL_VIRTGPU_GET_CAPS failed with %s\n", strerror(errno)); + drv_loge("DRM_IOCTL_VIRTGPU_GET_CAPS failed with %s\n", strerror(errno)); } return ret; @@ -717,7 +717,7 @@ static int virgl_bo_create_blob(struct driver *drv, struct bo *bo) ret = drmIoctl(drv->fd, DRM_IOCTL_VIRTGPU_RESOURCE_CREATE_BLOB, &drm_rc_blob); if (ret < 0) { - drv_log("DRM_VIRTGPU_RESOURCE_CREATE_BLOB failed with %s\n", strerror(errno)); + drv_loge("DRM_VIRTGPU_RESOURCE_CREATE_BLOB failed with %s\n", strerror(errno)); return -errno; } @@ -862,8 +862,8 @@ static int virgl_bo_invalidate(struct bo *bo, struct mapping *mapping) ret = drmIoctl(bo->drv->fd, DRM_IOCTL_VIRTGPU_TRANSFER_FROM_HOST, &xfer); if (ret) { - drv_log("DRM_IOCTL_VIRTGPU_TRANSFER_FROM_HOST failed with %s\n", - strerror(errno)); + drv_loge("DRM_IOCTL_VIRTGPU_TRANSFER_FROM_HOST failed with %s\n", + strerror(errno)); return -errno; } } @@ -874,7 +874,7 @@ static int virgl_bo_invalidate(struct bo *bo, struct mapping *mapping) waitcmd.handle = mapping->vma->handle; ret = drmIoctl(bo->drv->fd, DRM_IOCTL_VIRTGPU_WAIT, &waitcmd); if (ret) { - drv_log("DRM_IOCTL_VIRTGPU_WAIT failed with %s\n", strerror(errno)); + drv_loge("DRM_IOCTL_VIRTGPU_WAIT failed with %s\n", strerror(errno)); return -errno; } @@ -938,8 +938,8 @@ static int virgl_bo_flush(struct bo *bo, struct mapping *mapping) ret = drmIoctl(bo->drv->fd, DRM_IOCTL_VIRTGPU_TRANSFER_TO_HOST, &xfer); if (ret) { - drv_log("DRM_IOCTL_VIRTGPU_TRANSFER_TO_HOST failed with %s\n", - strerror(errno)); + drv_loge("DRM_IOCTL_VIRTGPU_TRANSFER_TO_HOST failed with %s\n", + strerror(errno)); return -errno; } } @@ -953,7 +953,7 @@ static int virgl_bo_flush(struct bo *bo, struct mapping *mapping) ret = drmIoctl(bo->drv->fd, DRM_IOCTL_VIRTGPU_WAIT, &waitcmd); if (ret) { - drv_log("DRM_IOCTL_VIRTGPU_WAIT failed with %s\n", strerror(errno)); + drv_loge("DRM_IOCTL_VIRTGPU_WAIT failed with %s\n", strerror(errno)); return -errno; } } @@ -1065,7 +1065,7 @@ static int virgl_resource_info(struct bo *bo, uint32_t strides[DRV_MAX_PLANES], res_info.type = VIRTGPU_RESOURCE_INFO_TYPE_EXTENDED; ret = drmIoctl(bo->drv->fd, DRM_IOCTL_VIRTGPU_RESOURCE_INFO_CROS, &res_info); if (ret) { - drv_log("DRM_IOCTL_VIRTGPU_RESOURCE_INFO failed with %s\n", strerror(errno)); + drv_loge("DRM_IOCTL_VIRTGPU_RESOURCE_INFO failed with %s\n", strerror(errno)); return ret; }