* Re: [PATCH v2] drm: Replace the deprecated DRM_* logging macros in gem helper files
2025-08-18 19:20 ` [PATCH v2] drm: Replace the deprecated DRM_* logging macros in gem helper files Athul Raj Kollareth
@ 2025-08-18 19:42 ` Michal Wajdeczko
2025-08-19 11:16 ` Athul Raj Kollareth
` (2 more replies)
2025-08-18 19:46 ` Athul Raj K
2025-08-20 8:50 ` Thomas Zimmermann
2 siblings, 3 replies; 13+ messages in thread
From: Michal Wajdeczko @ 2025-08-18 19:42 UTC (permalink / raw)
To: Athul Raj Kollareth, tzimmermann
Cc: airlied, dri-devel, linux-kernel-mentees, linux-kernel,
maarten.lankhorst, mripard, simona, skhan
On 8/18/2025 9:20 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 v2:
> - Change drm_gem_objects_lookup() to take a drm_device* argument.
> - Make appropriate changes to all calls of drm_gem_objects_lookup().
> ---
> drivers/accel/rocket/rocket_job.c | 4 ++--
> drivers/gpu/drm/drm_gem.c | 12 +++++++-----
> drivers/gpu/drm/drm_gem_dma_helper.c | 2 +-
> drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +-
> drivers/gpu/drm/v3d/v3d_submit.c | 2 +-
> drivers/gpu/drm/vc4/vc4_gem.c | 2 +-
> include/drm/drm_gem.h | 5 +++--
> 7 files changed, 16 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/accel/rocket/rocket_job.c b/drivers/accel/rocket/rocket_job.c
> index 5d4afd692306..db7c50c9ab90 100644
> --- a/drivers/accel/rocket/rocket_job.c
> +++ b/drivers/accel/rocket/rocket_job.c
> @@ -560,14 +560,14 @@ static int rocket_ioctl_submit_job(struct drm_device *dev, struct drm_file *file
> if (ret)
> goto out_cleanup_job;
>
> - ret = drm_gem_objects_lookup(file, u64_to_user_ptr(job->in_bo_handles),
> + ret = drm_gem_objects_lookup(dev, file, u64_to_user_ptr(job->in_bo_handles),
> job->in_bo_handle_count, &rjob->in_bos);
> if (ret)
> goto out_cleanup_job;
>
> rjob->in_bo_count = job->in_bo_handle_count;
>
> - ret = drm_gem_objects_lookup(file, u64_to_user_ptr(job->out_bo_handles),
> + ret = drm_gem_objects_lookup(dev, file, u64_to_user_ptr(job->out_bo_handles),
> job->out_bo_handle_count, &rjob->out_bos);
> if (ret)
> goto out_cleanup_job;
> diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
> index 4a89b6acb6af..ee1e5ded6dd6 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");
> return -ENOMEM;
> }
>
> @@ -764,6 +764,7 @@ static int objects_lookup(struct drm_file *filp, u32 *handle, int count,
>
> /**
> * drm_gem_objects_lookup - look up GEM objects from an array of handles
> + * @dev: corresponding drm_device
> * @filp: DRM file private date
> * @bo_handles: user pointer to array of userspace handle
> * @count: size of handle array
> @@ -780,8 +781,9 @@ static int objects_lookup(struct drm_file *filp, u32 *handle, int count,
> * failure. 0 is returned on success.
> *
> */
> -int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles,
> - int count, struct drm_gem_object ***objs_out)
> +int drm_gem_objects_lookup(struct drm_device *dev, struct drm_file *filp,
> + void __user *bo_handles, int count,
> + struct drm_gem_object ***objs_out)
> {
can't we just use:
struct drm_device *dev = filp->minor->dev;
> int ret;
> u32 *handles;
> @@ -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;
> }
>
> @@ -858,7 +860,7 @@ long drm_gem_dma_resv_wait(struct drm_file *filep, u32 handle,
>
> obj = drm_gem_object_lookup(filep, handle);
> if (!obj) {
> - DRM_DEBUG("Failed to look up GEM BO %d\n", handle);
> + drm_dbg_core(NULL, "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);
> }
>
> diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c
> index 1ea6c509a5d5..3ffd9d5a9056 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_drv.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c
> @@ -188,7 +188,7 @@ panfrost_lookup_bos(struct drm_device *dev,
> if (!job->bo_count)
> return 0;
>
> - ret = drm_gem_objects_lookup(file_priv,
> + ret = drm_gem_objects_lookup(dev, file_priv,
> (void __user *)(uintptr_t)args->bo_handles,
> job->bo_count, &job->bos);
> if (ret)
> diff --git a/drivers/gpu/drm/v3d/v3d_submit.c b/drivers/gpu/drm/v3d/v3d_submit.c
> index 5171ffe9012d..a3ac8e6a4a72 100644
> --- a/drivers/gpu/drm/v3d/v3d_submit.c
> +++ b/drivers/gpu/drm/v3d/v3d_submit.c
> @@ -79,7 +79,7 @@ v3d_lookup_bos(struct drm_device *dev,
> return -EINVAL;
> }
>
> - return drm_gem_objects_lookup(file_priv,
> + return drm_gem_objects_lookup(dev, file_priv,
> (void __user *)(uintptr_t)bo_handles,
> job->bo_count, &job->bo);
> }
> diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c
> index 255e5817618e..6ce65611231b 100644
> --- a/drivers/gpu/drm/vc4/vc4_gem.c
> +++ b/drivers/gpu/drm/vc4/vc4_gem.c
> @@ -692,7 +692,7 @@ vc4_cl_lookup_bos(struct drm_device *dev,
> return -EINVAL;
> }
>
> - ret = drm_gem_objects_lookup(file_priv, u64_to_user_ptr(args->bo_handles),
> + ret = drm_gem_objects_lookup(dev, file_priv, u64_to_user_ptr(args->bo_handles),
> exec->bo_count, &exec->bo);
>
> if (ret)
> diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h
> index d3a7b43e2c63..03cb03f46524 100644
> --- a/include/drm/drm_gem.h
> +++ b/include/drm/drm_gem.h
> @@ -544,8 +544,9 @@ void drm_gem_unlock(struct drm_gem_object *obj);
> int drm_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map);
> void drm_gem_vunmap(struct drm_gem_object *obj, struct iosys_map *map);
>
> -int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles,
> - int count, struct drm_gem_object ***objs_out);
> +int drm_gem_objects_lookup(struct drm_device *dev, struct drm_file *filp,
> + void __user *bo_handles, int count,
> + struct drm_gem_object ***objs_out);
> struct drm_gem_object *drm_gem_object_lookup(struct drm_file *filp, u32 handle);
> long drm_gem_dma_resv_wait(struct drm_file *filep, u32 handle,
> bool wait_all, unsigned long timeout);
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH v2] drm: Replace the deprecated DRM_* logging macros in gem helper files
2025-08-18 19:42 ` Michal Wajdeczko
@ 2025-08-19 11:16 ` Athul Raj Kollareth
2025-08-19 12:11 ` [PATCH v3] " Athul Raj Kollareth
2025-08-20 8:48 ` [PATCH v2] " Thomas Zimmermann
2 siblings, 0 replies; 13+ messages in thread
From: Athul Raj Kollareth @ 2025-08-19 11:16 UTC (permalink / raw)
To: Michal Wajdeczko, tzimmermann
Cc: tzimmermann, airlied, dri-devel, linux-kernel-mentees,
linux-kernel, maarten.lankhorst, mripard, simona, skhan
On Mon, Aug 18, 2025 at 09:42:46PM +0200, Michal Wajdeczko wrote:
> On 8/18/2025 9:20 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 v2:
> > - Change drm_gem_objects_lookup() to take a drm_device* argument.
> > - Make appropriate changes to all calls of drm_gem_objects_lookup().
> > ---
> > drivers/accel/rocket/rocket_job.c | 4 ++--
> > drivers/gpu/drm/drm_gem.c | 12 +++++++-----
> > drivers/gpu/drm/drm_gem_dma_helper.c | 2 +-
> > drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +-
> > drivers/gpu/drm/v3d/v3d_submit.c | 2 +-
> > drivers/gpu/drm/vc4/vc4_gem.c | 2 +-
> > include/drm/drm_gem.h | 5 +++--
> > 7 files changed, 16 insertions(+), 13 deletions(-)
> >
> > diff --git a/drivers/accel/rocket/rocket_job.c b/drivers/accel/rocket/rocket_job.c
> > index 5d4afd692306..db7c50c9ab90 100644
> > --- a/drivers/accel/rocket/rocket_job.c
> > +++ b/drivers/accel/rocket/rocket_job.c
> > @@ -560,14 +560,14 @@ static int rocket_ioctl_submit_job(struct drm_device *dev, struct drm_file *file
> > if (ret)
> > goto out_cleanup_job;
> >
> > - ret = drm_gem_objects_lookup(file, u64_to_user_ptr(job->in_bo_handles),
> > + ret = drm_gem_objects_lookup(dev, file, u64_to_user_ptr(job->in_bo_handles),
> > job->in_bo_handle_count, &rjob->in_bos);
> > if (ret)
> > goto out_cleanup_job;
> >
> > rjob->in_bo_count = job->in_bo_handle_count;
> >
> > - ret = drm_gem_objects_lookup(file, u64_to_user_ptr(job->out_bo_handles),
> > + ret = drm_gem_objects_lookup(dev, file, u64_to_user_ptr(job->out_bo_handles),
> > job->out_bo_handle_count, &rjob->out_bos);
> > if (ret)
> > goto out_cleanup_job;
> > diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
> > index 4a89b6acb6af..ee1e5ded6dd6 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");
> > return -ENOMEM;
> > }
> >
> > @@ -764,6 +764,7 @@ static int objects_lookup(struct drm_file *filp, u32 *handle, int count,
> >
> > /**
> > * drm_gem_objects_lookup - look up GEM objects from an array of handles
> > + * @dev: corresponding drm_device
> > * @filp: DRM file private date
> > * @bo_handles: user pointer to array of userspace handle
> > * @count: size of handle array
> > @@ -780,8 +781,9 @@ static int objects_lookup(struct drm_file *filp, u32 *handle, int count,
> > * failure. 0 is returned on success.
> > *
> > */
> > -int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles,
> > - int count, struct drm_gem_object ***objs_out)
> > +int drm_gem_objects_lookup(struct drm_device *dev, struct drm_file *filp,
> > + void __user *bo_handles, int count,
> > + struct drm_gem_object ***objs_out)
> > {
>
> can't we just use:
>
> struct drm_device *dev = filp->minor->dev;
>
Ah, yes. I think I can use that. Thank you.
Best regards,
Athul
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH v3] drm: Replace the deprecated DRM_* logging macros in gem helper files
2025-08-18 19:42 ` Michal Wajdeczko
2025-08-19 11:16 ` Athul Raj Kollareth
@ 2025-08-19 12:11 ` Athul Raj Kollareth
2025-08-19 20:14 ` Michal Wajdeczko
2025-08-20 8:48 ` [PATCH v2] " Thomas Zimmermann
2 siblings, 1 reply; 13+ messages in thread
From: Athul Raj Kollareth @ 2025-08-19 12:11 UTC (permalink / raw)
To: michal.wajdeczko, tzimmermann
Cc: airlied, dri-devel, krathul3152, linux-kernel-mentees,
linux-kernel, maarten.lankhorst, mripard, simona, skhan
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");
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;
+ 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;
+ 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);
}
--
2.50.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH v3] drm: Replace the deprecated DRM_* logging macros in gem helper files
2025-08-19 12:11 ` [PATCH v3] " Athul Raj Kollareth
@ 2025-08-19 20:14 ` Michal Wajdeczko
2025-08-20 14:55 ` Athul Raj Kollareth
2025-08-20 15:04 ` [PATCH v4] " Athul Raj Kollareth
0 siblings, 2 replies; 13+ messages in thread
From: Michal Wajdeczko @ 2025-08-19 20:14 UTC (permalink / raw)
To: Athul Raj Kollareth, tzimmermann
Cc: airlied, dri-devel, linux-kernel-mentees, linux-kernel,
maarten.lankhorst, mripard, simona, skhan
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
> 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
> + 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);
> }
>
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH v3] drm: Replace the deprecated DRM_* logging macros in gem helper files
2025-08-19 20:14 ` Michal Wajdeczko
@ 2025-08-20 14:55 ` Athul Raj Kollareth
2025-08-20 15:04 ` [PATCH v4] " Athul Raj Kollareth
1 sibling, 0 replies; 13+ messages in thread
From: Athul Raj Kollareth @ 2025-08-20 14:55 UTC (permalink / raw)
To: Michal Wajdeczko
Cc: tzimmermann, airlied, dri-devel, linux-kernel-mentees,
linux-kernel, maarten.lankhorst, mripard, simona, skhan,
krathul3152
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);
> > }
> >
>
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH v4] drm: Replace the deprecated DRM_* logging macros in gem helper files
2025-08-19 20:14 ` Michal Wajdeczko
2025-08-20 14:55 ` Athul Raj Kollareth
@ 2025-08-20 15:04 ` Athul Raj Kollareth
1 sibling, 0 replies; 13+ messages in thread
From: Athul Raj Kollareth @ 2025-08-20 15:04 UTC (permalink / raw)
To: michal.wajdeczko
Cc: airlied, dri-devel, krathul3152, linux-kernel-mentees,
linux-kernel, maarten.lankhorst, mripard, simona, skhan,
tzimmermann
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 v4:
- Some codestyle corrections.
- Remove OOM error logging in drm_gem_init().
Changes in v3:
- Revert all changes to drm_gem_objects_lookup()
- Use drm_device as suggested in the discussion [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().
---
drivers/gpu/drm/drm_gem.c | 13 +++++++------
drivers/gpu/drm/drm_gem_dma_helper.c | 2 +-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 4a89b6acb6af..dc3d6cfa692b 100644
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -102,7 +102,6 @@ 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");
return -ENOMEM;
}
@@ -783,9 +782,10 @@ static int objects_lookup(struct drm_file *filp, u32 *handle, int count,
int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles,
int count, struct drm_gem_object ***objs_out)
{
- int ret;
- u32 *handles;
+ struct drm_device *dev = filp->minor->dev;
struct drm_gem_object **objs;
+ u32 *handles;
+ int ret;
if (!count)
return 0;
@@ -805,7 +805,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;
}
@@ -853,12 +853,13 @@ EXPORT_SYMBOL(drm_gem_object_lookup);
long drm_gem_dma_resv_wait(struct drm_file *filep, u32 handle,
bool wait_all, unsigned long timeout)
{
- long ret;
+ struct drm_device *dev = filep->minor->dev;
struct drm_gem_object *obj;
+ long ret;
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);
}
--
2.50.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v2] drm: Replace the deprecated DRM_* logging macros in gem helper files
2025-08-18 19:42 ` Michal Wajdeczko
2025-08-19 11:16 ` Athul Raj Kollareth
2025-08-19 12:11 ` [PATCH v3] " Athul Raj Kollareth
@ 2025-08-20 8:48 ` Thomas Zimmermann
2 siblings, 0 replies; 13+ messages in thread
From: Thomas Zimmermann @ 2025-08-20 8:48 UTC (permalink / raw)
To: Michal Wajdeczko, Athul Raj Kollareth
Cc: airlied, dri-devel, linux-kernel-mentees, linux-kernel,
maarten.lankhorst, mripard, simona, skhan
Hi
Am 18.08.25 um 21:42 schrieb Michal Wajdeczko:
>
> On 8/18/2025 9:20 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 v2:
>> - Change drm_gem_objects_lookup() to take a drm_device* argument.
>> - Make appropriate changes to all calls of drm_gem_objects_lookup().
>> ---
>> drivers/accel/rocket/rocket_job.c | 4 ++--
>> drivers/gpu/drm/drm_gem.c | 12 +++++++-----
>> drivers/gpu/drm/drm_gem_dma_helper.c | 2 +-
>> drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +-
>> drivers/gpu/drm/v3d/v3d_submit.c | 2 +-
>> drivers/gpu/drm/vc4/vc4_gem.c | 2 +-
>> include/drm/drm_gem.h | 5 +++--
>> 7 files changed, 16 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/accel/rocket/rocket_job.c b/drivers/accel/rocket/rocket_job.c
>> index 5d4afd692306..db7c50c9ab90 100644
>> --- a/drivers/accel/rocket/rocket_job.c
>> +++ b/drivers/accel/rocket/rocket_job.c
>> @@ -560,14 +560,14 @@ static int rocket_ioctl_submit_job(struct drm_device *dev, struct drm_file *file
>> if (ret)
>> goto out_cleanup_job;
>>
>> - ret = drm_gem_objects_lookup(file, u64_to_user_ptr(job->in_bo_handles),
>> + ret = drm_gem_objects_lookup(dev, file, u64_to_user_ptr(job->in_bo_handles),
>> job->in_bo_handle_count, &rjob->in_bos);
>> if (ret)
>> goto out_cleanup_job;
>>
>> rjob->in_bo_count = job->in_bo_handle_count;
>>
>> - ret = drm_gem_objects_lookup(file, u64_to_user_ptr(job->out_bo_handles),
>> + ret = drm_gem_objects_lookup(dev, file, u64_to_user_ptr(job->out_bo_handles),
>> job->out_bo_handle_count, &rjob->out_bos);
>> if (ret)
>> goto out_cleanup_job;
>> diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
>> index 4a89b6acb6af..ee1e5ded6dd6 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");
>> return -ENOMEM;
>> }
>>
>> @@ -764,6 +764,7 @@ static int objects_lookup(struct drm_file *filp, u32 *handle, int count,
>>
>> /**
>> * drm_gem_objects_lookup - look up GEM objects from an array of handles
>> + * @dev: corresponding drm_device
>> * @filp: DRM file private date
>> * @bo_handles: user pointer to array of userspace handle
>> * @count: size of handle array
>> @@ -780,8 +781,9 @@ static int objects_lookup(struct drm_file *filp, u32 *handle, int count,
>> * failure. 0 is returned on success.
>> *
>> */
>> -int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles,
>> - int count, struct drm_gem_object ***objs_out)
>> +int drm_gem_objects_lookup(struct drm_device *dev, struct drm_file *filp,
>> + void __user *bo_handles, int count,
>> + struct drm_gem_object ***objs_out)
>> {
> can't we just use:
>
> struct drm_device *dev = filp->minor->dev;
That's even better. Thanks for pointing to this.
Best regards
Thomas
>
>> int ret;
>> u32 *handles;
>> @@ -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;
>> }
>>
>> @@ -858,7 +860,7 @@ long drm_gem_dma_resv_wait(struct drm_file *filep, u32 handle,
>>
>> obj = drm_gem_object_lookup(filep, handle);
>> if (!obj) {
>> - DRM_DEBUG("Failed to look up GEM BO %d\n", handle);
>> + drm_dbg_core(NULL, "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);
>> }
>>
>> diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c
>> index 1ea6c509a5d5..3ffd9d5a9056 100644
>> --- a/drivers/gpu/drm/panfrost/panfrost_drv.c
>> +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c
>> @@ -188,7 +188,7 @@ panfrost_lookup_bos(struct drm_device *dev,
>> if (!job->bo_count)
>> return 0;
>>
>> - ret = drm_gem_objects_lookup(file_priv,
>> + ret = drm_gem_objects_lookup(dev, file_priv,
>> (void __user *)(uintptr_t)args->bo_handles,
>> job->bo_count, &job->bos);
>> if (ret)
>> diff --git a/drivers/gpu/drm/v3d/v3d_submit.c b/drivers/gpu/drm/v3d/v3d_submit.c
>> index 5171ffe9012d..a3ac8e6a4a72 100644
>> --- a/drivers/gpu/drm/v3d/v3d_submit.c
>> +++ b/drivers/gpu/drm/v3d/v3d_submit.c
>> @@ -79,7 +79,7 @@ v3d_lookup_bos(struct drm_device *dev,
>> return -EINVAL;
>> }
>>
>> - return drm_gem_objects_lookup(file_priv,
>> + return drm_gem_objects_lookup(dev, file_priv,
>> (void __user *)(uintptr_t)bo_handles,
>> job->bo_count, &job->bo);
>> }
>> diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c
>> index 255e5817618e..6ce65611231b 100644
>> --- a/drivers/gpu/drm/vc4/vc4_gem.c
>> +++ b/drivers/gpu/drm/vc4/vc4_gem.c
>> @@ -692,7 +692,7 @@ vc4_cl_lookup_bos(struct drm_device *dev,
>> return -EINVAL;
>> }
>>
>> - ret = drm_gem_objects_lookup(file_priv, u64_to_user_ptr(args->bo_handles),
>> + ret = drm_gem_objects_lookup(dev, file_priv, u64_to_user_ptr(args->bo_handles),
>> exec->bo_count, &exec->bo);
>>
>> if (ret)
>> diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h
>> index d3a7b43e2c63..03cb03f46524 100644
>> --- a/include/drm/drm_gem.h
>> +++ b/include/drm/drm_gem.h
>> @@ -544,8 +544,9 @@ void drm_gem_unlock(struct drm_gem_object *obj);
>> int drm_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map);
>> void drm_gem_vunmap(struct drm_gem_object *obj, struct iosys_map *map);
>>
>> -int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles,
>> - int count, struct drm_gem_object ***objs_out);
>> +int drm_gem_objects_lookup(struct drm_device *dev, struct drm_file *filp,
>> + void __user *bo_handles, int count,
>> + struct drm_gem_object ***objs_out);
>> struct drm_gem_object *drm_gem_object_lookup(struct drm_file *filp, u32 handle);
>> long drm_gem_dma_resv_wait(struct drm_file *filep, u32 handle,
>> bool wait_all, unsigned long timeout);
--
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nuernberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
HRB 36809 (AG Nuernberg)
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2] drm: Replace the deprecated DRM_* logging macros in gem helper files
2025-08-18 19:20 ` [PATCH v2] drm: Replace the deprecated DRM_* logging macros in gem helper files Athul Raj Kollareth
2025-08-18 19:42 ` Michal Wajdeczko
@ 2025-08-18 19:46 ` Athul Raj K
2025-08-19 10:57 ` Athul Raj Kollareth
2025-08-20 8:50 ` Thomas Zimmermann
2 siblings, 1 reply; 13+ messages in thread
From: Athul Raj K @ 2025-08-18 19:46 UTC (permalink / raw)
To: tzimmermann
Cc: airlied, dri-devel, linux-kernel-mentees, linux-kernel,
maarten.lankhorst, mripard, simona, skhan
[-- Attachment #1: Type: text/plain, Size: 8178 bytes --]
> @@ -858,7 +860,7 @@ long drm_gem_dma_resv_wait(struct drm_file *filep,
u32 handle,
>
> obj = drm_gem_object_lookup(filep, handle);
> if (!obj) {
> - DRM_DEBUG("Failed to look up GEM BO %d\n", handle);
> + drm_dbg_core(NULL, "Failed to look up GEM BO %d\n",
handle);
> return -EINVAL;
> }
I missed this in the initial patch. Not sure if I should replace the NULL
with dev here by changing the function to accept dev from the caller.
I guess it will require changes to be made to the lima driver [1], Its not
a lot though.
[1] https://elixir.bootlin.com/linux/v6.17-rc1/A/ident/lima_gem_wait
On Tue, 19 Aug 2025 at 00:53, Athul Raj Kollareth <krathul3152@gmail.com>
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 v2:
> - Change drm_gem_objects_lookup() to take a drm_device* argument.
> - Make appropriate changes to all calls of drm_gem_objects_lookup().
> ---
> drivers/accel/rocket/rocket_job.c | 4 ++--
> drivers/gpu/drm/drm_gem.c | 12 +++++++-----
> drivers/gpu/drm/drm_gem_dma_helper.c | 2 +-
> drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +-
> drivers/gpu/drm/v3d/v3d_submit.c | 2 +-
> drivers/gpu/drm/vc4/vc4_gem.c | 2 +-
> include/drm/drm_gem.h | 5 +++--
> 7 files changed, 16 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/accel/rocket/rocket_job.c
> b/drivers/accel/rocket/rocket_job.c
> index 5d4afd692306..db7c50c9ab90 100644
> --- a/drivers/accel/rocket/rocket_job.c
> +++ b/drivers/accel/rocket/rocket_job.c
> @@ -560,14 +560,14 @@ static int rocket_ioctl_submit_job(struct drm_device
> *dev, struct drm_file *file
> if (ret)
> goto out_cleanup_job;
>
> - ret = drm_gem_objects_lookup(file,
> u64_to_user_ptr(job->in_bo_handles),
> + ret = drm_gem_objects_lookup(dev, file,
> u64_to_user_ptr(job->in_bo_handles),
> job->in_bo_handle_count,
> &rjob->in_bos);
> if (ret)
> goto out_cleanup_job;
>
> rjob->in_bo_count = job->in_bo_handle_count;
>
> - ret = drm_gem_objects_lookup(file,
> u64_to_user_ptr(job->out_bo_handles),
> + ret = drm_gem_objects_lookup(dev, file,
> u64_to_user_ptr(job->out_bo_handles),
> job->out_bo_handle_count,
> &rjob->out_bos);
> if (ret)
> goto out_cleanup_job;
> diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
> index 4a89b6acb6af..ee1e5ded6dd6 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");
> return -ENOMEM;
> }
>
> @@ -764,6 +764,7 @@ static int objects_lookup(struct drm_file *filp, u32
> *handle, int count,
>
> /**
> * drm_gem_objects_lookup - look up GEM objects from an array of handles
> + * @dev: corresponding drm_device
> * @filp: DRM file private date
> * @bo_handles: user pointer to array of userspace handle
> * @count: size of handle array
> @@ -780,8 +781,9 @@ static int objects_lookup(struct drm_file *filp, u32
> *handle, int count,
> * failure. 0 is returned on success.
> *
> */
> -int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles,
> - int count, struct drm_gem_object ***objs_out)
> +int drm_gem_objects_lookup(struct drm_device *dev, struct drm_file *filp,
> + void __user *bo_handles, int count,
> + struct drm_gem_object ***objs_out)
> {
> int ret;
> u32 *handles;
> @@ -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;
> }
>
> @@ -858,7 +860,7 @@ long drm_gem_dma_resv_wait(struct drm_file *filep, u32
> handle,
>
> obj = drm_gem_object_lookup(filep, handle);
> if (!obj) {
> - DRM_DEBUG("Failed to look up GEM BO %d\n", handle);
> + drm_dbg_core(NULL, "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);
> }
>
> diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c
> b/drivers/gpu/drm/panfrost/panfrost_drv.c
> index 1ea6c509a5d5..3ffd9d5a9056 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_drv.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c
> @@ -188,7 +188,7 @@ panfrost_lookup_bos(struct drm_device *dev,
> if (!job->bo_count)
> return 0;
>
> - ret = drm_gem_objects_lookup(file_priv,
> + ret = drm_gem_objects_lookup(dev, file_priv,
> (void __user
> *)(uintptr_t)args->bo_handles,
> job->bo_count, &job->bos);
> if (ret)
> diff --git a/drivers/gpu/drm/v3d/v3d_submit.c
> b/drivers/gpu/drm/v3d/v3d_submit.c
> index 5171ffe9012d..a3ac8e6a4a72 100644
> --- a/drivers/gpu/drm/v3d/v3d_submit.c
> +++ b/drivers/gpu/drm/v3d/v3d_submit.c
> @@ -79,7 +79,7 @@ v3d_lookup_bos(struct drm_device *dev,
> return -EINVAL;
> }
>
> - return drm_gem_objects_lookup(file_priv,
> + return drm_gem_objects_lookup(dev, file_priv,
> (void __user *)(uintptr_t)bo_handles,
> job->bo_count, &job->bo);
> }
> diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c
> index 255e5817618e..6ce65611231b 100644
> --- a/drivers/gpu/drm/vc4/vc4_gem.c
> +++ b/drivers/gpu/drm/vc4/vc4_gem.c
> @@ -692,7 +692,7 @@ vc4_cl_lookup_bos(struct drm_device *dev,
> return -EINVAL;
> }
>
> - ret = drm_gem_objects_lookup(file_priv,
> u64_to_user_ptr(args->bo_handles),
> + ret = drm_gem_objects_lookup(dev, file_priv,
> u64_to_user_ptr(args->bo_handles),
> exec->bo_count, &exec->bo);
>
> if (ret)
> diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h
> index d3a7b43e2c63..03cb03f46524 100644
> --- a/include/drm/drm_gem.h
> +++ b/include/drm/drm_gem.h
> @@ -544,8 +544,9 @@ void drm_gem_unlock(struct drm_gem_object *obj);
> int drm_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map);
> void drm_gem_vunmap(struct drm_gem_object *obj, struct iosys_map *map);
>
> -int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles,
> - int count, struct drm_gem_object ***objs_out);
> +int drm_gem_objects_lookup(struct drm_device *dev, struct drm_file *filp,
> + void __user *bo_handles, int count,
> + struct drm_gem_object ***objs_out);
> struct drm_gem_object *drm_gem_object_lookup(struct drm_file *filp, u32
> handle);
> long drm_gem_dma_resv_wait(struct drm_file *filep, u32 handle,
> bool wait_all, unsigned long timeout);
> --
> 2.50.1
>
>
[-- Attachment #2: Type: text/html, Size: 9989 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH v2] drm: Replace the deprecated DRM_* logging macros in gem helper files
2025-08-18 19:46 ` Athul Raj K
@ 2025-08-19 10:57 ` Athul Raj Kollareth
0 siblings, 0 replies; 13+ messages in thread
From: Athul Raj Kollareth @ 2025-08-19 10:57 UTC (permalink / raw)
To: tzimmermann, michal.wajdeczko
Cc: airlied, dri-devel, linux-kernel-mentees, linux-kernel,
maarten.lankhorst, mripard, simona, skhan
Sorry for the html attachments, I forgot to set the email to plain text
based.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2] drm: Replace the deprecated DRM_* logging macros in gem helper files
2025-08-18 19:20 ` [PATCH v2] drm: Replace the deprecated DRM_* logging macros in gem helper files Athul Raj Kollareth
2025-08-18 19:42 ` Michal Wajdeczko
2025-08-18 19:46 ` Athul Raj K
@ 2025-08-20 8:50 ` Thomas Zimmermann
2 siblings, 0 replies; 13+ messages in thread
From: Thomas Zimmermann @ 2025-08-20 8:50 UTC (permalink / raw)
To: Athul Raj Kollareth
Cc: airlied, dri-devel, linux-kernel-mentees, linux-kernel,
maarten.lankhorst, mripard, simona, skhan
Hi
Am 18.08.25 um 21:20 schrieb Athul Raj Kollareth:
> 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 v2:
> - Change drm_gem_objects_lookup() to take a drm_device* argument.
> - Make appropriate changes to all calls of drm_gem_objects_lookup().
Please see Michal's reply about using filp->minor->dev for the device.
Saves from any changes to the interface. You might want to be defensive
about it and test for filp->minor for NULL.
Best regards
Thomas
> ---
> drivers/accel/rocket/rocket_job.c | 4 ++--
> drivers/gpu/drm/drm_gem.c | 12 +++++++-----
> drivers/gpu/drm/drm_gem_dma_helper.c | 2 +-
> drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +-
> drivers/gpu/drm/v3d/v3d_submit.c | 2 +-
> drivers/gpu/drm/vc4/vc4_gem.c | 2 +-
> include/drm/drm_gem.h | 5 +++--
> 7 files changed, 16 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/accel/rocket/rocket_job.c b/drivers/accel/rocket/rocket_job.c
> index 5d4afd692306..db7c50c9ab90 100644
> --- a/drivers/accel/rocket/rocket_job.c
> +++ b/drivers/accel/rocket/rocket_job.c
> @@ -560,14 +560,14 @@ static int rocket_ioctl_submit_job(struct drm_device *dev, struct drm_file *file
> if (ret)
> goto out_cleanup_job;
>
> - ret = drm_gem_objects_lookup(file, u64_to_user_ptr(job->in_bo_handles),
> + ret = drm_gem_objects_lookup(dev, file, u64_to_user_ptr(job->in_bo_handles),
> job->in_bo_handle_count, &rjob->in_bos);
> if (ret)
> goto out_cleanup_job;
>
> rjob->in_bo_count = job->in_bo_handle_count;
>
> - ret = drm_gem_objects_lookup(file, u64_to_user_ptr(job->out_bo_handles),
> + ret = drm_gem_objects_lookup(dev, file, u64_to_user_ptr(job->out_bo_handles),
> job->out_bo_handle_count, &rjob->out_bos);
> if (ret)
> goto out_cleanup_job;
> diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
> index 4a89b6acb6af..ee1e5ded6dd6 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");
> return -ENOMEM;
> }
>
> @@ -764,6 +764,7 @@ static int objects_lookup(struct drm_file *filp, u32 *handle, int count,
>
> /**
> * drm_gem_objects_lookup - look up GEM objects from an array of handles
> + * @dev: corresponding drm_device
> * @filp: DRM file private date
> * @bo_handles: user pointer to array of userspace handle
> * @count: size of handle array
> @@ -780,8 +781,9 @@ static int objects_lookup(struct drm_file *filp, u32 *handle, int count,
> * failure. 0 is returned on success.
> *
> */
> -int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles,
> - int count, struct drm_gem_object ***objs_out)
> +int drm_gem_objects_lookup(struct drm_device *dev, struct drm_file *filp,
> + void __user *bo_handles, int count,
> + struct drm_gem_object ***objs_out)
> {
> int ret;
> u32 *handles;
> @@ -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;
> }
>
> @@ -858,7 +860,7 @@ long drm_gem_dma_resv_wait(struct drm_file *filep, u32 handle,
>
> obj = drm_gem_object_lookup(filep, handle);
> if (!obj) {
> - DRM_DEBUG("Failed to look up GEM BO %d\n", handle);
> + drm_dbg_core(NULL, "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);
> }
>
> diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c
> index 1ea6c509a5d5..3ffd9d5a9056 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_drv.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c
> @@ -188,7 +188,7 @@ panfrost_lookup_bos(struct drm_device *dev,
> if (!job->bo_count)
> return 0;
>
> - ret = drm_gem_objects_lookup(file_priv,
> + ret = drm_gem_objects_lookup(dev, file_priv,
> (void __user *)(uintptr_t)args->bo_handles,
> job->bo_count, &job->bos);
> if (ret)
> diff --git a/drivers/gpu/drm/v3d/v3d_submit.c b/drivers/gpu/drm/v3d/v3d_submit.c
> index 5171ffe9012d..a3ac8e6a4a72 100644
> --- a/drivers/gpu/drm/v3d/v3d_submit.c
> +++ b/drivers/gpu/drm/v3d/v3d_submit.c
> @@ -79,7 +79,7 @@ v3d_lookup_bos(struct drm_device *dev,
> return -EINVAL;
> }
>
> - return drm_gem_objects_lookup(file_priv,
> + return drm_gem_objects_lookup(dev, file_priv,
> (void __user *)(uintptr_t)bo_handles,
> job->bo_count, &job->bo);
> }
> diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c
> index 255e5817618e..6ce65611231b 100644
> --- a/drivers/gpu/drm/vc4/vc4_gem.c
> +++ b/drivers/gpu/drm/vc4/vc4_gem.c
> @@ -692,7 +692,7 @@ vc4_cl_lookup_bos(struct drm_device *dev,
> return -EINVAL;
> }
>
> - ret = drm_gem_objects_lookup(file_priv, u64_to_user_ptr(args->bo_handles),
> + ret = drm_gem_objects_lookup(dev, file_priv, u64_to_user_ptr(args->bo_handles),
> exec->bo_count, &exec->bo);
>
> if (ret)
> diff --git a/include/drm/drm_gem.h b/include/drm/drm_gem.h
> index d3a7b43e2c63..03cb03f46524 100644
> --- a/include/drm/drm_gem.h
> +++ b/include/drm/drm_gem.h
> @@ -544,8 +544,9 @@ void drm_gem_unlock(struct drm_gem_object *obj);
> int drm_gem_vmap(struct drm_gem_object *obj, struct iosys_map *map);
> void drm_gem_vunmap(struct drm_gem_object *obj, struct iosys_map *map);
>
> -int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles,
> - int count, struct drm_gem_object ***objs_out);
> +int drm_gem_objects_lookup(struct drm_device *dev, struct drm_file *filp,
> + void __user *bo_handles, int count,
> + struct drm_gem_object ***objs_out);
> struct drm_gem_object *drm_gem_object_lookup(struct drm_file *filp, u32 handle);
> long drm_gem_dma_resv_wait(struct drm_file *filep, u32 handle,
> bool wait_all, unsigned long timeout);
--
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nuernberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
HRB 36809 (AG Nuernberg)
^ permalink raw reply [flat|nested] 13+ messages in thread