Commit b6b85c8b authored Mar 07, 2023 by Lijo Lazar Committed by Alex Deucher Jun 09, 2023

drm/amdgpu: Return error on invalid compute mode



Return error if an invalid compute partition mode is requested.

Signed-off-by: Lijo Lazar <lijo.lazar@amd.com>
Reviewed-by: Le Ma <le.ma@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent f9632096

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -328,10 +328,14 @@ static int aqua_vanjaram_switch_partition_mode(struct amdgpu_xcp_mgr *xcp_mgr,
		adev = xcp_mgr->adev;
		num_xcc = NUM_XCC(adev->gfx.xcc_mask);

		if (mode == AMDGPU_AUTO_COMPUTE_PARTITION_MODE)
		if (mode == AMDGPU_AUTO_COMPUTE_PARTITION_MODE) {
		mode = __aqua_vanjaram_get_auto_mode(xcp_mgr);
		else if (!__aqua_vanjaram_is_valid_mode(xcp_mgr, mode))
		} else if (!__aqua_vanjaram_is_valid_mode(xcp_mgr, mode)) {
		dev_err(adev->dev,
		"Invalid compute partition mode requested, requested: %s, available memory partitions: %d",
		amdgpu_gfx_compute_mode_desc(mode), adev->gmc.num_mem_partitions);
		return -EINVAL;
		}

		if (adev->kfd.init_complete)
		flags \|= AMDGPU_XCP_OPS_KFD;

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -1933,7 +1933,11 @@ static int gfx_v9_4_3_cp_resume(struct amdgpu_device *adev)
		if (amdgpu_xcp_query_partition_mode(adev->xcp_mgr,
		AMDGPU_XCP_FL_NONE) ==
		AMDGPU_UNKNOWN_COMPUTE_PARTITION_MODE)
		amdgpu_xcp_switch_partition_mode(adev->xcp_mgr, amdgpu_user_partt_mode);
		r = amdgpu_xcp_switch_partition_mode(adev->xcp_mgr,
		amdgpu_user_partt_mode);

		if (r)
		return r;

		num_xcc = NUM_XCC(adev->gfx.xcc_mask);
		for (i = 0; i < num_xcc; i++) {