Commit 9d5ee7ce authored by Sunil Khatri's avatar Sunil Khatri Committed by Alex Deucher
Browse files

drm/amdgpu: update the handle ptr in pre_soft_reset 



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

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 f0b91996

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

+1 −1
Original line number Diff line number Diff line
@@ -4979,7 +4979,7 @@ static int amdgpu_device_ip_pre_soft_reset(struct amdgpu_device *adev) 
			continue;

		if (adev->ip_blocks[i].status.hang &&

		    adev->ip_blocks[i].version->funcs->pre_soft_reset) {

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

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

			if (r)

				return r;

		}

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

+2 −2
Original line number Diff line number Diff line
@@ -4983,9 +4983,9 @@ static bool gfx_v8_0_check_soft_reset(struct amdgpu_ip_block *ip_block) 
	}

}



static int gfx_v8_0_pre_soft_reset(void *handle)

static int gfx_v8_0_pre_soft_reset(struct amdgpu_ip_block *ip_block)

{

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

	struct amdgpu_device *adev = ip_block->adev;

	u32 grbm_soft_reset = 0;



	if ((!adev->gfx.grbm_soft_reset) &&

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

+2 −2
Original line number Diff line number Diff line
@@ -1316,9 +1316,9 @@ static bool gmc_v8_0_check_soft_reset(struct amdgpu_ip_block *ip_block) 
	return false;

}



static int gmc_v8_0_pre_soft_reset(void *handle)

static int gmc_v8_0_pre_soft_reset(struct amdgpu_ip_block *ip_block)

{

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

	struct amdgpu_device *adev = ip_block->adev;



	if (!adev->gmc.srbm_soft_reset)

		return 0;

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

+2 −2
Original line number Diff line number Diff line
@@ -1252,9 +1252,9 @@ static bool sdma_v3_0_check_soft_reset(struct amdgpu_ip_block *ip_block) 
	}

}



static int sdma_v3_0_pre_soft_reset(void *handle)

static int sdma_v3_0_pre_soft_reset(struct amdgpu_ip_block *ip_block)

{

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

	struct amdgpu_device *adev = ip_block->adev;

	u32 srbm_soft_reset = 0;



	if (!adev->sdma.srbm_soft_reset)

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

+2 −2
Original line number Diff line number Diff line
@@ -405,9 +405,9 @@ static bool tonga_ih_check_soft_reset(struct amdgpu_ip_block *ip_block) 
	}

}



static int tonga_ih_pre_soft_reset(void *handle)

static int tonga_ih_pre_soft_reset(struct amdgpu_ip_block *ip_block)

{

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

	struct amdgpu_device *adev = ip_block->adev;



	if (!adev->irq.srbm_soft_reset)

		return 0;