Commit 723dad97 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin Committed by Simon Ser
Browse files

drm: Replace DRM_DEBUG with drm_dbg_core in file and ioctl handling 



Replace the deprecated macro with the per-device one.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarSimon Ser <contact@emersion.fr>
Signed-off-by: default avatarSimon Ser <contact@emersion.fr>
Link: https://patchwork.freedesktop.org/patch/msgid/20221223112302.320097-1-tvrtko.ursulin@linux.intel.com
parent fe91e41a

drivers/gpu/drm/drm_file.c

+9 −9
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ void drm_file_free(struct drm_file *file) 


	dev = file->minor->dev;



	DRM_DEBUG("comm=\"%s\", pid=%d, dev=0x%lx, open_count=%d\n",

	drm_dbg_core(dev, "comm=\"%s\", pid=%d, dev=0x%lx, open_count=%d\n",

		     current->comm, task_pid_nr(current),

		     (long)old_encode_dev(file->minor->kdev->devt),

		     atomic_read(&dev->open_count));
@@ -340,8 +340,8 @@ static int drm_open_helper(struct file *filp, struct drm_minor *minor) 
	    dev->switch_power_state != DRM_SWITCH_POWER_DYNAMIC_OFF)

		return -EINVAL;



	DRM_DEBUG("comm=\"%s\", pid=%d, minor=%d\n", current->comm,

		  task_pid_nr(current), minor->index);

	drm_dbg_core(dev, "comm=\"%s\", pid=%d, minor=%d\n",

		     current->comm, task_pid_nr(current), minor->index);



	priv = drm_file_alloc(minor);

	if (IS_ERR(priv))
@@ -450,11 +450,11 @@ EXPORT_SYMBOL(drm_open); 


void drm_lastclose(struct drm_device * dev)

{

	DRM_DEBUG("\n");

	drm_dbg_core(dev, "\n");



	if (dev->driver->lastclose)

		dev->driver->lastclose(dev);

	DRM_DEBUG("driver lastclose completed\n");

	drm_dbg_core(dev, "driver lastclose completed\n");



	if (drm_core_check_feature(dev, DRIVER_LEGACY))

		drm_legacy_dev_reinit(dev);
@@ -485,7 +485,7 @@ int drm_release(struct inode *inode, struct file *filp) 
	if (drm_dev_needs_global_mutex(dev))

		mutex_lock(&drm_global_mutex);



	DRM_DEBUG("open_count = %d\n", atomic_read(&dev->open_count));

	drm_dbg_core(dev, "open_count = %d\n", atomic_read(&dev->open_count));



	drm_close_helper(filp);

drivers/gpu/drm/drm_ioc32.c

+7 −6
Original line number Diff line number Diff line
@@ -972,6 +972,7 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
{

	unsigned int nr = DRM_IOCTL_NR(cmd);

	struct drm_file *file_priv = filp->private_data;

	struct drm_device *dev = file_priv->minor->dev;

	drm_ioctl_compat_t *fn;

	int ret;
@@ -986,14 +987,14 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
	if (!fn)

		return drm_ioctl(filp, cmd, arg);



	DRM_DEBUG("comm=\"%s\", pid=%d, dev=0x%lx, auth=%d, %s\n",

	drm_dbg_core(dev, "comm=\"%s\", pid=%d, dev=0x%lx, auth=%d, %s\n",

		     current->comm, task_pid_nr(current),

		     (long)old_encode_dev(file_priv->minor->kdev->devt),

		     file_priv->authenticated,

		     drm_compat_ioctls[nr].name);

	ret = (*fn)(filp, cmd, arg);

	if (ret)

		DRM_DEBUG("ret = %d\n", ret);

		drm_dbg_core(dev, "ret = %d\n", ret);

	return ret;

}

EXPORT_SYMBOL(drm_compat_ioctl);

drivers/gpu/drm/drm_ioctl.c

+13 −12
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ static int drm_setversion(struct drm_device *dev, void *data, struct drm_file *f 
int drm_noop(struct drm_device *dev, void *data,

	     struct drm_file *file_priv)

{

	DRM_DEBUG("\n");

	drm_dbg_core(dev, "\n");

	return 0;

}

EXPORT_SYMBOL(drm_noop);
@@ -856,7 +856,7 @@ long drm_ioctl(struct file *filp, 
		out_size = 0;

	ksize = max(max(in_size, out_size), drv_size);



	DRM_DEBUG("comm=\"%s\" pid=%d, dev=0x%lx, auth=%d, %s\n",

	drm_dbg_core(dev, "comm=\"%s\" pid=%d, dev=0x%lx, auth=%d, %s\n",

		     current->comm, task_pid_nr(current),

		     (long)old_encode_dev(file_priv->minor->kdev->devt),

		     file_priv->authenticated, ioctl->name);
@@ -865,7 +865,7 @@ long drm_ioctl(struct file *filp, 
	func = ioctl->func;



	if (unlikely(!func)) {

		DRM_DEBUG("no function\n");

		drm_dbg_core(dev, "no function\n");

		retcode = -EINVAL;

		goto err_i1;

	}
@@ -894,7 +894,8 @@ long drm_ioctl(struct file *filp, 


      err_i1:

	if (!ioctl)

		DRM_DEBUG("invalid ioctl: comm=\"%s\", pid=%d, dev=0x%lx, auth=%d, cmd=0x%02x, nr=0x%02x\n",

		drm_dbg_core(dev,

			     "invalid ioctl: comm=\"%s\", pid=%d, dev=0x%lx, auth=%d, cmd=0x%02x, nr=0x%02x\n",

			     current->comm, task_pid_nr(current),

			     (long)old_encode_dev(file_priv->minor->kdev->devt),

			     file_priv->authenticated, cmd, nr);
@@ -902,8 +903,8 @@ long drm_ioctl(struct file *filp, 
	if (kdata != stack_kdata)

		kfree(kdata);

	if (retcode)

		DRM_DEBUG("comm=\"%s\", pid=%d, ret=%d\n", current->comm,

			  task_pid_nr(current), retcode);

		drm_dbg_core(dev, "comm=\"%s\", pid=%d, ret=%d\n",

			     current->comm, task_pid_nr(current), retcode);

	return retcode;

}

EXPORT_SYMBOL(drm_ioctl);