Commit 1112a46b authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amdgpu: Refine function name and function args 



There are no any logical changes here.

1. change function names:
   amdgpu_device_ip_late_set_pg/cg_state to
   amdgpu_device_set_pg/cg_state.
2. add a function argument cg/pg_state, so
   we can enable/disable cg/pg through those functions

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8ab56172

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

+19 −20
Original line number Diff line number Diff line
@@ -1690,24 +1690,26 @@ static bool amdgpu_device_check_vram_lost(struct amdgpu_device *adev) 
}



/**

 * amdgpu_device_ip_late_set_cg_state - late init for clockgating

 * amdgpu_device_set_cg_state - set clockgating for amdgpu device

 *

 * @adev: amdgpu_device pointer

 *

 * Late initialization pass enabling clockgating for hardware IPs.

 * The list of all the hardware IPs that make up the asic is walked and the

 * set_clockgating_state callbacks are run.  This stage is run late

 * in the init process.

 * set_clockgating_state callbacks are run.

 * Late initialization pass enabling clockgating for hardware IPs.

 * Fini or suspend, pass disabling clockgating for hardware IPs.

 * Returns 0 on success, negative error code on failure.

 */

static int amdgpu_device_ip_late_set_cg_state(struct amdgpu_device *adev)

static int amdgpu_device_set_cg_state(struct amdgpu_device *adev,

						enum amd_clockgating_state state)

{

	int i = 0, r;

	int i, j, r;



	if (amdgpu_emu_mode == 1)

		return 0;



	for (i = 0; i < adev->num_ip_blocks; i++) {

	for (j = 0; j < adev->num_ip_blocks; j++) {

		i = state == AMD_CG_STATE_GATE ? j : adev->num_ip_blocks - j - 1;

		if (!adev->ip_blocks[i].status.valid)

			continue;

		/* skip CG for VCE/UVD, it's handled specially */
@@ -1717,7 +1719,7 @@ static int amdgpu_device_ip_late_set_cg_state(struct amdgpu_device *adev) 
		    adev->ip_blocks[i].version->funcs->set_clockgating_state) {

			/* enable clockgating to save power */

			r = adev->ip_blocks[i].version->funcs->set_clockgating_state((void *)adev,

										     AMD_CG_STATE_GATE);

										     state);

			if (r) {

				DRM_ERROR("set_clockgating_state(gate) of IP block <%s> failed %d\n",

					  adev->ip_blocks[i].version->funcs->name, r);
@@ -1729,14 +1731,15 @@ static int amdgpu_device_ip_late_set_cg_state(struct amdgpu_device *adev) 
	return 0;

}



static int amdgpu_device_ip_late_set_pg_state(struct amdgpu_device *adev)

static int amdgpu_device_set_pg_state(struct amdgpu_device *adev, enum amd_powergating_state state)

{

	int i = 0, r;

	int i, j, r;



	if (amdgpu_emu_mode == 1)

		return 0;



	for (i = 0; i < adev->num_ip_blocks; i++) {

	for (j = 0; j < adev->num_ip_blocks; j++) {

		i = state == AMD_PG_STATE_GATE ? j : adev->num_ip_blocks - j - 1;

		if (!adev->ip_blocks[i].status.valid)

			continue;

		/* skip CG for VCE/UVD, it's handled specially */
@@ -1746,7 +1749,7 @@ static int amdgpu_device_ip_late_set_pg_state(struct amdgpu_device *adev) 
		    adev->ip_blocks[i].version->funcs->set_powergating_state) {

			/* enable powergating to save power */

			r = adev->ip_blocks[i].version->funcs->set_powergating_state((void *)adev,

										     AMD_PG_STATE_GATE);

											state);

			if (r) {

				DRM_ERROR("set_powergating_state(gate) of IP block <%s> failed %d\n",

					  adev->ip_blocks[i].version->funcs->name, r);
@@ -1787,8 +1790,8 @@ static int amdgpu_device_ip_late_init(struct amdgpu_device *adev) 
		}

	}



	amdgpu_device_ip_late_set_cg_state(adev);

	amdgpu_device_ip_late_set_pg_state(adev);

	amdgpu_device_set_cg_state(adev, AMD_CG_STATE_GATE);

	amdgpu_device_set_pg_state(adev, AMD_PG_STATE_GATE);



	queue_delayed_work(system_wq, &adev->late_init_work,

			   msecs_to_jiffies(AMDGPU_RESUME_MS));
@@ -1906,13 +1909,9 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev) 
}



/**

 * amdgpu_device_ip_late_init_func_handler - work handler for clockgating

 *

 * @work: work_struct

 * amdgpu_device_ip_late_init_func_handler - work handler for ib test

 *

 * Work handler for amdgpu_device_ip_late_set_cg_state.  We put the

 * clockgating setup into a worker thread to speed up driver init and

 * resume from suspend.

 * @work: work_struct.

 */

static void amdgpu_device_ip_late_init_func_handler(struct work_struct *work)

{