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

drm/amdgpu: pass ip_block in set_clockgating_state 



Pass ip_block instead of adev in set_clockgating_state() callback
functions. Modify set_clockgating_state()for all correspoding ip blocks.

v2: remove all changes for is_idle(), remove type casting

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

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

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ static bool acp_is_idle(void *handle) 
	return true;

}



static int acp_set_clockgating_state(void *handle,

static int acp_set_clockgating_state(struct amdgpu_ip_block *ip_block,

				     enum amd_clockgating_state state)

{

	return 0;

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

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

			continue;

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

			(void *)adev, state);

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

		if (r)

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

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

		    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,

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

										     state);

			if (r) {

				DRM_ERROR("set_clockgating_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
@@ -128,7 +128,7 @@ static bool isp_is_idle(void *handle) 
	return true;

}



static int isp_set_clockgating_state(void *handle,

static int isp_set_clockgating_state(struct amdgpu_ip_block *ip_block,

				     enum amd_clockgating_state state)

{

	return 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -3849,7 +3849,7 @@ int psp_config_sq_perfmon(struct psp_context *psp, 
	return ret;

}



static int psp_set_clockgating_state(void *handle,

static int psp_set_clockgating_state(struct amdgpu_ip_block *ip_block,

					enum amd_clockgating_state state)

{

	return 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ static bool amdgpu_vkms_is_idle(void *handle) 
	return true;

}



static int amdgpu_vkms_set_clockgating_state(void *handle,

static int amdgpu_vkms_set_clockgating_state(struct amdgpu_ip_block *ip_block,

					  enum amd_clockgating_state state)

{

	return 0;