drm/i915/bw: convert to drm_device based logging macros

This replaces the printk based logging macros with the struct drm_based
macros in i915/display/intel_bw.c
This transformation was achieved by using the following coccinelle
script that matches based on the existence of a struct drm_i915_private
device in the functions:

@rule1@
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,
...)
)
...+>
}

@rule2@
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,
...)
)
...+>
}

Resulting checkpatch warnings were addressed manually.

Signed-off-by: Wambui Karuga <wambui.karugax@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200121134559.17355-5-wambui.karugax@gmail.com

diff --git a/drivers/gpu/drm/i915/display/intel_bw.c b/drivers/gpu/drm/i915/display/intel_bw.c
index b228671..9c40ad5 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_bw.c
+++ b/drivers/gpu/drm/i915/display/intel_bw.c
@@ -132,9 +132,10 @@ static int icl_get_qgv_points(struct drm_i915_private *dev_priv,
                if (ret)
                        return ret;
 
-               DRM_DEBUG_KMS("QGV %d: DCLK=%d tRP=%d tRDPRE=%d tRAS=%d tRCD=%d tRC=%d\n",
-                             i, sp->dclk, sp->t_rp, sp->t_rdpre, sp->t_ras,
-                             sp->t_rcd, sp->t_rc);
+               drm_dbg_kms(&dev_priv->drm,
+                           "QGV %d: DCLK=%d tRP=%d tRDPRE=%d tRAS=%d tRCD=%d tRC=%d\n",
+                           i, sp->dclk, sp->t_rp, sp->t_rdpre, sp->t_ras,
+                           sp->t_rcd, sp->t_rc);
        }
 
        return 0;
@@ -187,7 +188,8 @@ static int icl_get_bw_info(struct drm_i915_private *dev_priv, const struct intel
 
        ret = icl_get_qgv_points(dev_priv, &qi);
        if (ret) {
-               DRM_DEBUG_KMS("Failed to get memory subsystem information, ignoring bandwidth limits");
+               drm_dbg_kms(&dev_priv->drm,
+                           "Failed to get memory subsystem information, ignoring bandwidth limits");
                return ret;
        }
        num_channels = qi.num_channels;
@@ -228,8 +230,9 @@ static int icl_get_bw_info(struct drm_i915_private *dev_priv, const struct intel
                        bi->deratedbw[j] = min(maxdebw,
                                               bw * 9 / 10); /* 90% */
 
-                       DRM_DEBUG_KMS("BW%d / QGV %d: num_planes=%d deratedbw=%u\n",
-                                     i, j, bi->num_planes, bi->deratedbw[j]);
+                       drm_dbg_kms(&dev_priv->drm,
+                                   "BW%d / QGV %d: num_planes=%d deratedbw=%u\n",
+                                   i, j, bi->num_planes, bi->deratedbw[j]);
                }
 
                if (bi->num_planes == 1)
@@ -424,10 +427,11 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)
                bw_state->data_rate[crtc->pipe] = new_data_rate;
                bw_state->num_active_planes[crtc->pipe] = new_active_planes;
 
-               DRM_DEBUG_KMS("pipe %c data rate %u num active planes %u\n",
-                             pipe_name(crtc->pipe),
-                             bw_state->data_rate[crtc->pipe],
-                             bw_state->num_active_planes[crtc->pipe]);
+               drm_dbg_kms(&dev_priv->drm,
+                           "pipe %c data rate %u num active planes %u\n",
+                           pipe_name(crtc->pipe),
+                           bw_state->data_rate[crtc->pipe],
+                           bw_state->num_active_planes[crtc->pipe]);
        }
 
        if (!bw_state)
@@ -441,8 +445,9 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)
        data_rate = DIV_ROUND_UP(data_rate, 1000);
 
        if (data_rate > max_data_rate) {
-               DRM_DEBUG_KMS("Bandwidth %u MB/s exceeds max available %d MB/s (%d active planes)\n",
-                             data_rate, max_data_rate, num_active_planes);
+               drm_dbg_kms(&dev_priv->drm,
+                           "Bandwidth %u MB/s exceeds max available %d MB/s (%d active planes)\n",
+                           data_rate, max_data_rate, num_active_planes);
                return -EINVAL;
        }