Merge tag 'drm-misc-next-2023-01-12' of git://anongit.freedesktop.org/drm/drm-misc...

[linux-block.git] / drivers / gpu / drm / drm_file.c

diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c
index 64b4a3a87fbbde0a7eb85de085ba838b939c9768..a51ff8cee0494bd908cce56cde7e5e9f36cc735c 100644 (file)
--- 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,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);