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

drm/amdgpu: update the handle ptr in hw_init 



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

Also update the ip_block ptr where ever needed as
there were cyclic dependency of hw_init on resume.

v2: squash in isp fix

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 7feb4f3a

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

+2 −8
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static const struct dmi_system_id acp_quirk_table[] = { 
 * @handle: handle used to pass amdgpu_device pointer

 *

 */

static int acp_hw_init(void *handle)

static int acp_hw_init(struct amdgpu_ip_block *ip_block)

{

	int r;

	u64 acp_base;
@@ -230,13 +230,7 @@ static int acp_hw_init(void *handle) 
	u32 count = 0;

	struct i2s_platform_data *i2s_pdata = NULL;



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



	const struct amdgpu_ip_block *ip_block =

		amdgpu_device_ip_get_ip_block(adev, AMD_IP_BLOCK_TYPE_ACP);



	if (!ip_block)

		return -EINVAL;

	struct amdgpu_device *adev = ip_block->adev;



	r = amd_acp_hw_init(adev->acp.cgs_device,

			    ip_block->version->major, ip_block->version->minor);

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

+7 −7
Original line number Diff line number Diff line
@@ -2684,7 +2684,7 @@ static int amdgpu_device_ip_hw_init_phase1(struct amdgpu_device *adev) 
		if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_COMMON ||

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

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

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

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

			if (r) {

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

					  adev->ip_blocks[i].version->funcs->name, r);
@@ -2709,7 +2709,7 @@ static int amdgpu_device_ip_hw_init_phase2(struct amdgpu_device *adev) 
		if (!amdgpu_ip_member_of_hwini(

			    adev, adev->ip_blocks[i].version->type))

			continue;

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

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

		if (r) {

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

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

				}

			} else {

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

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

				if (r) {

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

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


		if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_COMMON) {

			/* need to do common hw init early so everything is set up for gmc */

			r = adev->ip_blocks[i].version->funcs->hw_init((void *)adev);

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

			if (r) {

				DRM_ERROR("hw_init %d failed %d\n", i, r);

				goto init_failed;
@@ -2882,7 +2882,7 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) 
				DRM_ERROR("amdgpu_mem_scratch_init failed %d\n", r);

				goto init_failed;

			}

			r = adev->ip_blocks[i].version->funcs->hw_init((void *)adev);

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

			if (r) {

				DRM_ERROR("hw_init %d failed %d\n", i, r);

				goto init_failed;
@@ -3626,7 +3626,7 @@ static int amdgpu_device_ip_reinit_early_sriov(struct amdgpu_device *adev) 
				!block->status.valid)

				continue;



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

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

			DRM_INFO("RE-INIT-early: %s %s\n", block->version->funcs->name, r?"failed":"succeeded");

			if (r)

				return r;
@@ -3668,7 +3668,7 @@ static int amdgpu_device_ip_reinit_late_sriov(struct amdgpu_device *adev) 
			if (block->version->type == AMD_IP_BLOCK_TYPE_SMC)

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

			else

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

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



			DRM_INFO("RE-INIT-late: %s %s\n", block->version->funcs->name, r?"failed":"succeeded");

			if (r)

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

+2 −8
Original line number Diff line number Diff line
@@ -49,17 +49,11 @@ static int isp_sw_fini(struct amdgpu_ip_block *ip_block) 
 * @handle: handle for amdgpu_device pointer

 *

 */

static int isp_hw_init(void *handle)

static int isp_hw_init(struct amdgpu_ip_block *ip_block)

{

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

	struct amdgpu_device *adev = ip_block->adev;

	struct amdgpu_isp *isp = &adev->isp;



	const struct amdgpu_ip_block *ip_block =

		amdgpu_device_ip_get_ip_block(adev, AMD_IP_BLOCK_TYPE_ISP);



	if (!ip_block)

		return -EINVAL;



	if (isp->funcs->hw_init != NULL)

		return isp->funcs->hw_init(isp);

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

+2 −2
Original line number Diff line number Diff line
@@ -2973,10 +2973,10 @@ static int psp_load_fw(struct amdgpu_device *adev) 
	return ret;

}



static int psp_hw_init(void *handle)

static int psp_hw_init(struct amdgpu_ip_block *ip_block)

{

	int ret;

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

	struct amdgpu_device *adev = ip_block->adev;



	mutex_lock(&adev->firmware.mutex);

	/*

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

+3 −5
Original line number Diff line number Diff line
@@ -839,9 +839,9 @@ static int umsch_mm_sw_fini(struct amdgpu_ip_block *ip_block) 
	return 0;

}



static int umsch_mm_hw_init(void *handle)

static int umsch_mm_hw_init(struct amdgpu_ip_block *ip_block)

{

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

	struct amdgpu_device *adev = ip_block->adev;

	int r;



	r = umsch_mm_load_microcode(&adev->umsch_mm);
@@ -882,9 +882,7 @@ static int umsch_mm_suspend(struct amdgpu_ip_block *ip_block) 


static int umsch_mm_resume(struct amdgpu_ip_block *ip_block)

{

	struct amdgpu_device *adev = ip_block->adev;



	return umsch_mm_hw_init(adev);

	return umsch_mm_hw_init(ip_block);

}



void amdgpu_umsch_fwlog_init(struct amdgpu_umsch_mm *umsch_mm)