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

drm/amdgpu: Use SPX as default in partition config 



In certain cases - ex: when a reset is required on initialization - XCP
manager won't have a valid partition mode. In such cases, use SPX as the
default selected mode for which partition configuration details are
populated.

Fixes: 4ae86dc8 ("drm/amdgpu: Add sysfs nodes to get xcp details")
Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reported-by: default avatarHao Zhou <hao.zhou@amd.com>
Reviewed-by: default avatarAsad Kamal <asad.kamal@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 278b8fbf

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

+7 −3
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ void amdgpu_xcp_cfg_sysfs_init(struct amdgpu_device *adev) 
{

	struct amdgpu_xcp_res_details *xcp_res;

	struct amdgpu_xcp_cfg *xcp_cfg;

	int i, r, j, rid;

	int i, r, j, rid, mode;



	if (!adev->xcp_mgr)

		return;
@@ -625,11 +625,15 @@ void amdgpu_xcp_cfg_sysfs_init(struct amdgpu_device *adev) 
	if (r)

		goto err1;



	r = amdgpu_xcp_get_res_info(xcp_cfg->xcp_mgr, xcp_cfg->xcp_mgr->mode, xcp_cfg);

	mode = (xcp_cfg->xcp_mgr->mode ==

		AMDGPU_UNKNOWN_COMPUTE_PARTITION_MODE) ?

		       AMDGPU_SPX_PARTITION_MODE :

		       xcp_cfg->xcp_mgr->mode;

	r = amdgpu_xcp_get_res_info(xcp_cfg->xcp_mgr, mode, xcp_cfg);

	if (r)

		goto err1;



	xcp_cfg->mode = xcp_cfg->xcp_mgr->mode;

	xcp_cfg->mode = mode;

	for (i = 0; i < xcp_cfg->num_res; i++) {

		xcp_res = &xcp_cfg->xcp_res[i];

		rid = xcp_res->id;