[Intel-gfx] [PATCH 10/10] drm/i915/overlay: convert to drm_device based logging.

[Jani Nikula]

From: Wambui Karuga <wambui.karu...@gmail.com>

Convert various instances of the printk based drm logging macros to the
struct drm_device based logging macros in i915/display/intel_overlay.c.
This transformation was achieved using the following coccinelle script:
@@
identifier fn, T;
@@

fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}

@@
identifier fn, T;
@@

fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}

Note that this converts DRM_DEBUG to drm_dbg().

Checkpatch warnings were addressed manually.

References: 
https://lists.freedesktop.org/archives/dri-devel/2020-January/253381.html
Signed-off-by: Wambui Karuga <wambui.karu...@gmail.com>
Signed-off-by: Jani Nikula <jani.nik...@intel.com>
---
 drivers/gpu/drm/i915/display/intel_overlay.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_overlay.c 
b/drivers/gpu/drm/i915/display/intel_overlay.c
index 3b0cb3534e2a..481187223101 100644
--- a/drivers/gpu/drm/i915/display/intel_overlay.c
+++ b/drivers/gpu/drm/i915/display/intel_overlay.c
@@ -323,7 +323,7 @@ static int intel_overlay_continue(struct intel_overlay 
*overlay,
        /* check for underruns */
        tmp = intel_de_read(dev_priv, DOVSTA);
        if (tmp & (1 << 17))
-               DRM_DEBUG("overlay underrun, DOVSTA: %x\n", tmp);
+               drm_dbg(&dev_priv->drm, "overlay underrun, DOVSTA: %x\n", tmp);
 
        rq = alloc_request(overlay, NULL);
        if (IS_ERR(rq))
@@ -1068,7 +1068,7 @@ int intel_overlay_put_image_ioctl(struct drm_device *dev, 
void *data,
 
        overlay = dev_priv->overlay;
        if (!overlay) {
-               DRM_DEBUG("userspace bug: no overlay\n");
+               drm_dbg(&dev_priv->drm, "userspace bug: no overlay\n");
                return -ENODEV;
        }
 
@@ -1092,7 +1092,8 @@ int intel_overlay_put_image_ioctl(struct drm_device *dev, 
void *data,
        drm_modeset_lock_all(dev);
 
        if (i915_gem_object_is_tiled(new_bo)) {
-               DRM_DEBUG_KMS("buffer used for overlay image can not be 
tiled\n");
+               drm_dbg_kms(&dev_priv->drm,
+                           "buffer used for overlay image can not be tiled\n");
                ret = -EINVAL;
                goto out_unlock;
        }
@@ -1227,7 +1228,7 @@ int intel_overlay_attrs_ioctl(struct drm_device *dev, 
void *data,
 
        overlay = dev_priv->overlay;
        if (!overlay) {
-               DRM_DEBUG("userspace bug: no overlay\n");
+               drm_dbg(&dev_priv->drm, "userspace bug: no overlay\n");
                return -ENODEV;
        }
 
@@ -1371,7 +1372,7 @@ void intel_overlay_setup(struct drm_i915_private 
*dev_priv)
        update_reg_attrs(overlay, overlay->regs);
 
        dev_priv->overlay = overlay;
-       DRM_INFO("Initialized overlay support.\n");
+       drm_info(&dev_priv->drm, "Initialized overlay support.\n");
        return;
 
 out_free:
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx