tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Jani Nikula 98618005 1701e62f

+17 -19
+17 -19
drivers/gpu/drm/drm_probe_helper.c
··· 567 567 568 568 drm_modeset_acquire_init(&ctx, 0); 569 569 570 - DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", connector->base.id, 571 - connector->name); 570 + drm_dbg_kms(dev, "[CONNECTOR:%d:%s]\n", connector->base.id, 571 + connector->name); 572 572 573 573 retry: 574 574 ret = drm_modeset_lock(&dev->mode_config.connection_mutex, &ctx); ··· 611 611 * check here, and if anything changed start the hotplug code. 612 612 */ 613 613 if (old_status != connector->status) { 614 - DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated from %s to %s\n", 615 - connector->base.id, 616 - connector->name, 617 - drm_get_connector_status_name(old_status), 618 - drm_get_connector_status_name(connector->status)); 614 + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] status updated from %s to %s\n", 615 + connector->base.id, connector->name, 616 + drm_get_connector_status_name(old_status), 617 + drm_get_connector_status_name(connector->status)); 619 618 620 619 /* 621 620 * The hotplug event code might call into the fb ··· 637 638 drm_kms_helper_poll_enable(dev); 638 639 639 640 if (connector->status == connector_status_disconnected) { 640 - DRM_DEBUG_KMS("[CONNECTOR:%d:%s] disconnected\n", 641 - connector->base.id, connector->name); 641 + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] disconnected\n", 642 + connector->base.id, connector->name); 642 643 drm_connector_update_edid_property(connector, NULL); 643 644 drm_mode_prune_invalid(dev, &connector->modes, false); 644 645 goto exit; ··· 696 697 697 698 drm_mode_sort(&connector->modes); 698 699 699 - DRM_DEBUG_KMS("[CONNECTOR:%d:%s] probed modes :\n", connector->base.id, 700 - connector->name); 700 + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] probed modes:\n", 701 + connector->base.id, connector->name); 702 + 701 703 list_for_each_entry(mode, &connector->modes, head) { 702 704 drm_mode_set_crtcinfo(mode, CRTC_INTERLACE_HALVE_V); 703 705 drm_mode_debug_printmodeline(mode); ··· 834 834 old = drm_get_connector_status_name(old_status); 835 835 new = drm_get_connector_status_name(connector->status); 836 836 837 - DRM_DEBUG_KMS("[CONNECTOR:%d:%s] " 838 - "status updated from %s to %s\n", 839 - connector->base.id, 840 - connector->name, 841 - old, new); 842 - DRM_DEBUG_KMS("[CONNECTOR:%d:%s] epoch counter %llu -> %llu\n", 843 - connector->base.id, connector->name, 844 - old_epoch_counter, connector->epoch_counter); 837 + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] status updated from %s to %s\n", 838 + connector->base.id, connector->name, 839 + old, new); 840 + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] epoch counter %llu -> %llu\n", 841 + connector->base.id, connector->name, 842 + old_epoch_counter, connector->epoch_counter); 845 843 846 844 changed = true; 847 845 }