github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 04:34:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/amdgpu/userq: add MES userq reset helper

Browse Source 
Will be used by the common compute queue reset handler.

Reviewed-by: Jesse Zhang <jesse.zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Deucher 2026-05-20 16:11:40 -04:00
parent 47f1a5dafd
commit b86e1ea9e2
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/gpu/drm/amd/amdgpu/mes_userqueue.c
View File

@ -179,7 +179,7 @@ static int mes_userq_unmap(struct amdgpu_usermode_queue *queue)
return r;
}
static int mes_userq_reset(struct amdgpu_usermode_queue *queue)
int mes_userq_reset(struct amdgpu_usermode_queue *queue)
{
struct amdgpu_userq_mgr *uq_mgr = queue->userq_mgr;
struct amdgpu_device *adev = uq_mgr->adev;
@ -199,6 +199,43 @@ static int mes_userq_reset(struct amdgpu_usermode_queue *queue)
return mes_userq_unmap(queue);
}
int mes_userq_reset_queue(struct amdgpu_device *adev,
struct amdgpu_usermode_queue *guilty_uq,
int queue_type,
unsigned int pipe,
unsigned int queue,
unsigned int db)
{
struct amdgpu_usermode_queue *uq;
bool use_mmio = false;
unsigned long uq_id;
int r;
xa_for_each(&adev->userq_doorbell_xa, uq_id, uq) {
if (uq->queue_type == queue_type) {
if (uq == guilty_uq)
continue;
if (uq->doorbell_index == db) {
uq->state = AMDGPU_USERQ_STATE_HUNG;
if (use_mmio)
r = amdgpu_mes_reset_queue_mmio(adev, queue_type, 0, 1, pipe, queue, 0);
else
r = amdgpu_mes_reset_user_queue(adev, queue_type, db, 0);
if (r)
return r;
r = mes_userq_unmap(uq);
if (r)
return r;
atomic_inc(&adev->gpu_reset_counter);
amdgpu_userq_fence_driver_force_completion(uq);
drm_dev_wedged_event(adev_to_drm(adev), DRM_WEDGE_RECOVERY_NONE, NULL);
break;
}
}
}
return 0;
}
static int mes_userq_create_ctx_space(struct amdgpu_userq_mgr *uq_mgr,
struct amdgpu_usermode_queue *queue,
struct drm_amdgpu_userq_in *mqd_user)

9
drivers/gpu/drm/amd/amdgpu/mes_userqueue.h
View File

@ -27,4 +27,13 @@
#include "amdgpu_userq.h"
extern const struct amdgpu_userq_funcs userq_mes_funcs;
int mes_userq_reset(struct amdgpu_usermode_queue *queue);
int mes_userq_reset_queue(struct amdgpu_device *adev,
struct amdgpu_usermode_queue *guilty_uq,
int queue_type,
unsigned int pipe,
unsigned int queue,
unsigned int db);
#endif