From: Mario Limonciello <mario.limoncie...@amd.com> Messages emitted from amdgpu_acpi are not device specific nor DRM specific, but rather operate on ACPI handles. Adjust the messages to use ACPI macros instead.
Signed-off-by: Mario Limonciello <mario.limoncie...@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c index b7f8f2ff143dd..1c5994de5a723 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c @@ -256,7 +256,7 @@ static int amdgpu_atif_verify_interface(struct amdgpu_atif *atif) size = *(u16 *) info->buffer.pointer; if (size < 12) { - DRM_INFO("ATIF buffer is too small: %zu\n", size); + acpi_handle_info(atif->handle, "ATIF buffer is too small: %zu\n", size); err = -EINVAL; goto out; } @@ -265,7 +265,7 @@ static int amdgpu_atif_verify_interface(struct amdgpu_atif *atif) memcpy(&output, info->buffer.pointer, size); /* TODO: check version? */ - DRM_DEBUG_DRIVER("ATIF version %u\n", output.version); + acpi_handle_debug(atif->handle, "ATIF version %u\n", output.version); amdgpu_atif_parse_notification(&atif->notifications, output.notification_mask); amdgpu_atif_parse_functions(&atif->functions, output.function_bits); @@ -616,7 +616,7 @@ static int amdgpu_atcs_verify_interface(struct amdgpu_atcs *atcs) size = *(u16 *) info->buffer.pointer; if (size < 8) { - DRM_INFO("ATCS buffer is too small: %zu\n", size); + acpi_handle_info(atcs->handle, "ATCS buffer is too small: %zu\n", size); err = -EINVAL; goto out; } @@ -625,7 +625,7 @@ static int amdgpu_atcs_verify_interface(struct amdgpu_atcs *atcs) memcpy(&output, info->buffer.pointer, size); /* TODO: check version? */ - DRM_DEBUG_DRIVER("ATCS version %u\n", output.version); + acpi_handle_debug(atcs->handle, "ATCS version %u\n", output.version); amdgpu_atcs_parse_functions(&atcs->functions, output.function_bits); @@ -741,7 +741,7 @@ int amdgpu_acpi_pcie_performance_request(struct amdgpu_device *adev, size = *(u16 *) info->buffer.pointer; if (size < 3) { - DRM_INFO("ATCS buffer is too small: %zu\n", size); + acpi_handle_info(atcs->handle, "ATCS buffer is too small: %zu\n", size); kfree(info); return -EINVAL; } @@ -800,7 +800,7 @@ int amdgpu_acpi_power_shift_control(struct amdgpu_device *adev, info = amdgpu_atcs_call(atcs, ATCS_FUNCTION_POWER_SHIFT_CONTROL, ¶ms); if (!info) { - DRM_ERROR("ATCS PSC update failed\n"); + acpi_handle_err(atcs->handle, "ATCS PSC update failed\n"); return -EIO; } @@ -1429,8 +1429,9 @@ void amdgpu_acpi_detect(void) if (atif->functions.system_params) { ret = amdgpu_atif_get_notification_params(atif); if (ret) { - DRM_DEBUG_DRIVER("Call to GET_SYSTEM_PARAMS failed: %d\n", - ret); + acpi_handle_debug(atif->handle, + "GET_SYSTEM_PARAMS evaluation failed: %d\n", + ret); /* Disable notification */ atif->notification_cfg.enabled = false; } @@ -1439,8 +1440,9 @@ void amdgpu_acpi_detect(void) if (atif->functions.query_backlight_transfer_characteristics) { ret = amdgpu_atif_query_backlight_caps(atif); if (ret) { - DRM_DEBUG_DRIVER("Call to QUERY_BACKLIGHT_TRANSFER_CHARACTERISTICS failed: %d\n", - ret); + acpi_handle_debug(atif->handle, + "QUERY_BACKLIGHT_TRANSFER_CHARACTERISTICS evaluation failed: %d\n", + ret); atif->backlight_caps.caps_valid = false; } } else { -- 2.43.0