From: Mario Limonciello Date: Tue, 18 Feb 2025 04:58:32 +0000 (-0600) Subject: drm/amd/display: Use drm_err() instead of DRM_ERROR in dm_resume() X-Git-Tag: v6.15-rc1~120^2~12^2~60 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=180998bf307f78efff43f4067c09156e0f33c8fd;p=thirdparty%2Fkernel%2Flinux.git drm/amd/display: Use drm_err() instead of DRM_ERROR in dm_resume() drm_err() is helpful to show which device had the error. Adjust to using this instead for error messages. Reviewed-by: Alex Hung Signed-off-by: Mario Limonciello Signed-off-by: Wayne Lin Tested-by: Daniel Wheeler Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index e41d1ab34705f..9c96841387dd7 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -3379,7 +3379,7 @@ static int dm_resume(struct amdgpu_ip_block *ip_block) r = dm_dmub_hw_init(adev); if (r) - DRM_ERROR("DMUB interface failed to initialize: status=%d\n", r); + drm_err(adev_to_drm(adev), "DMUB interface failed to initialize: status=%d\n", r); dc_dmub_srv_set_power_state(dm->dc->ctx->dmub_srv, DC_ACPI_CM_POWER_STATE_D0); dc_set_power_state(dm->dc, DC_ACPI_CM_POWER_STATE_D0); @@ -3472,7 +3472,7 @@ static int dm_resume(struct amdgpu_ip_block *ip_block) mutex_lock(&aconnector->hpd_lock); if (!dc_link_detect_connection_type(aconnector->dc_link, &new_connection_type)) - DRM_ERROR("KMS: Failed to detect connector\n"); + drm_err(adev_to_drm(adev), "KMS: Failed to detect connector\n"); if (aconnector->base.force && new_connection_type == dc_connection_none) { emulated_link_detect(aconnector->dc_link);