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

drm/sysfs: switch to drm device based logging

Prefer drm_dbg_kms() and drm_dbg_lease() over DRM_DEBUG_KMS() and
DRM_DEBUG() to debug log the drm device info. Fix some debug categories
and unify connector logging while at it.

v2: Drop superfluous newline

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

+10 -10
+10 -10
drivers/gpu/drm/drm_sysfs.c
··· 209 209 ret = -EINVAL; 210 210 211 211 if (old_force != connector->force || !connector->force) { 212 - DRM_DEBUG_KMS("[CONNECTOR:%d:%s] force updated from %d to %d or reprobing\n", 213 - connector->base.id, 214 - connector->name, 215 - old_force, connector->force); 212 + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] force updated from %d to %d or reprobing\n", 213 + connector->base.id, connector->name, 214 + old_force, connector->force); 216 215 217 216 connector->funcs->fill_modes(connector, 218 217 dev->mode_config.max_width, ··· 382 383 if (r) 383 384 goto err_free; 384 385 385 - DRM_DEBUG("adding \"%s\" to sysfs\n", 386 - connector->name); 386 + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] adding connector to sysfs\n", 387 + connector->base.id, connector->name); 387 388 388 389 r = device_add(kdev); 389 390 if (r) { ··· 429 430 if (dev_fwnode(connector->kdev)) 430 431 component_del(connector->kdev, &typec_connector_ops); 431 432 432 - DRM_DEBUG("removing \"%s\" from sysfs\n", 433 - connector->name); 433 + drm_dbg_kms(connector->dev, 434 + "[CONNECTOR:%d:%s] removing connector from sysfs\n", 435 + connector->base.id, connector->name); 434 436 435 437 device_unregister(connector->kdev); 436 438 connector->kdev = NULL; ··· 442 442 char *event_string = "LEASE=1"; 443 443 char *envp[] = { event_string, NULL }; 444 444 445 - DRM_DEBUG("generating lease event\n"); 445 + drm_dbg_lease(dev, "generating lease event\n"); 446 446 447 447 kobject_uevent_env(&dev->primary->kdev->kobj, KOBJ_CHANGE, envp); 448 448 } ··· 463 463 char *event_string = "HOTPLUG=1"; 464 464 char *envp[] = { event_string, NULL }; 465 465 466 - DRM_DEBUG("generating hotplug event\n"); 466 + drm_dbg_kms(dev, "generating hotplug event\n"); 467 467 468 468 kobject_uevent_env(&dev->primary->kdev->kobj, KOBJ_CHANGE, envp); 469 469 }