Commit 98618005 authored by Jani Nikula's avatar Jani Nikula
Browse files

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: default avatarJani Nikula <jani.nikula@intel.com>
parent 1701e62f

drivers/gpu/drm/drm_probe_helper.c

+17 −19
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ 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,

	drm_dbg_kms(dev, "[CONNECTOR:%d:%s]\n", connector->base.id,

		    connector->name);



retry:
@@ -611,9 +611,8 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector, 
	 * 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_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));
@@ -638,7 +637,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector, 
		drm_kms_helper_poll_enable(dev);



	if (connector->status == connector_status_disconnected) {

		DRM_DEBUG_KMS("[CONNECTOR:%d:%s] disconnected\n",

		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);
@@ -697,8 +696,9 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector, 


	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,12 +834,10 @@ 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,

			drm_dbg_kms(dev, "[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",

			drm_dbg_kms(dev, "[CONNECTOR:%d:%s] epoch counter %llu -> %llu\n",

				    connector->base.id, connector->name,

				    old_epoch_counter, connector->epoch_counter);