Commit e5e0350d authored by Athul Raj Kollareth's avatar Athul Raj Kollareth Committed by Thomas Zimmermann
Browse files

drm: Replace the deprecated DRM_* logging macros in gem helper files 



Replace the DRM_* logging macros used in gem helper files with the
appropriate ones specified in /include/drm/drm_print.h.

Signed-off-by: default avatarAthul Raj Kollareth <krathul3152@gmail.com>
Reviewed-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/aLczDHV_yGnnRKbr@Terra
parent 2d2f1dc7

drivers/gpu/drm/drm_gem.c

+8 −8
Original line number Diff line number Diff line
@@ -101,10 +101,8 @@ 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");

	if (!vma_offset_manager)

		return -ENOMEM;

	}



	dev->vma_offset_manager = vma_offset_manager;

	drm_vma_offset_manager_init(vma_offset_manager,
@@ -785,9 +783,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;
@@ -807,7 +806,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;

	}
@@ -855,12 +854,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;

	}

drivers/gpu/drm/drm_gem_dma_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}