On Thu, Jul 20, 2023 at 6:29 AM Srinivasan Shanmugam
<srinivasan.shanmugam@xxxxxxx> wrote:
>
> Changed from pr_err/info to dev_* variants so that
> we get better debug info when there are multiple GPUs
> in the system.
>
> 'Fixes: 8e2503972912c ("drm/radeon: Prefer pr_err/_info over printk")'
> Suggested-by: Alex Deucher <alexander.deucher@xxxxxxx>
> Cc: Christian König <christian.koenig@xxxxxxx>
> Cc: Alex Deucher <alexander.deucher@xxxxxxx>
> Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam@xxxxxxx>
Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>
> ---
> drivers/gpu/drm/radeon/radeon_atpx_handler.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
> index 595354e3ce0b..fb4d931fdf18 100644
> --- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c
> +++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
> @@ -94,6 +94,8 @@ static union acpi_object *radeon_atpx_call(acpi_handle handle, int function,
> union acpi_object atpx_arg_elements[2];
> struct acpi_object_list atpx_arg;
> struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
> + struct acpi_device *adev = container_of(handle, struct acpi_device, handle);
> + struct device *dev = &adev->dev;
>
> atpx_arg.count = 2;
> atpx_arg.pointer = &atpx_arg_elements[0];
> @@ -115,8 +117,8 @@ static union acpi_object *radeon_atpx_call(acpi_handle handle, int function,
>
> /* Fail only if calling the method fails and ATPX is supported */
> if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
> - pr_err("failed to evaluate ATPX got %s\n",
> - acpi_format_exception(status));
> + dev_err(dev, "failed to evaluate ATPX got %s\n",
> + acpi_format_exception(status));
> kfree(buffer.pointer);
> return NULL;
> }
> @@ -157,6 +159,8 @@ static void radeon_atpx_parse_functions(struct radeon_atpx_functions *f, u32 mas
> static int radeon_atpx_validate(struct radeon_atpx *atpx)
> {
> u32 valid_bits = 0;
> + struct acpi_device *adev = container_of(atpx->handle, struct acpi_device, handle);
> + struct device *dev = &adev->dev;
>
> if (atpx->functions.px_params) {
> union acpi_object *info;
> @@ -171,7 +175,7 @@ static int radeon_atpx_validate(struct radeon_atpx *atpx)
>
> size = *(u16 *) info->buffer.pointer;
> if (size < 10) {
> - pr_err("ATPX buffer is too small: %zu\n", size);
> + dev_err(dev, "ATPX buffer is too small: %zu\n", size);
> kfree(info);
> return -EINVAL;
> }
> @@ -202,7 +206,7 @@ static int radeon_atpx_validate(struct radeon_atpx *atpx)
>
> atpx->is_hybrid = false;
> if (valid_bits & ATPX_MS_HYBRID_GFX_SUPPORTED) {
> - pr_info("ATPX Hybrid Graphics\n");
> + dev_info(dev, "ATPX Hybrid Graphics\n");
> /*
> * Disable legacy PM methods only when pcie port PM is usable,
> * otherwise the device might fail to power off or power on.
> --
> 2.25.1
>
