Commit 80d80511 authored by Boyuan Zhang's avatar Boyuan Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: pass ip_block in set_powergating_state 



Pass ip_block instead of adev in set_powergating_state callback function.
Modify set_powergating_state ip functions for all correspoding ip blocks.

v2: fix a ip block index error.

v3: remove type casting

Signed-off-by: default avatarBoyuan Zhang <boyuan.zhang@amd.com>
Suggested-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarSunil Khatri <sunil.khatri@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 393f026b

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

+2 −2
Original line number Diff line number Diff line
@@ -590,10 +590,10 @@ static int acp_set_clockgating_state(void *handle, 
	return 0;

}



static int acp_set_powergating_state(void *handle,

static int acp_set_powergating_state(struct amdgpu_ip_block *ip_block,

				     enum amd_powergating_state state)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	struct amdgpu_device *adev = ip_block->adev;

	bool enable = (state == AMD_PG_STATE_GATE);



	amdgpu_dpm_set_powergating_by_smu(adev, AMD_IP_BLOCK_TYPE_ACP, enable, 0);

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

+3 −1
Original line number Diff line number Diff line
@@ -724,7 +724,9 @@ void amdgpu_amdkfd_set_compute_idle(struct amdgpu_device *adev, bool idle) 
		/* Disable GFXOFF and PG. Temporary workaround

		 * to fix some compute applications issue on GFX9.

		 */

		adev->ip_blocks[AMD_IP_BLOCK_TYPE_GFX].version->funcs->set_powergating_state((void *)adev, state);

		struct amdgpu_ip_block *gfx_block = amdgpu_device_ip_get_ip_block(adev, AMD_IP_BLOCK_TYPE_GFX);

		if (gfx_block != NULL)

			gfx_block->version->funcs->set_powergating_state((void *)gfx_block, state);

	}

	amdgpu_dpm_switch_power_profile(adev,

					PP_SMC_POWER_PROFILE_COMPUTE,

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

+2 −2
Original line number Diff line number Diff line
@@ -2199,7 +2199,7 @@ int amdgpu_device_ip_set_powergating_state(void *dev, 
		if (!adev->ip_blocks[i].version->funcs->set_powergating_state)

			continue;

		r = adev->ip_blocks[i].version->funcs->set_powergating_state(

			(void *)adev, state);

			&adev->ip_blocks[i], state);

		if (r)

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

				  adev->ip_blocks[i].version->funcs->name, r);
@@ -3174,7 +3174,7 @@ int amdgpu_device_set_pg_state(struct amdgpu_device *adev, 
		    adev->ip_blocks[i].version->type != AMD_IP_BLOCK_TYPE_JPEG &&

		    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,

			r = adev->ip_blocks[i].version->funcs->set_powergating_state(&adev->ip_blocks[i],

											state);

			if (r) {

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

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

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static int isp_set_clockgating_state(void *handle, 
	return 0;

}



static int isp_set_powergating_state(void *handle,

static int isp_set_powergating_state(struct amdgpu_ip_block *ip_block,

				     enum amd_powergating_state state)

{

	return 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -3855,7 +3855,7 @@ static int psp_set_clockgating_state(void *handle, 
	return 0;

}



static int psp_set_powergating_state(void *handle,

static int psp_set_powergating_state(struct amdgpu_ip_block *ip_block,

				     enum amd_powergating_state state)

{

	return 0;