drm/i915/atomic: conversion to drm_device based logging macros.

Conversion of the printk based drm logging macros to the struct
drm_device based logging macros in i915/display/intel_atomic.c
This change was achieved using the following coccinelle script that
matches based on the existence of a drm_i915_private device pointer:
@@
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,
...)
)
...+>
}

Checkpatch warnings were fixed 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/20200206080014.13759-4-wambui.karugax@gmail.com

diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c
index 379c12f3b1d4f7cd5733c9645e5207db9dacb2b2..d043057d2fa03c235ec25dda1321795696677e4a 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_atomic.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic.c
@@ -66,8 +66,9 @@ int intel_digital_connector_atomic_get_property(struct drm_connector *connector,
        else if (property == dev_priv->broadcast_rgb_property)
                *val = intel_conn_state->broadcast_rgb;
        else {
-               DRM_DEBUG_ATOMIC("Unknown property [PROP:%d:%s]\n",
-                                property->base.id, property->name);
+               drm_dbg_atomic(&dev_priv->drm,
+                              "Unknown property [PROP:%d:%s]\n",
+                              property->base.id, property->name);
                return -EINVAL;
        }
 
@@ -103,8 +104,8 @@ int intel_digital_connector_atomic_set_property(struct drm_connector *connector,
                return 0;
        }
 
-       DRM_DEBUG_ATOMIC("Unknown property [PROP:%d:%s]\n",
-                        property->base.id, property->name);
+       drm_dbg_atomic(&dev_priv->drm, "Unknown property [PROP:%d:%s]\n",
+                      property->base.id, property->name);
        return -EINVAL;
 }
 
@@ -362,8 +363,8 @@ static void intel_atomic_setup_scaler(struct intel_crtc_scaler_state *scaler_sta
                mode = SKL_PS_SCALER_MODE_DYN;
        }
 
-       DRM_DEBUG_KMS("Attached scaler id %u.%u to %s:%d\n",
-                     intel_crtc->pipe, *scaler_id, name, idx);
+       drm_dbg_kms(&dev_priv->drm, "Attached scaler id %u.%u to %s:%d\n",
+                   intel_crtc->pipe, *scaler_id, name, idx);
        scaler_state->scalers[*scaler_id].mode = mode;
 }
 
@@ -414,8 +415,9 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,
 
        /* fail if required scalers > available scalers */
        if (num_scalers_need > intel_crtc->num_scalers){
-               DRM_DEBUG_KMS("Too many scaling requests %d > %d\n",
-                       num_scalers_need, intel_crtc->num_scalers);
+               drm_dbg_kms(&dev_priv->drm,
+                           "Too many scaling requests %d > %d\n",
+                           num_scalers_need, intel_crtc->num_scalers);
                return -EINVAL;
        }
 
@@ -460,8 +462,9 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,
                                plane = drm_plane_from_index(&dev_priv->drm, i);
                                state = drm_atomic_get_plane_state(drm_state, plane);
                                if (IS_ERR(state)) {
-                                       DRM_DEBUG_KMS("Failed to add [PLANE:%d] to drm_state\n",
-                                               plane->base.id);
+                                       drm_dbg_kms(&dev_priv->drm,
+                                                   "Failed to add [PLANE:%d] to drm_state\n",
+                                                   plane->base.id);
                                        return PTR_ERR(state);
                                }
                        }