Commit 180998bf authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

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: default avatarAlex Hung <alex.hung@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarWayne Lin <wayne.lin@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e3bc320c

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+2 −2
Original line number Diff line number Diff line
@@ -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);