drm/amdgpu: Enable NPS4 CPX mode

CPX compute mode is valid mode for NPS4 memory partition mode.

Signed-off-by: Philip Yang <Philip.Yang@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c
index 848049d..97011e7 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c
+++ b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c
@@ -281,9 +281,9 @@ static bool __aqua_vanjaram_is_valid_mode(struct amdgpu_xcp_mgr *xcp_mgr,
                        adev->gmc.num_mem_partitions == 4) &&
                       (num_xccs_per_xcp >= 2);
        case AMDGPU_CPX_PARTITION_MODE:
-               return (num_xcc > 1) &&
-                      (adev->gmc.num_mem_partitions == 1 ||
-                       adev->gmc.num_mem_partitions == num_xcc);
+               return ((num_xcc > 1) &&
+                      (adev->gmc.num_mem_partitions == 1 || adev->gmc.num_mem_partitions == 4) &&
+                      (num_xcc % adev->gmc.num_mem_partitions) == 0);
        default:
                return false;
        }