Skip to content

Commit

Permalink
minigbm: deprecate drv_log to favor log level
Browse files Browse the repository at this point in the history 
TEST=build

Change-Id: I3f0021bfd05eb1ab7c3b35ae2f31d806bc0a58dc
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3761446
Reviewed-by: Jason Macnak <[email protected]>
Commit-Queue: Yiwei Zhang <[email protected]>
Tested-by: Yiwei Zhang <[email protected]>
Auto-Submit: Yiwei Zhang <[email protected]>
  • Loading branch information
@zhangyiwei
zhangyiwei authored and Chromeos LUCI committed Jul 19, 2022
1 parent bfb3c78 commit 0495473
Show file tree
Hide file tree
Showing 12 changed files with 75 additions and 78 deletions.
18 changes: 9 additions & 9 deletions amdgpu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand All @@ -702,15 +702,15 @@ 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;
}
}

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;
}

Expand Down Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions dri.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/*
Expand Down Expand Up @@ -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;
}

Expand Down
8 changes: 4 additions & 4 deletions drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down Expand Up @@ -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;
}
Expand Down
3 changes: 0 additions & 3 deletions drv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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, ...);
Expand Down
14 changes: 7 additions & 7 deletions drv_helpers.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand All @@ -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;
}
}
Expand All @@ -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,
Expand Down Expand Up @@ -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;
}

Expand Down
20 changes: 10 additions & 10 deletions i915.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand All @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand All @@ -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;
}

Expand Down
10 changes: 5 additions & 5 deletions mediatek.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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);
Expand Down
10 changes: 5 additions & 5 deletions msm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions rockchip.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down
Loading

0 comments on commit 0495473

Please sign in to comment.