Commit c45e38f2 authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amdgpu: Restore partition mode after reset 



On a full device reset, PSP FW gets unloaded. Hence restore the
partition mode by placing a new request.

Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarAsad Kamal <asad.kamal@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Tested-by: default avatarAsad Kamal <asad.kamal@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f4f8a4da

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

+5 −0
Original line number Diff line number Diff line
@@ -5137,6 +5137,11 @@ int amdgpu_do_asic_reset(struct list_head *device_list_handle, 
				if (r)

					return r;



				r = amdgpu_xcp_restore_partition_mode(

					tmp_adev->xcp_mgr);

				if (r)

					goto out;



				r = amdgpu_device_ip_resume_phase2(tmp_adev);

				if (r)

					goto out;

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

+21 −7
Original line number Diff line number Diff line
@@ -163,16 +163,11 @@ int amdgpu_xcp_init(struct amdgpu_xcp_mgr *xcp_mgr, int num_xcps, int mode) 
	return 0;

}



int amdgpu_xcp_switch_partition_mode(struct amdgpu_xcp_mgr *xcp_mgr, int mode)

static int __amdgpu_xcp_switch_partition_mode(struct amdgpu_xcp_mgr *xcp_mgr,

					      int mode)

{

	int ret, curr_mode, num_xcps = 0;



	if (!xcp_mgr || mode == AMDGPU_XCP_MODE_NONE)

		return -EINVAL;



	if (xcp_mgr->mode == mode)

		return 0;



	if (!xcp_mgr->funcs || !xcp_mgr->funcs->switch_partition_mode)

		return 0;
@@ -201,6 +196,25 @@ int amdgpu_xcp_switch_partition_mode(struct amdgpu_xcp_mgr *xcp_mgr, int mode) 
	return ret;

}



int amdgpu_xcp_switch_partition_mode(struct amdgpu_xcp_mgr *xcp_mgr, int mode)

{

	if (!xcp_mgr || mode == AMDGPU_XCP_MODE_NONE)

		return -EINVAL;



	if (xcp_mgr->mode == mode)

		return 0;



	return __amdgpu_xcp_switch_partition_mode(xcp_mgr, mode);

}



int amdgpu_xcp_restore_partition_mode(struct amdgpu_xcp_mgr *xcp_mgr)

{

	if (!xcp_mgr || xcp_mgr->mode == AMDGPU_XCP_MODE_NONE)

		return 0;



	return __amdgpu_xcp_switch_partition_mode(xcp_mgr, xcp_mgr->mode);

}



int amdgpu_xcp_query_partition_mode(struct amdgpu_xcp_mgr *xcp_mgr, u32 flags)

{

	int mode;

drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ int amdgpu_xcp_mgr_init(struct amdgpu_device *adev, int init_mode, 
int amdgpu_xcp_init(struct amdgpu_xcp_mgr *xcp_mgr, int num_xcps, int mode);

int amdgpu_xcp_query_partition_mode(struct amdgpu_xcp_mgr *xcp_mgr, u32 flags);

int amdgpu_xcp_switch_partition_mode(struct amdgpu_xcp_mgr *xcp_mgr, int mode);

int amdgpu_xcp_restore_partition_mode(struct amdgpu_xcp_mgr *xcp_mgr);

int amdgpu_xcp_get_partition(struct amdgpu_xcp_mgr *xcp_mgr,

			     enum AMDGPU_XCP_IP_BLOCK ip, int instance);

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

+1 −1
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ static int aqua_vanjaram_switch_partition_mode(struct amdgpu_xcp_mgr *xcp_mgr, 
		return -EINVAL;

	}



	if (adev->kfd.init_complete)

	if (adev->kfd.init_complete && !amdgpu_in_reset(adev))

		flags |= AMDGPU_XCP_OPS_KFD;



	if (flags & AMDGPU_XCP_OPS_KFD) {