Commit 7feb4f3a authored by Sunil Khatri's avatar Sunil Khatri Committed by Alex Deucher
Browse files

drm/amdgpu: update the handle ptr in resume 



Update the *handle to amdgpu_ip_block ptr for all
functions pointers of resume.

Signed-off-by: default avatarSunil Khatri <sunil.khatri@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 982d7f9b

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

+2 −2
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static int aldebaran_mode2_restore_ip(struct amdgpu_device *adev) 
		dev_err(adev->dev, "Failed to get BIF handle\n");

		return -EINVAL;

	}

	r = cmn_block->version->funcs->resume(adev);

	r = cmn_block->version->funcs->resume(cmn_block);

	if (r)

		return r;
@@ -282,7 +282,7 @@ static int aldebaran_mode2_restore_ip(struct amdgpu_device *adev) 
		      adev->ip_blocks[i].version->type ==

			      AMD_IP_BLOCK_TYPE_SDMA))

			continue;

		r = adev->ip_blocks[i].version->funcs->resume(adev);

		r = adev->ip_blocks[i].version->funcs->resume(&adev->ip_blocks[i]);

		if (r) {

			dev_err(adev->dev,

				"resume of IP block <%s> failed %d\n",

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

+2 −2
Original line number Diff line number Diff line
@@ -575,9 +575,9 @@ static int acp_suspend(struct amdgpu_ip_block *ip_block) 
	return 0;

}



static int acp_resume(void *handle)

static int acp_resume(struct amdgpu_ip_block *ip_block)

{

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

	struct amdgpu_device *adev = ip_block->adev;



	/* power down again on resume */

	if (!adev->acp.acp_cell)

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

+4 −4
Original line number Diff line number Diff line
@@ -2744,7 +2744,7 @@ static int amdgpu_device_fw_loading(struct amdgpu_device *adev) 
				break;



			if (amdgpu_in_reset(adev) || adev->in_suspend) {

				r = adev->ip_blocks[i].version->funcs->resume(adev);

				r = adev->ip_blocks[i].version->funcs->resume(&adev->ip_blocks[i]);

				if (r) {

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

							  adev->ip_blocks[i].version->funcs->name, r);
@@ -3666,7 +3666,7 @@ static int amdgpu_device_ip_reinit_late_sriov(struct amdgpu_device *adev) 
				continue;



			if (block->version->type == AMD_IP_BLOCK_TYPE_SMC)

				r = block->version->funcs->resume(adev);

				r = block->version->funcs->resume(&adev->ip_blocks[i]);

			else

				r = block->version->funcs->hw_init(adev);
@@ -3704,7 +3704,7 @@ static int amdgpu_device_ip_resume_phase1(struct amdgpu_device *adev) 
		    adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_IH ||

		    (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_PSP && amdgpu_sriov_vf(adev))) {



			r = adev->ip_blocks[i].version->funcs->resume(adev);

			r = adev->ip_blocks[i].version->funcs->resume(&adev->ip_blocks[i]);

			if (r) {

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

					  adev->ip_blocks[i].version->funcs->name, r);
@@ -3742,7 +3742,7 @@ static int amdgpu_device_ip_resume_phase2(struct amdgpu_device *adev) 
		    adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_IH ||

		    adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_PSP)

			continue;

		r = adev->ip_blocks[i].version->funcs->resume(adev);

		r = adev->ip_blocks[i].version->funcs->resume(&adev->ip_blocks[i]);

		if (r) {

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

				  adev->ip_blocks[i].version->funcs->name, r);

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

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static int isp_suspend(struct amdgpu_ip_block *ip_block) 
	return 0;

}



static int isp_resume(void *handle)

static int isp_resume(struct amdgpu_ip_block *ip_block)

{

	return 0;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -3089,10 +3089,10 @@ static int psp_suspend(struct amdgpu_ip_block *ip_block) 
	return ret;

}



static int psp_resume(void *handle)

static int psp_resume(struct amdgpu_ip_block *ip_block)

{

	int ret;

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

	struct amdgpu_device *adev = ip_block->adev;

	struct psp_context *psp = &adev->psp;



	dev_info(adev->dev, "PSP is resuming...\n");