Commit b0bd0a92 authored by Srinivasan Shanmugam's avatar Srinivasan Shanmugam Committed by Alex Deucher
Browse files

drm/amdgpu: Prefer dev_* variant over printk in amdgpu_atpx_handler.c 



Changed from printk to dev_* variants so that
we get better debug info when there are multiple GPUs
in the system.

Fixes other style issue:

ERROR: open brace '{' following function definitions go on the next line
WARNING: printk() should include KERN_<LEVEL> facility level

Cc: Christian König <christian.koenig@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSrinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7593164d

drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c

+23 −12
Original line number Diff line number Diff line
@@ -74,24 +74,29 @@ struct atpx_mux { 
	u16 mux;

} __packed;



bool amdgpu_has_atpx(void) {

bool amdgpu_has_atpx(void)

{

	return amdgpu_atpx_priv.atpx_detected;

}



bool amdgpu_has_atpx_dgpu_power_cntl(void) {

bool amdgpu_has_atpx_dgpu_power_cntl(void)

{

	return amdgpu_atpx_priv.atpx.functions.power_cntl;

}



bool amdgpu_is_atpx_hybrid(void) {

bool amdgpu_is_atpx_hybrid(void)

{

	return amdgpu_atpx_priv.atpx.is_hybrid;

}



bool amdgpu_atpx_dgpu_req_power_for_displays(void) {

bool amdgpu_atpx_dgpu_req_power_for_displays(void)

{

	return amdgpu_atpx_priv.atpx.dgpu_req_power_for_displays;

}



#if defined(CONFIG_ACPI)

void *amdgpu_atpx_get_dhandle(void) {

void *amdgpu_atpx_get_dhandle(void)

{

	return amdgpu_atpx_priv.dhandle;

}

#endif
@@ -113,6 +118,8 @@ static union acpi_object *amdgpu_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];
@@ -134,7 +141,7 @@ static union acpi_object *amdgpu_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) {

		printk("failed to evaluate ATPX got %s\n",

		dev_err(dev, "failed to evaluate ATPX got %s\n",

			acpi_format_exception(status));

		kfree(buffer.pointer);

		return NULL;
@@ -176,6 +183,8 @@ static void amdgpu_atpx_parse_functions(struct amdgpu_atpx_functions *f, u32 mas 
static int amdgpu_atpx_validate(struct amdgpu_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;
@@ -190,7 +199,7 @@ static int amdgpu_atpx_validate(struct amdgpu_atpx *atpx) 


		size = *(u16 *) info->buffer.pointer;

		if (size < 10) {

			printk("ATPX buffer is too small: %zu\n", size);

			dev_err(dev, "ATPX buffer is too small: %zu\n", size);

			kfree(info);

			return -EINVAL;

		}
@@ -223,11 +232,11 @@ static int amdgpu_atpx_validate(struct amdgpu_atpx *atpx) 
	atpx->is_hybrid = false;

	if (valid_bits & ATPX_MS_HYBRID_GFX_SUPPORTED) {

		if (amdgpu_atpx_priv.quirks & AMDGPU_PX_QUIRK_FORCE_ATPX) {

			printk("ATPX Hybrid Graphics, forcing to ATPX\n");

			dev_info(dev, "ATPX Hybrid Graphics, forcing to ATPX\n");

			atpx->functions.power_cntl = true;

			atpx->is_hybrid = false;

		} else {

			printk("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.
@@ -260,6 +269,8 @@ static int amdgpu_atpx_verify_interface(struct amdgpu_atpx *atpx) 
	struct atpx_verify_interface output;

	size_t size;

	int err = 0;

	struct acpi_device *adev = container_of(atpx->handle, struct acpi_device, handle);

	struct device *dev = &adev->dev;



	info = amdgpu_atpx_call(atpx->handle, ATPX_FUNCTION_VERIFY_INTERFACE, NULL);

	if (!info)
@@ -278,7 +289,7 @@ static int amdgpu_atpx_verify_interface(struct amdgpu_atpx *atpx) 
	memcpy(&output, info->buffer.pointer, size);



	/* TODO: check version? */

	printk("ATPX version %u, functions 0x%08x\n",

	dev_info(dev, "ATPX version %u, functions 0x%08x\n",

		 output.version, output.function_bits);



	amdgpu_atpx_parse_functions(&atpx->functions, output.function_bits);