[PATCH 10/14] drm/amdgpu: Move initialization of xcp before kfd

[Alex Deucher]

From: Lijo Lazar <lijo.la...@amd.com>

After partition switch, fill all relevant xcp information before kfd
starts initialization.

Signed-off-by: Lijo Lazar <lijo.la...@amd.com>
Reviewed-by: Le Ma <le...@amd.com>
Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c          | 16 +++++++---------
 drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h          |  1 +
 .../gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c  |  6 ++++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c
index e1d3727036a1..bca226cc4e0b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c
@@ -113,12 +113,17 @@ static void __amdgpu_xcp_add_block(struct amdgpu_xcp_mgr 
*xcp_mgr, int xcp_id,
        xcp->valid = true;
 }
 
-static int __amdgpu_xcp_init(struct amdgpu_xcp_mgr *xcp_mgr, int num_xcps)
+int amdgpu_xcp_init(struct amdgpu_xcp_mgr *xcp_mgr, int num_xcps, int mode)
 {
        struct amdgpu_xcp_ip ip;
        uint8_t mem_id;
        int i, j, ret;
 
+       if (!num_xcps || num_xcps > MAX_XCP)
+               return -EINVAL;
+
+       xcp_mgr->mode = mode;
+
        for (i = 0; i < MAX_XCP; ++i)
                xcp_mgr->xcp[i].valid = false;
 
@@ -181,13 +186,6 @@ int amdgpu_xcp_switch_partition_mode(struct amdgpu_xcp_mgr 
*xcp_mgr, int mode)
                goto out;
        }
 
-       if (!num_xcps || num_xcps > MAX_XCP) {
-               ret = -EINVAL;
-               goto out;
-       }
-
-       xcp_mgr->mode = mode;
-       __amdgpu_xcp_init(xcp_mgr, num_xcps);
 out:
        mutex_unlock(&xcp_mgr->xcp_lock);
 
@@ -240,7 +238,7 @@ int amdgpu_xcp_mgr_init(struct amdgpu_device *adev, int 
init_mode,
        mutex_init(&xcp_mgr->xcp_lock);
 
        if (init_mode != AMDGPU_XCP_MODE_NONE)
-               __amdgpu_xcp_init(xcp_mgr, init_num_xcps);
+               amdgpu_xcp_init(xcp_mgr, init_num_xcps, init_mode);
 
        adev->xcp_mgr = xcp_mgr;
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h
index 7e7e458d307e..e1319b887bf3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h
@@ -105,6 +105,7 @@ int amdgpu_xcp_resume(struct amdgpu_xcp_mgr *xcp_mgr, int 
xcp_id);
 
 int amdgpu_xcp_mgr_init(struct amdgpu_device *adev, int init_mode,
                        int init_xcps, struct amdgpu_xcp_mgr_funcs *xcp_funcs);
+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_get_partition(struct amdgpu_xcp_mgr *xcp_mgr,
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 aa1bb7883158..004400fb89b0 100644
--- a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c
+++ b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c
@@ -321,9 +321,11 @@ static int aqua_vanjaram_switch_partition_mode(struct 
amdgpu_xcp_mgr *xcp_mgr,
        if (adev->nbio.funcs->set_compute_partition_mode)
                adev->nbio.funcs->set_compute_partition_mode(adev, mode);
 
-       ret = __aqua_vanjaram_post_partition_switch(xcp_mgr, flags);
-
+       /* Init info about new xcps */
        *num_xcps = num_xcc / num_xcc_per_xcp;
+       amdgpu_xcp_init(xcp_mgr, *num_xcps, mode);
+
+       ret = __aqua_vanjaram_post_partition_switch(xcp_mgr, flags);
 unlock:
        if (flags & AMDGPU_XCP_OPS_KFD)
                amdgpu_amdkfd_unlock_kfd(adev);
-- 
2.40.1