Re: [PATCH v3] drm: Replace the deprecated DRM_* logging macros in gem helper files

Athul Raj Kollareth
2025-08-20T14:55:35Z

On Tue, Aug 19, 2025 at 10:14:30PM +0200, Michal Wajdeczko wrote:
>
>
> On 8/19/2025 2:11 PM, Athul Raj Kollareth wrote:
> > Replace the DRM_* logging macros used in gem helper files with the appropriate
> > ones specified in /include/drm/drm_print.h.
> >
> > Signed-off-by: Athul Raj Kollareth <krathul3152@gmail.com>
> > ---
> > Changes in v3:
> > - Revert all changes to drm_gem_objects_lookup()
> > - Use drm_device as suggested in [1].
> > Changes in v2:
> > - Change drm_gem_objects_lookup() to take a drm_device* argument.
> > - Make appropriate changes to all calls of drm_gem_objects_lookup().
> >
> > [1]
> > https://lore.kernel.org/dri-devel/90f79bba-bee6-47ea-9881-9ae37eae42e0@intel.com
> > ---
> > drivers/gpu/drm/drm_gem.c | 10 +++++++---
> > drivers/gpu/drm/drm_gem_dma_helper.c | 2 +-
> > 2 files changed, 8 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
> > index 4a89b6acb6af..fbea8c50f17c 100644
> > --- a/drivers/gpu/drm/drm_gem.c
> > +++ b/drivers/gpu/drm/drm_gem.c
> > @@ -102,7 +102,7 @@ drm_gem_init(struct drm_device *dev)
> > vma_offset_manager = drmm_kzalloc(dev, sizeof(*vma_offset_manager),
> > GFP_KERNEL);
> > if (!vma_offset_manager) {
> > - DRM_ERROR("out of memory\n");
> > + drm_err(dev, "out of memory\n");
>
> IIRC we shouldn't additionally report OOM errors as there will be
> already lot of messages when we hit this
>

Okay, then I will remove it.

> > return -ENOMEM;
> > }
> >
> > @@ -787,6 +787,8 @@ int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles,
> > u32 *handles;
> > struct drm_gem_object **objs;
> >
>
> remove extra line and please run checkpatch.pl as it should catch that
>
> also consider declaring variables in reverse-xmas-tree order
>

Got it, thanks, I'll keep that in mind.

Best regards,
Athul

> > + struct drm_device *dev = filp->minor->dev;
> > +
> > if (!count)
> > return 0;
> >
> > @@ -805,7 +807,7 @@ int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles,
> >
> > if (copy_from_user(handles, bo_handles, count * sizeof(u32))) {
> > ret = -EFAULT;
> > - DRM_DEBUG("Failed to copy in GEM handles\n");
> > + drm_dbg_core(dev, "Failed to copy in GEM handles\n");
> > goto out;
> > }
> >
> > @@ -856,9 +858,11 @@ long drm_gem_dma_resv_wait(struct drm_file *filep, u32 handle,
> > long ret;
> > struct drm_gem_object *obj;
> >
>
> ditto
>
> > + struct drm_device *dev = filep->minor->dev;
> > +
> > obj = drm_gem_object_lookup(filep, handle);
> > if (!obj) {
> > - DRM_DEBUG("Failed to look up GEM BO %d\n", handle);
> > + drm_dbg_core(dev, "Failed to look up GEM BO %d\n", handle);
> > return -EINVAL;
> > }
> >
> > diff --git a/drivers/gpu/drm/drm_gem_dma_helper.c b/drivers/gpu/drm/drm_gem_dma_helper.c
> > index 4f0320df858f..a507cf517015 100644
> > --- a/drivers/gpu/drm/drm_gem_dma_helper.c
> > +++ b/drivers/gpu/drm/drm_gem_dma_helper.c
> > @@ -582,7 +582,7 @@ drm_gem_dma_prime_import_sg_table_vmap(struct drm_device *dev,
> >
> > ret = dma_buf_vmap_unlocked(attach->dmabuf, &map);
> > if (ret) {
> > - DRM_ERROR("Failed to vmap PRIME buffer\n");
> > + drm_err(dev, "Failed to vmap PRIME buffer\n");
> > return ERR_PTR(ret);
> > }
> >
>