* [PATCH] drm/amdkfd: enable grace period for xcp instance
@ 2023-07-11 14:28 Eric Huang
2023-07-11 15:06 ` Kim, Jonathan
2023-07-11 18:38 ` Felix Kuehling
0 siblings, 2 replies; 7+ messages in thread
From: Eric Huang @ 2023-07-11 14:28 UTC (permalink / raw)
To: amd-gfx; +Cc: Eric Huang, Jonathan.Kim
Read/write grace period from/to first xcc instance of
xcp in kfd node.
Signed-off-by: Eric Huang <jinhuieric.huang@amd.com>
---
.../drm/amd/amdkfd/kfd_device_queue_manager.c | 21 ++++++++++++-------
.../drm/amd/amdkfd/kfd_device_queue_manager.h | 2 +-
.../drm/amd/amdkfd/kfd_packet_manager_v9.c | 8 ++++---
3 files changed, 20 insertions(+), 11 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 31cac1fd0d58..9000c4b778fd 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,14 @@ 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 first_inst = dqm->dev->xcp->id *
+ dqm->dev->adev->gfx.num_xcc_per_xcp;
dqm->dev->kfd2kgd->get_iq_wait_times(dqm->dev->adev,
- &dqm->wait_times,
- ffs(dqm->dev->xcc_mask) - 1);
+ &dqm->wait_times[first_inst],
+ first_inst);
+ }
+
return 0;
}
@@ -1675,13 +1679,16 @@ static int start_cpsch(struct device_queue_manager *dqm)
grace_period);
if (retval)
pr_err("Setting grace timeout failed\n");
- else if (dqm->dev->kfd2kgd->build_grace_period_packet_info)
+ else if (dqm->dev->kfd2kgd->build_grace_period_packet_info) {
+ u32 first_inst = dqm->dev->xcp->id *
+ dqm->dev->adev->gfx.num_xcc_per_xcp;
/* Update dqm->wait_times maintained in software */
dqm->dev->kfd2kgd->build_grace_period_packet_info(
- dqm->dev->adev, dqm->wait_times,
+ dqm->dev->adev, dqm->wait_times[first_inst],
grace_period, ®_offset,
- &dqm->wait_times,
- ffs(dqm->dev->xcc_mask) - 1);
+ &dqm->wait_times[first_inst],
+ first_inst);
+ }
}
dqm_unlock(dqm);
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..960404a6379b 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,19 @@ 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 first_inst = pm->dqm->dev->xcp->id *
+ pm->dqm->dev->adev->gfx.num_xcc_per_xcp;
pm->dqm->dev->kfd2kgd->build_grace_period_packet_info(
pm->dqm->dev->adev,
- pm->dqm->wait_times,
+ pm->dqm->wait_times[first_inst],
grace_period,
®_offset,
®_data,
- 0);
+ first_inst);
if (grace_period == USE_DEFAULT_GRACE_PERIOD)
- reg_data = pm->dqm->wait_times;
+ reg_data = pm->dqm->wait_times[first_inst];
packet = (struct pm4_mec_write_data_mmio *)buffer;
memset(buffer, 0, sizeof(struct pm4_mec_write_data_mmio));
--
2.34.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* RE: [PATCH] drm/amdkfd: enable grace period for xcp instance
2023-07-11 14:28 [PATCH] drm/amdkfd: enable grace period for xcp instance Eric Huang
@ 2023-07-11 15:06 ` Kim, Jonathan
2023-07-11 18:38 ` Felix Kuehling
1 sibling, 0 replies; 7+ messages in thread
From: Kim, Jonathan @ 2023-07-11 15:06 UTC (permalink / raw)
To: Huang, JinHuiEric, amd-gfx@lists.freedesktop.org
[Public]
Isn't a KFD node already mapped as a partition?
The xcc instance mask should already be a unique offset per node so I think the LSB set position offset by 1 should work fine as an instance ID here:
Snip:
#define XCP_INST_MASK(num_inst, xcp_id) \
(num_inst ? GENMASK(num_inst - 1, 0) << (xcp_id * num_inst) : 0)
Thanks,
Jon
> -----Original Message-----
> From: Huang, JinHuiEric <JinHuiEric.Huang@amd.com>
> Sent: Tuesday, July 11, 2023 10:28 AM
> To: amd-gfx@lists.freedesktop.org
> Cc: Kim, Jonathan <Jonathan.Kim@amd.com>; Huang, JinHuiEric
> <JinHuiEric.Huang@amd.com>
> Subject: [PATCH] drm/amdkfd: enable grace period for xcp instance
>
> Read/write grace period from/to first xcc instance of
> xcp in kfd node.
>
> Signed-off-by: Eric Huang <jinhuieric.huang@amd.com>
> ---
> .../drm/amd/amdkfd/kfd_device_queue_manager.c | 21 ++++++++++++-------
> .../drm/amd/amdkfd/kfd_device_queue_manager.h | 2 +-
> .../drm/amd/amdkfd/kfd_packet_manager_v9.c | 8 ++++---
> 3 files changed, 20 insertions(+), 11 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 31cac1fd0d58..9000c4b778fd 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,14 @@ 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 first_inst = dqm->dev->xcp->id *
> + dqm->dev->adev->gfx.num_xcc_per_xcp;
> dqm->dev->kfd2kgd->get_iq_wait_times(dqm->dev->adev,
> - &dqm->wait_times,
> - ffs(dqm->dev->xcc_mask) - 1);
> + &dqm->wait_times[first_inst],
> + first_inst);
> + }
> +
> return 0;
> }
>
> @@ -1675,13 +1679,16 @@ static int start_cpsch(struct
> device_queue_manager *dqm)
> grace_period);
> if (retval)
> pr_err("Setting grace timeout failed\n");
> - else if (dqm->dev->kfd2kgd-
> >build_grace_period_packet_info)
> + else if (dqm->dev->kfd2kgd-
> >build_grace_period_packet_info) {
> + u32 first_inst = dqm->dev->xcp->id *
> + dqm->dev->adev-
> >gfx.num_xcc_per_xcp;
> /* Update dqm->wait_times maintained in software
> */
> dqm->dev->kfd2kgd-
> >build_grace_period_packet_info(
> - dqm->dev->adev, dqm-
> >wait_times,
> + dqm->dev->adev, dqm-
> >wait_times[first_inst],
> grace_period, ®_offset,
> - &dqm->wait_times,
> - ffs(dqm->dev->xcc_mask) - 1);
> + &dqm->wait_times[first_inst],
> + first_inst);
> + }
> }
>
> dqm_unlock(dqm);
> 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..960404a6379b 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,19 @@ 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 first_inst = pm->dqm->dev->xcp->id *
> + pm->dqm->dev->adev->gfx.num_xcc_per_xcp;
>
> pm->dqm->dev->kfd2kgd->build_grace_period_packet_info(
> pm->dqm->dev->adev,
> - pm->dqm->wait_times,
> + pm->dqm->wait_times[first_inst],
> grace_period,
> ®_offset,
> ®_data,
> - 0);
> + first_inst);
>
> if (grace_period == USE_DEFAULT_GRACE_PERIOD)
> - reg_data = pm->dqm->wait_times;
> + reg_data = pm->dqm->wait_times[first_inst];
>
> packet = (struct pm4_mec_write_data_mmio *)buffer;
> memset(buffer, 0, sizeof(struct pm4_mec_write_data_mmio));
> --
> 2.34.1
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] drm/amdkfd: enable grace period for xcp instance
2023-07-11 14:28 [PATCH] drm/amdkfd: enable grace period for xcp instance Eric Huang
2023-07-11 15:06 ` Kim, Jonathan
@ 2023-07-11 18:38 ` Felix Kuehling
2023-07-11 18:48 ` Eric Huang
1 sibling, 1 reply; 7+ messages in thread
From: Felix Kuehling @ 2023-07-11 18:38 UTC (permalink / raw)
To: amd-gfx
On 2023-07-11 10:28, Eric Huang wrote:
> Read/write grace period from/to first xcc instance of
> xcp in kfd node.
>
> Signed-off-by: Eric Huang <jinhuieric.huang@amd.com>
> ---
> .../drm/amd/amdkfd/kfd_device_queue_manager.c | 21 ++++++++++++-------
> .../drm/amd/amdkfd/kfd_device_queue_manager.h | 2 +-
> .../drm/amd/amdkfd/kfd_packet_manager_v9.c | 8 ++++---
> 3 files changed, 20 insertions(+), 11 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 31cac1fd0d58..9000c4b778fd 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,14 @@ 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 first_inst = dqm->dev->xcp->id *
> + dqm->dev->adev->gfx.num_xcc_per_xcp;
> dqm->dev->kfd2kgd->get_iq_wait_times(dqm->dev->adev,
> - &dqm->wait_times,
> - ffs(dqm->dev->xcc_mask) - 1);
> + &dqm->wait_times[first_inst],
> + first_inst);
> + }
> +
> return 0;
> }
>
> @@ -1675,13 +1679,16 @@ static int start_cpsch(struct device_queue_manager *dqm)
> grace_period);
> if (retval)
> pr_err("Setting grace timeout failed\n");
> - else if (dqm->dev->kfd2kgd->build_grace_period_packet_info)
> + else if (dqm->dev->kfd2kgd->build_grace_period_packet_info) {
> + u32 first_inst = dqm->dev->xcp->id *
> + dqm->dev->adev->gfx.num_xcc_per_xcp;
> /* Update dqm->wait_times maintained in software */
> dqm->dev->kfd2kgd->build_grace_period_packet_info(
> - dqm->dev->adev, dqm->wait_times,
> + dqm->dev->adev, dqm->wait_times[first_inst],
> grace_period, ®_offset,
> - &dqm->wait_times,
> - ffs(dqm->dev->xcc_mask) - 1);
> + &dqm->wait_times[first_inst],
> + first_inst);
> + }
> }
>
> dqm_unlock(dqm);
> 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];
Why do you need an array here, if it only saves the wait times in one of
the array entries [first_inst]?
Regards,
Felix
>
> 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..960404a6379b 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,19 @@ 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 first_inst = pm->dqm->dev->xcp->id *
> + pm->dqm->dev->adev->gfx.num_xcc_per_xcp;
>
> pm->dqm->dev->kfd2kgd->build_grace_period_packet_info(
> pm->dqm->dev->adev,
> - pm->dqm->wait_times,
> + pm->dqm->wait_times[first_inst],
> grace_period,
> ®_offset,
> ®_data,
> - 0);
> + first_inst);
>
> if (grace_period == USE_DEFAULT_GRACE_PERIOD)
> - reg_data = pm->dqm->wait_times;
> + reg_data = pm->dqm->wait_times[first_inst];
>
> packet = (struct pm4_mec_write_data_mmio *)buffer;
> memset(buffer, 0, sizeof(struct pm4_mec_write_data_mmio));
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] drm/amdkfd: enable grace period for xcp instance
2023-07-11 18:38 ` Felix Kuehling
@ 2023-07-11 18:48 ` Eric Huang
0 siblings, 0 replies; 7+ messages in thread
From: Eric Huang @ 2023-07-11 18:48 UTC (permalink / raw)
To: amd-gfx
On 2023-07-11 14:38, Felix Kuehling wrote:
>
> On 2023-07-11 10:28, Eric Huang wrote:
>> Read/write grace period from/to first xcc instance of
>> xcp in kfd node.
>>
>> Signed-off-by: Eric Huang <jinhuieric.huang@amd.com>
>> ---
>> .../drm/amd/amdkfd/kfd_device_queue_manager.c | 21 ++++++++++++-------
>> .../drm/amd/amdkfd/kfd_device_queue_manager.h | 2 +-
>> .../drm/amd/amdkfd/kfd_packet_manager_v9.c | 8 ++++---
>> 3 files changed, 20 insertions(+), 11 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 31cac1fd0d58..9000c4b778fd 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,14 @@ 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 first_inst = dqm->dev->xcp->id *
>> + dqm->dev->adev->gfx.num_xcc_per_xcp;
>> dqm->dev->kfd2kgd->get_iq_wait_times(dqm->dev->adev,
>> - &dqm->wait_times,
>> - ffs(dqm->dev->xcc_mask) - 1);
>> + &dqm->wait_times[first_inst],
>> + first_inst);
>> + }
>> +
>> return 0;
>> }
>> @@ -1675,13 +1679,16 @@ static int start_cpsch(struct
>> device_queue_manager *dqm)
>> grace_period);
>> if (retval)
>> pr_err("Setting grace timeout failed\n");
>> - else if (dqm->dev->kfd2kgd->build_grace_period_packet_info)
>> + else if (dqm->dev->kfd2kgd->build_grace_period_packet_info) {
>> + u32 first_inst = dqm->dev->xcp->id *
>> + dqm->dev->adev->gfx.num_xcc_per_xcp;
>> /* Update dqm->wait_times maintained in software */
>> dqm->dev->kfd2kgd->build_grace_period_packet_info(
>> - dqm->dev->adev, dqm->wait_times,
>> + dqm->dev->adev, dqm->wait_times[first_inst],
>> grace_period, ®_offset,
>> - &dqm->wait_times,
>> - ffs(dqm->dev->xcc_mask) - 1);
>> + &dqm->wait_times[first_inst],
>> + first_inst);
>> + }
>> }
>> dqm_unlock(dqm);
>> 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];
>
> Why do you need an array here, if it only saves the wait times in one
> of the array entries [first_inst]?
That is my misunderstanding for XCP. Each DPM should be associated to 1
XCP. I thought DPM has multiple XCPs.
Thanks,
Eric
>
> Regards,
> Felix
>
>
>> 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..960404a6379b 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,19 @@ 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 first_inst = pm->dqm->dev->xcp->id *
>> + pm->dqm->dev->adev->gfx.num_xcc_per_xcp;
>> pm->dqm->dev->kfd2kgd->build_grace_period_packet_info(
>> pm->dqm->dev->adev,
>> - pm->dqm->wait_times,
>> + pm->dqm->wait_times[first_inst],
>> grace_period,
>> ®_offset,
>> ®_data,
>> - 0);
>> + first_inst);
>> if (grace_period == USE_DEFAULT_GRACE_PERIOD)
>> - reg_data = pm->dqm->wait_times;
>> + reg_data = pm->dqm->wait_times[first_inst];
>> packet = (struct pm4_mec_write_data_mmio *)buffer;
>> memset(buffer, 0, sizeof(struct pm4_mec_write_data_mmio));
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] drm/amdkfd: enable grace period for xcp instance
@ 2023-07-10 19:45 Eric Huang
2023-07-10 22:24 ` Joshi, Mukul
0 siblings, 1 reply; 7+ messages in thread
From: Eric Huang @ 2023-07-10 19:45 UTC (permalink / raw)
To: amd-gfx; +Cc: Eric Huang, Jonathan.Kim
Read/write grace period from/to first xcc instance of
xcp in kfd node.
Signed-off-by: Eric Huang <jinhuieric.huang@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,
®_offset,
®_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
^ permalink raw reply related [flat|nested] 7+ messages in thread* RE: [PATCH] drm/amdkfd: enable grace period for xcp instance
2023-07-10 19:45 Eric Huang
@ 2023-07-10 22:24 ` Joshi, Mukul
2023-07-10 22:27 ` Eric Huang
0 siblings, 1 reply; 7+ messages in thread
From: Joshi, Mukul @ 2023-07-10 22:24 UTC (permalink / raw)
To: Huang, JinHuiEric, amd-gfx@lists.freedesktop.org
Cc: Huang, JinHuiEric, Kim, Jonathan
[AMD Official Use Only - General]
> -----Original Message-----
> From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Eric
> Huang
> Sent: Monday, July 10, 2023 3:46 PM
> To: amd-gfx@lists.freedesktop.org
> Cc: Huang, JinHuiEric <JinHuiEric.Huang@amd.com>; Kim, Jonathan
> <Jonathan.Kim@amd.com>
> Subject: [PATCH] drm/amdkfd: enable grace period for xcp instance
>
> Caution: This message originated from an External Source. Use proper caution
> when opening attachments, clicking links, or responding.
>
>
> Read/write grace period from/to first xcc instance of xcp in kfd node.
>
Hi Eric,
My patch, "drm/amdkfd: Update CWSR grace period for GFX9.4.3", which got missed during the merge
should handle most of what you are trying to do.
I will push that patch. Please add on top if there is anything missing.
Hope that works for you.
Thanks,
Mukul
> Signed-off-by: Eric Huang <jinhuieric.huang@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,
> ®_offset,
> ®_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
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] drm/amdkfd: enable grace period for xcp instance
2023-07-10 22:24 ` Joshi, Mukul
@ 2023-07-10 22:27 ` Eric Huang
0 siblings, 0 replies; 7+ messages in thread
From: Eric Huang @ 2023-07-10 22:27 UTC (permalink / raw)
To: Joshi, Mukul, amd-gfx@lists.freedesktop.org; +Cc: Kim, Jonathan
OK. Mukul, I will resend this patch based on top of yours.
Regards,
Eric
On 2023-07-10 18:24, Joshi, Mukul wrote:
> [AMD Official Use Only - General]
>
>> -----Original Message-----
>> From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Eric
>> Huang
>> Sent: Monday, July 10, 2023 3:46 PM
>> To: amd-gfx@lists.freedesktop.org
>> Cc: Huang, JinHuiEric <JinHuiEric.Huang@amd.com>; Kim, Jonathan
>> <Jonathan.Kim@amd.com>
>> Subject: [PATCH] drm/amdkfd: enable grace period for xcp instance
>>
>> Caution: This message originated from an External Source. Use proper caution
>> when opening attachments, clicking links, or responding.
>>
>>
>> Read/write grace period from/to first xcc instance of xcp in kfd node.
>>
> Hi Eric,
>
> My patch, "drm/amdkfd: Update CWSR grace period for GFX9.4.3", which got missed during the merge
> should handle most of what you are trying to do.
> I will push that patch. Please add on top if there is anything missing.
>
> Hope that works for you.
>
> Thanks,
> Mukul
>
>> Signed-off-by: Eric Huang <jinhuieric.huang@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,
>> ®_offset,
>> ®_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
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-07-11 18:48 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-11 14:28 [PATCH] drm/amdkfd: enable grace period for xcp instance Eric Huang
2023-07-11 15:06 ` Kim, Jonathan
2023-07-11 18:38 ` Felix Kuehling
2023-07-11 18:48 ` Eric Huang
-- strict thread matches above, loose matches on Subject: below --
2023-07-10 19:45 Eric Huang
2023-07-10 22:24 ` Joshi, Mukul
2023-07-10 22:27 ` Eric Huang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox