Message ID | 20221130133407.2689864-2-tvrtko.ursulin@linux.intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | File owner follows use | expand |
Am 30.11.22 um 14:34 schrieb Tvrtko Ursulin: > From: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > > Replace the deprecated macro with the per-device one. > > Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Acked-by: Christian König <christian.koenig@amd.com> > --- > drivers/gpu/drm/drm_file.c | 21 +++++++++++---------- > drivers/gpu/drm/drm_ioc32.c | 13 +++++++------ > drivers/gpu/drm/drm_ioctl.c | 25 +++++++++++++------------ > 3 files changed, 31 insertions(+), 28 deletions(-) > > diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c > index 64b4a3a87fbb..b0f24cea1e1e 100644 > --- a/drivers/gpu/drm/drm_file.c > +++ b/drivers/gpu/drm/drm_file.c > @@ -245,10 +245,10 @@ 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", > - current->comm, task_pid_nr(current), > - (long)old_encode_dev(file->minor->kdev->devt), > - atomic_read(&dev->open_count)); > + 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)); > > #ifdef CONFIG_DRM_LEGACY > if (drm_core_check_feature(dev, DRIVER_LEGACY) && > @@ -340,8 +340,8 @@ 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,12 @@ EXPORT_SYMBOL(drm_open); > > void drm_lastclose(struct drm_device * dev) > { > - DRM_DEBUG("\n"); > + drm_dbg_core(dev, "\n"); > > - if (dev->driver->lastclose) > + 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 +486,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); > > diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c > index 5d82891c3222..49a743f62b4a 100644 > --- a/drivers/gpu/drm/drm_ioc32.c > +++ b/drivers/gpu/drm/drm_ioc32.c > @@ -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", > - current->comm, task_pid_nr(current), > - (long)old_encode_dev(file_priv->minor->kdev->devt), > - file_priv->authenticated, > - drm_compat_ioctls[nr].name); > + 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); > diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c > index ca2a6e6101dc..7c9d66ee917d 100644 > --- a/drivers/gpu/drm/drm_ioctl.c > +++ b/drivers/gpu/drm/drm_ioctl.c > @@ -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,16 +856,16 @@ 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", > - current->comm, task_pid_nr(current), > - (long)old_encode_dev(file_priv->minor->kdev->devt), > - file_priv->authenticated, ioctl->name); > + 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); > > /* Do not trust userspace, use our own definition */ > func = ioctl->func; > > if (unlikely(!func)) { > - DRM_DEBUG("no function\n"); > + drm_dbg_core(dev, "no function\n"); > retcode = -EINVAL; > goto err_i1; > } > @@ -894,16 +894,17 @@ 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", > - current->comm, task_pid_nr(current), > - (long)old_encode_dev(file_priv->minor->kdev->devt), > - file_priv->authenticated, cmd, nr); > + 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); > > 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);
diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c index 64b4a3a87fbb..b0f24cea1e1e 100644 --- a/drivers/gpu/drm/drm_file.c +++ b/drivers/gpu/drm/drm_file.c @@ -245,10 +245,10 @@ 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", - current->comm, task_pid_nr(current), - (long)old_encode_dev(file->minor->kdev->devt), - atomic_read(&dev->open_count)); + 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)); #ifdef CONFIG_DRM_LEGACY if (drm_core_check_feature(dev, DRIVER_LEGACY) && @@ -340,8 +340,8 @@ 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,12 @@ EXPORT_SYMBOL(drm_open); void drm_lastclose(struct drm_device * dev) { - DRM_DEBUG("\n"); + drm_dbg_core(dev, "\n"); - if (dev->driver->lastclose) + 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 +486,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); diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c index 5d82891c3222..49a743f62b4a 100644 --- a/drivers/gpu/drm/drm_ioc32.c +++ b/drivers/gpu/drm/drm_ioc32.c @@ -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", - current->comm, task_pid_nr(current), - (long)old_encode_dev(file_priv->minor->kdev->devt), - file_priv->authenticated, - drm_compat_ioctls[nr].name); + 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); diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index ca2a6e6101dc..7c9d66ee917d 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -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,16 +856,16 @@ 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", - current->comm, task_pid_nr(current), - (long)old_encode_dev(file_priv->minor->kdev->devt), - file_priv->authenticated, ioctl->name); + 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); /* Do not trust userspace, use our own definition */ func = ioctl->func; if (unlikely(!func)) { - DRM_DEBUG("no function\n"); + drm_dbg_core(dev, "no function\n"); retcode = -EINVAL; goto err_i1; } @@ -894,16 +894,17 @@ 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", - current->comm, task_pid_nr(current), - (long)old_encode_dev(file_priv->minor->kdev->devt), - file_priv->authenticated, cmd, nr); + 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); 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);