gpu/drm: Replace the deprecated logging functions in drm_gem* files

Replace the deprecated logging functions used in drm_gem* helper files with their appropriate ones specified in drm_print.h.

Signed-off-by Athul Raj Kollareth <[email protected]>

---
  drivers/gpu/drm/drm_gem.c            | 4 ++--
  drivers/gpu/drm/drm_gem_dma_helper.c | 2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)

drivers/gpu/drm/drm_gem.c +1 -1

index 4a89b6acb6af..91f528d8900f 100644
@@ -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;
  	}
 

drivers/gpu/drm/drm_gem.c +0 -0

  		goto out;
  	}
 

drivers/gpu/drm/drm_gem_dma_helper.c +1 -1

index 4f0320df858f..a507cf517015 100644
@@ -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);
  	}
 

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 <[email protected]>

---
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(-)

drivers/accel/rocket/rocket_job.c +2 -2

index 5d4afd692306..db7c50c9ab90 100644
@@ -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;

drivers/gpu/drm/drm_gem.c +2 -1

index 4a89b6acb6af..ee1e5ded6dd6 100644
@@ -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

drivers/gpu/drm/drm_gem.c +2 -2

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

drivers/gpu/drm/drm_gem_dma_helper.c +1 -1

index 4f0320df858f..a507cf517015 100644
@@ -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);
 	}
 

drivers/gpu/drm/panfrost/panfrost_drv.c +1 -1

index 1ea6c509a5d5..3ffd9d5a9056 100644
@@ -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)

drivers/gpu/drm/v3d/v3d_submit.c +1 -1

index 5171ffe9012d..a3ac8e6a4a72 100644
@@ -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);
 }

drivers/gpu/drm/vc4/vc4_gem.c +1 -1

index 255e5817618e..6ce65611231b 100644
@@ -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)

include/drm/drm_gem.h +3 -2

index d3a7b43e2c63..03cb03f46524 100644
@@ -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);

Quoted 61 lines · 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 <[email protected]>

---
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(-)

drivers/accel/rocket/rocket_job.c +2 -2

index 5d4afd692306..db7c50c9ab90 100644
@@ -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;

drivers/gpu/drm/drm_gem.c +2 -1

index 4a89b6acb6af..ee1e5ded6dd6 100644
@@ -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

drivers/gpu/drm/drm_gem.c static int objects_lookup(struct drm_file *filp, u32 *handle, int count, · line 787

Quoted 9 lines

drivers/gpu/drm/drm_gem.c +3 -2

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

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 <[email protected]>

---
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/[email protected]

---
 drivers/gpu/drm/drm_gem.c            | 10 +++++++---
 drivers/gpu/drm/drm_gem_dma_helper.c |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

drivers/gpu/drm/drm_gem.c +0 -0

index 4a89b6acb6af..fbea8c50f17c 100644

drivers/gpu/drm/drm_gem.c +3 -1

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

drivers/gpu/drm/drm_gem.c +3 -1

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

drivers/gpu/drm/drm_gem_dma_helper.c +1 -1

index 4f0320df858f..a507cf517015 100644
@@ -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);
 	}
 

Quoted 19 lines · 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 <[email protected]>

---
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/[email protected]

---
 drivers/gpu/drm/drm_gem.c            | 10 +++++++---
 drivers/gpu/drm/drm_gem_dma_helper.c |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

drivers/gpu/drm/drm_gem.c drm_gem_init(struct drm_device *dev) · line 105

Quoted 10 lines

drivers/gpu/drm/drm_gem.c +1 -1

index 4a89b6acb6af..fbea8c50f17c 100644
@@ -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

drivers/gpu/drm/drm_gem.c int drm_gem_objects_lookup(struct drm_file *filp, void __user *bo_handles, · line 789

Quoted 7 lines

drivers/gpu/drm/drm_gem.c +0 -0

 		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

Quoted 15 lines

drivers/gpu/drm/drm_gem.c +3 -1

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

drivers/gpu/drm/drm_gem.c long drm_gem_dma_resv_wait(struct drm_file *filep, u32 handle, · line 860

Quoted 3 lines

drivers/gpu/drm/drm_gem.c +0 -0

@@ -856,9 +858,11 @@ long drm_gem_dma_resv_wait(struct drm_file *filep, u32 handle,
 	long ret;
 	struct drm_gem_object *obj;
 

ditto

Quoted 22 lines

drivers/gpu/drm/drm_gem.c +3 -1

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

drivers/gpu/drm/drm_gem_dma_helper.c +1 -1

index 4f0320df858f..a507cf517015 100644
@@ -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);
 	}
 

Quoted 61 lines

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 <[email protected]>

---
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(-)

drivers/accel/rocket/rocket_job.c +2 -2

index 5d4afd692306..db7c50c9ab90 100644
@@ -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;

drivers/gpu/drm/drm_gem.c +2 -1

index 4a89b6acb6af..ee1e5ded6dd6 100644
@@ -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

drivers/gpu/drm/drm_gem.c static int objects_lookup(struct drm_file *filp, u32 *handle, int count, · line 787

Quoted 9 lines

drivers/gpu/drm/drm_gem.c +3 -2

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

Quoted 89 lines

drivers/gpu/drm/drm_gem.c +2 -2

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

drivers/gpu/drm/drm_gem_dma_helper.c +1 -1

index 4f0320df858f..a507cf517015 100644
@@ -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);
  	}
 

drivers/gpu/drm/panfrost/panfrost_drv.c +1 -1

index 1ea6c509a5d5..3ffd9d5a9056 100644
@@ -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)

drivers/gpu/drm/v3d/v3d_submit.c +1 -1

index 5171ffe9012d..a3ac8e6a4a72 100644
@@ -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);
  }

drivers/gpu/drm/vc4/vc4_gem.c +1 -1

index 255e5817618e..6ce65611231b 100644
@@ -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)

include/drm/drm_gem.h +3 -2

index d3a7b43e2c63..03cb03f46524 100644
@@ -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);

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 <[email protected]>

---
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(-)

drivers/accel/rocket/rocket_job.c +1 -2

index 5d4afd692306..db7c50c9ab90 100644
@@ -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;

drivers/gpu/drm/drm_gem.c +2 -1

index 4a89b6acb6af..ee1e5ded6dd6 100644
@@ -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

drivers/gpu/drm/drm_gem.c +3 -2

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

drivers/gpu/drm/drm_gem.c +2 -2

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

        }

drivers/gpu/drm/drm_gem_dma_helper.c +1 -1

index 4f0320df858f..a507cf517015 100644
@@ -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);
        }

drivers/gpu/drm/panfrost/panfrost_drv.c +1 -1

index 1ea6c509a5d5..3ffd9d5a9056 100644
@@ -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)

drivers/gpu/drm/v3d/v3d_submit.c +1 -1

index 5171ffe9012d..a3ac8e6a4a72 100644
@@ -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);
 }

drivers/gpu/drm/vc4/vc4_gem.c +1 -1

index 255e5817618e..6ce65611231b 100644
@@ -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)

include/drm/drm_gem.h +3 -2

index d3a7b43e2c63..03cb03f46524 100644
@@ -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

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 <[email protected]>

---
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(-)

drivers/accel/rocket/rocket_job.c +2 -2

index 5d4afd692306..db7c50c9ab90 100644
@@ -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;

drivers/gpu/drm/drm_gem.c +7 -5

index 4a89b6acb6af..ee1e5ded6dd6 100644
@@ -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;
  	}
 

drivers/gpu/drm/drm_gem_dma_helper.c +1 -1

index 4f0320df858f..a507cf517015 100644
@@ -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);
  	}
 

drivers/gpu/drm/panfrost/panfrost_drv.c +1 -1

index 1ea6c509a5d5..3ffd9d5a9056 100644
@@ -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)

drivers/gpu/drm/v3d/v3d_submit.c +1 -1

index 5171ffe9012d..a3ac8e6a4a72 100644
@@ -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);
  }

drivers/gpu/drm/vc4/vc4_gem.c +1 -1

index 255e5817618e..6ce65611231b 100644
@@ -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)

include/drm/drm_gem.h +3 -2

index d3a7b43e2c63..03cb03f46524 100644
@@ -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);