mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 05:44:11 +00:00
drm/amdkfd: fix trap handling work around for debugging
Update the list of devices that require the cwsr trap handling workaround for debugging use cases. Signed-off-by: Jonathan Kim <jonathan.kim@amd.com> Acked-by: Ruili Ji <ruili.ji@amd.com> Reviewed-by: Felix Kuehling <felix.kuehling@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
28801cc859
commit
602816c3ee
3 changed files with 10 additions and 7 deletions
|
@ -302,8 +302,7 @@ static int kfd_dbg_set_queue_workaround(struct queue *q, bool enable)
|
|||
if (!q)
|
||||
return 0;
|
||||
|
||||
if (KFD_GC_VERSION(q->device) < IP_VERSION(11, 0, 0) ||
|
||||
KFD_GC_VERSION(q->device) >= IP_VERSION(12, 0, 0))
|
||||
if (!kfd_dbg_has_cwsr_workaround(q->device))
|
||||
return 0;
|
||||
|
||||
if (enable && q->properties.is_user_cu_masked)
|
||||
|
@ -349,7 +348,7 @@ int kfd_dbg_set_mes_debug_mode(struct kfd_process_device *pdd)
|
|||
{
|
||||
uint32_t spi_dbg_cntl = pdd->spi_dbg_override | pdd->spi_dbg_launch_mode;
|
||||
uint32_t flags = pdd->process->dbg_flags;
|
||||
bool sq_trap_en = !!spi_dbg_cntl;
|
||||
bool sq_trap_en = !!spi_dbg_cntl || !kfd_dbg_has_cwsr_workaround(pdd->dev);
|
||||
|
||||
if (!kfd_dbg_is_per_vmid_supported(pdd->dev))
|
||||
return 0;
|
||||
|
|
|
@ -100,6 +100,12 @@ static inline bool kfd_dbg_is_rlc_restore_supported(struct kfd_node *dev)
|
|||
KFD_GC_VERSION(dev) == IP_VERSION(10, 1, 1));
|
||||
}
|
||||
|
||||
static inline bool kfd_dbg_has_cwsr_workaround(struct kfd_node *dev)
|
||||
{
|
||||
return KFD_GC_VERSION(dev) >= IP_VERSION(11, 0, 0) &&
|
||||
KFD_GC_VERSION(dev) <= IP_VERSION(11, 0, 3);
|
||||
}
|
||||
|
||||
static inline bool kfd_dbg_has_gws_support(struct kfd_node *dev)
|
||||
{
|
||||
if ((KFD_GC_VERSION(dev) == IP_VERSION(9, 0, 1)
|
||||
|
|
|
@ -226,8 +226,7 @@ static int add_queue_mes(struct device_queue_manager *dqm, struct queue *q,
|
|||
queue_input.paging = false;
|
||||
queue_input.tba_addr = qpd->tba_addr;
|
||||
queue_input.tma_addr = qpd->tma_addr;
|
||||
queue_input.trap_en = KFD_GC_VERSION(q->device) < IP_VERSION(11, 0, 0) ||
|
||||
KFD_GC_VERSION(q->device) > IP_VERSION(11, 0, 3);
|
||||
queue_input.trap_en = !kfd_dbg_has_cwsr_workaround(q->device);
|
||||
queue_input.skip_process_ctx_clear = qpd->pqm->process->debug_trap_enabled;
|
||||
|
||||
queue_type = convert_to_mes_queue_type(q->properties.type);
|
||||
|
@ -1806,8 +1805,7 @@ static int create_queue_cpsch(struct device_queue_manager *dqm, struct queue *q,
|
|||
*/
|
||||
q->properties.is_evicted = !!qpd->evicted;
|
||||
q->properties.is_dbg_wa = qpd->pqm->process->debug_trap_enabled &&
|
||||
KFD_GC_VERSION(q->device) >= IP_VERSION(11, 0, 0) &&
|
||||
KFD_GC_VERSION(q->device) <= IP_VERSION(11, 0, 3);
|
||||
kfd_dbg_has_cwsr_workaround(q->device);
|
||||
|
||||
if (qd)
|
||||
mqd_mgr->restore_mqd(mqd_mgr, &q->mqd, q->mqd_mem_obj, &q->gart_mqd_addr,
|
||||
|
|
Loading…
Reference in a new issue