[PATCH] drm/amdkfd: enable grace period for xcp instance

[Eric Huang]

Read/write grace period from/to first xcc instance of
xcp in kfd node.

Signed-off-by: Eric Huang <jinhuieric.hu...@amd.com>
---
 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 11 ++++++++---
 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h |  2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c    | 10 +++++++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c 
b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
index de83eccdd9de..a95bcb91dc09 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -1619,10 +1619,15 @@ static int initialize_cpsch(struct device_queue_manager 
*dqm)
 
        init_sdma_bitmaps(dqm);
 
-       if (dqm->dev->kfd2kgd->get_iq_wait_times)
+       if (dqm->dev->kfd2kgd->get_iq_wait_times) {
+               u32 inst = ffs(dqm->dev->xcc_mask &
+                              (1UL <<
+                              dqm->dev->xcp->id *
+                              dqm->dev->adev->gfx.num_xcc_per_xcp)) - 1;
                dqm->dev->kfd2kgd->get_iq_wait_times(dqm->dev->adev,
-                                       &dqm->wait_times,
-                                       0);
+                                       &dqm->wait_times[inst],
+                                       inst);
+       }
        return 0;
 }
 
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h 
b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
index 7dd4b177219d..45959c33b944 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
@@ -262,7 +262,7 @@ struct device_queue_manager {
        /* used for GFX 9.4.3 only */
        uint32_t                current_logical_xcc_start;
 
-       uint32_t                wait_times;
+       uint32_t                wait_times[MAX_XCP];
 
        wait_queue_head_t       destroy_wait;
 };
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c 
b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c
index 8fda16e6fee6..dd50164c16cd 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c
@@ -292,17 +292,21 @@ static int pm_set_grace_period_v9(struct packet_manager 
*pm,
        struct pm4_mec_write_data_mmio *packet;
        uint32_t reg_offset = 0;
        uint32_t reg_data = 0;
+       uint32_t inst = ffs(pm->dqm->dev->xcc_mask &
+                           (1UL <<
+                           pm->dqm->dev->xcp->id *
+                           pm->dqm->dev->adev->gfx.num_xcc_per_xcp)) - 1;
 
        pm->dqm->dev->kfd2kgd->build_grace_period_packet_info(
                        pm->dqm->dev->adev,
-                       pm->dqm->wait_times,
+                       pm->dqm->wait_times[inst],
                        grace_period,
                        &reg_offset,
                        &reg_data,
-                       0);
+                       inst);
 
        if (grace_period == USE_DEFAULT_GRACE_PERIOD)
-               reg_data = pm->dqm->wait_times;
+               reg_data = pm->dqm->wait_times[inst];
 
        packet = (struct pm4_mec_write_data_mmio *)buffer;
        memset(buffer, 0, sizeof(struct pm4_mec_write_data_mmio));
-- 
2.34.1