drm/probe-helper: switch to drm device based logging

Prefer drm_dbg_kms() over DRM_DEBUG_KMS() to debug log the drm device
info.

v2: Drop changes to mode printing (Ville)

Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> # v1
Link: https://patchwork.freedesktop.org/patch/msgid/8b6a83edd1c3896b9d652b5368702eba5f382a1c.1712568037.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
index 968a3ee66b1e79efc135dbc5a2e3c03d57ff3965..19bf5d2982570b704145046536b74b5f538d330e 100644 (file)
--- a/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@ -567,8 +567,8 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,
 
        drm_modeset_acquire_init(&ctx, 0);
 
-       DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", connector->base.id,
-                       connector->name);
+       drm_dbg_kms(dev, "[CONNECTOR:%d:%s]\n", connector->base.id,
+                   connector->name);
 
 retry:
        ret = drm_modeset_lock(&dev->mode_config.connection_mutex, &ctx);
@@ -611,11 +611,10 @@ retry:
         * check here, and if anything changed start the hotplug code.
         */
        if (old_status != connector->status) {
-               DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated from %s to %s\n",
-                             connector->base.id,
-                             connector->name,
-                             drm_get_connector_status_name(old_status),
-                             drm_get_connector_status_name(connector->status));
+               drm_dbg_kms(dev, "[CONNECTOR:%d:%s] status updated from %s to %s\n",
+                           connector->base.id, connector->name,
+                           drm_get_connector_status_name(old_status),
+                           drm_get_connector_status_name(connector->status));
 
                /*
                 * The hotplug event code might call into the fb
@@ -638,8 +637,8 @@ retry:
                drm_kms_helper_poll_enable(dev);
 
        if (connector->status == connector_status_disconnected) {
-               DRM_DEBUG_KMS("[CONNECTOR:%d:%s] disconnected\n",
-                       connector->base.id, connector->name);
+               drm_dbg_kms(dev, "[CONNECTOR:%d:%s] disconnected\n",
+                           connector->base.id, connector->name);
                drm_connector_update_edid_property(connector, NULL);
                drm_mode_prune_invalid(dev, &connector->modes, false);
                goto exit;
@@ -697,8 +696,9 @@ exit:
 
        drm_mode_sort(&connector->modes);
 
-       DRM_DEBUG_KMS("[CONNECTOR:%d:%s] probed modes :\n", connector->base.id,
-                       connector->name);
+       drm_dbg_kms(dev, "[CONNECTOR:%d:%s] probed modes:\n",
+                   connector->base.id, connector->name);
+
        list_for_each_entry(mode, &connector->modes, head) {
                drm_mode_set_crtcinfo(mode, CRTC_INTERLACE_HALVE_V);
                drm_mode_debug_printmodeline(mode);
@@ -834,14 +834,12 @@ static void output_poll_execute(struct work_struct *work)
                        old = drm_get_connector_status_name(old_status);
                        new = drm_get_connector_status_name(connector->status);
 
-                       DRM_DEBUG_KMS("[CONNECTOR:%d:%s] "
-                                     "status updated from %s to %s\n",
-                                     connector->base.id,
-                                     connector->name,
-                                     old, new);
-                       DRM_DEBUG_KMS("[CONNECTOR:%d:%s] epoch counter %llu -> %llu\n",
-                                     connector->base.id, connector->name,
-                                     old_epoch_counter, connector->epoch_counter);
+                       drm_dbg_kms(dev, "[CONNECTOR:%d:%s] status updated from %s to %s\n",
+                                   connector->base.id, connector->name,
+                                   old, new);
+                       drm_dbg_kms(dev, "[CONNECTOR:%d:%s] epoch counter %llu -> %llu\n",
+                                   connector->base.id, connector->name,
+                                   old_epoch_counter, connector->epoch_counter);
 
                        changed = true;
                }