Commit 982d7f9b authored Sep 30, 2024 by Sunil Khatri Committed by Alex Deucher Oct 07, 2024

drm/amdgpu: update the handle ptr in suspend



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

Signed-off-by: Sunil Khatri <sunil.khatri@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 82ae6619

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@ static int aldebaran_mode2_suspend_ip(struct amdgpu_device *adev)
		AMD_IP_BLOCK_TYPE_SDMA))
		continue;

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

		if (r) {
		dev_err(adev->dev,

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -565,9 +565,9 @@ static int acp_hw_fini(void *handle)
		return 0;
		}

		static int acp_suspend(void *handle)
		static int acp_suspend(struct amdgpu_ip_block *ip_block)
		{
		struct amdgpu_device adev = (struct amdgpu_device )handle;
		struct amdgpu_device *adev = ip_block->adev;

		/* power up on suspend */
		if (!adev->acp.acp_cell)

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -3464,7 +3464,7 @@ static int amdgpu_device_ip_suspend_phase1(struct amdgpu_device *adev)
		continue;

		/* XXX handle errors */
		r = adev->ip_blocks[i].version->funcs->suspend(adev);
		r = adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
		/* XXX handle errors */
		if (r) {
		DRM_ERROR("suspend of IP block <%s> failed %d\n",
		@@ -3546,7 +3546,7 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev)
		continue;

		/* XXX handle errors */
		r = adev->ip_blocks[i].version->funcs->suspend(adev);
		r = adev->ip_blocks[i].version->funcs->suspend(&adev->ip_blocks[i]);
		/* XXX handle errors */
		if (r) {
		DRM_ERROR("suspend 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
		@@ -83,7 +83,7 @@ static int isp_hw_fini(void *handle)
		return -ENODEV;
		}

		static int isp_suspend(void *handle)
		static int isp_suspend(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
		@@ -3026,10 +3026,10 @@ static int psp_hw_fini(void *handle)
		return 0;
		}

		static int psp_suspend(void *handle)
		static int psp_suspend(struct amdgpu_ip_block *ip_block)
		{
		int ret = 0;
		struct amdgpu_device adev = (struct amdgpu_device )handle;
		struct amdgpu_device *adev = ip_block->adev;
		struct psp_context *psp = &adev->psp;

		if (adev->gmc.xgmi.num_physical_nodes > 1 &&