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

drm/modes: switch to drm device based error logging

Prefer drm_err() and drm_dbg_kms() over DRM_ERROR() and DRM_DEBUG_KMS().

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

+17 -16
+17 -16
drivers/gpu/drm/drm_modes.c
··· 373 373 if (!bt601 && 374 374 (hact_duration_ns < params->hact_ns.min || 375 375 hact_duration_ns > params->hact_ns.max)) { 376 - DRM_ERROR("Invalid horizontal active area duration: %uns (min: %u, max %u)\n", 377 - hact_duration_ns, params->hact_ns.min, params->hact_ns.max); 376 + drm_err(dev, "Invalid horizontal active area duration: %uns (min: %u, max %u)\n", 377 + hact_duration_ns, params->hact_ns.min, params->hact_ns.max); 378 378 return -EINVAL; 379 379 } 380 380 ··· 385 385 if (!bt601 && 386 386 (hblk_duration_ns < params->hblk_ns.min || 387 387 hblk_duration_ns > params->hblk_ns.max)) { 388 - DRM_ERROR("Invalid horizontal blanking duration: %uns (min: %u, max %u)\n", 389 - hblk_duration_ns, params->hblk_ns.min, params->hblk_ns.max); 388 + drm_err(dev, "Invalid horizontal blanking duration: %uns (min: %u, max %u)\n", 389 + hblk_duration_ns, params->hblk_ns.min, params->hblk_ns.max); 390 390 return -EINVAL; 391 391 } 392 392 ··· 397 397 if (!bt601 && 398 398 (hslen_duration_ns < params->hslen_ns.min || 399 399 hslen_duration_ns > params->hslen_ns.max)) { 400 - DRM_ERROR("Invalid horizontal sync duration: %uns (min: %u, max %u)\n", 401 - hslen_duration_ns, params->hslen_ns.min, params->hslen_ns.max); 400 + drm_err(dev, "Invalid horizontal sync duration: %uns (min: %u, max %u)\n", 401 + hslen_duration_ns, params->hslen_ns.min, params->hslen_ns.max); 402 402 return -EINVAL; 403 403 } 404 404 ··· 409 409 if (!bt601 && 410 410 (porches_duration_ns > (params->hfp_ns.max + params->hbp_ns.max) || 411 411 porches_duration_ns < (params->hfp_ns.min + params->hbp_ns.min))) { 412 - DRM_ERROR("Invalid horizontal porches duration: %uns\n", porches_duration_ns); 412 + drm_err(dev, "Invalid horizontal porches duration: %uns\n", 413 + porches_duration_ns); 413 414 return -EINVAL; 414 415 } 415 416 ··· 432 431 if (!bt601 && 433 432 (hfp_duration_ns < params->hfp_ns.min || 434 433 hfp_duration_ns > params->hfp_ns.max)) { 435 - DRM_ERROR("Invalid horizontal front porch duration: %uns (min: %u, max %u)\n", 436 - hfp_duration_ns, params->hfp_ns.min, params->hfp_ns.max); 434 + drm_err(dev, "Invalid horizontal front porch duration: %uns (min: %u, max %u)\n", 435 + hfp_duration_ns, params->hfp_ns.min, params->hfp_ns.max); 437 436 return -EINVAL; 438 437 } 439 438 ··· 444 443 if (!bt601 && 445 444 (hbp_duration_ns < params->hbp_ns.min || 446 445 hbp_duration_ns > params->hbp_ns.max)) { 447 - DRM_ERROR("Invalid horizontal back porch duration: %uns (min: %u, max %u)\n", 448 - hbp_duration_ns, params->hbp_ns.min, params->hbp_ns.max); 446 + drm_err(dev, "Invalid horizontal back porch duration: %uns (min: %u, max %u)\n", 447 + hbp_duration_ns, params->hbp_ns.min, params->hbp_ns.max); 449 448 return -EINVAL; 450 449 } 451 450 ··· 496 495 497 496 vtotal = vactive + vfp + vslen + vbp; 498 497 if (params->num_lines != vtotal) { 499 - DRM_ERROR("Invalid vertical total: %upx (expected %upx)\n", 500 - vtotal, params->num_lines); 498 + drm_err(dev, "Invalid vertical total: %upx (expected %upx)\n", 499 + vtotal, params->num_lines); 501 500 return -EINVAL; 502 501 } 503 502 ··· 1814 1813 } 1815 1814 if (verbose) { 1816 1815 drm_mode_debug_printmodeline(mode); 1817 - DRM_DEBUG_KMS("Not using %s mode: %s\n", 1818 - mode->name, 1819 - drm_get_mode_status_name(mode->status)); 1816 + drm_dbg_kms(dev, "Not using %s mode: %s\n", 1817 + mode->name, 1818 + drm_get_mode_status_name(mode->status)); 1820 1819 } 1821 1820 drm_mode_destroy(dev, mode); 1822 1821 }