Skip to content

Commit

Permalink
drm/amdgpu/userq: rework driver parameter
Browse files Browse the repository at this point in the history 
Replace disable_kq parameter with user_queue parameter.
The parameter has the following logic:
 -1 = auto (ASIC specific default)
  0 = user queues disabled
  1 = user queues enabled and kernel queues enabled (if supported)
  2 = user queues enabled and kernel queues disabled

The default behavior (-1) is currently the same as 0 for current
ASICs.  To enable user queues (in addition to kernel queues) set
user_queue=1. To enable user queues and disable kernel queues
(to make all resources available to user queues), set user_queue=2.

Reviewed-by: Sunil Khatri <sunil.khatri@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
Alex Deucher committed Apr 21, 2025
1 parent 172494c commit fb20954
Show file tree
Hide file tree
Showing 8 changed files with 77 additions and 16 deletions.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/amd/amdgpu/amdgpu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ extern int amdgpu_agp;
extern int amdgpu_rebar;

extern int amdgpu_wbrf;
extern int amdgpu_disable_kq;
extern int amdgpu_user_queue;

#define AMDGPU_VM_MAX_NUM_CTX 4096
#define AMDGPU_SG_THRESHOLD (256*1024*1024)
Expand Down
15 changes: 9 additions & 6 deletions drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ int amdgpu_wbrf = -1;
int amdgpu_damage_clips = -1; /* auto */
int amdgpu_umsch_mm_fwlog;
int amdgpu_rebar = -1; /* auto */
int amdgpu_disable_kq = -1;
int amdgpu_user_queue = -1;

DECLARE_DYNDBG_CLASSMAP(drm_debug_classes, DD_CLASS_TYPE_DISJOINT_BITS, 0,
"DRM_UT_CORE",
Expand Down Expand Up @@ -1114,12 +1114,15 @@ MODULE_PARM_DESC(rebar, "Resizable BAR (-1 = auto (default), 0 = disable, 1 = en
module_param_named(rebar, amdgpu_rebar, int, 0444);

/**
* DOC: disable_kq (int)
* Disable kernel queues on systems that support user queues.
* (0 = kernel queues enabled, 1 = kernel queues disabled, -1 = auto (default setting))
* DOC: user_queue (int)
* Enable user queues on systems that support user queues.
* -1 = auto (ASIC specific default)
* 0 = user queues disabled
* 1 = user queues enabled and kernel queues enabled (if supported)
* 2 = user queues enabled and kernel queues disabled
*/
MODULE_PARM_DESC(disable_kq, "Disable kernel queues (-1 = auto (default), 0 = enable KQ, 1 = disable KQ)");
module_param_named(disable_kq, amdgpu_disable_kq, int, 0444);
MODULE_PARM_DESC(user_queue, "Enable user queues (-1 = auto (default), 0 = disable, 1 = enable, 2 = enable UQs and disable KQs)");
module_param_named(user_queue, amdgpu_user_queue, int, 0444);

/* These devices are not supported by amdgpu.
* They are supported by the mach64, r128, radeon drivers
Expand Down
1 change: 1 addition & 0 deletions drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,7 @@ struct amdgpu_gfx {
struct mutex workload_profile_mutex;

bool disable_kq;
bool disable_uq;
};

struct amdgpu_gfx_ras_reg_entry {
Expand Down
1 change: 1 addition & 0 deletions drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ struct amdgpu_sdma {
uint32_t supported_reset;
struct list_head reset_callback_list;
bool no_user_submission;
bool disable_uq;
};

/*
Expand Down
20 changes: 17 additions & 3 deletions drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1632,7 +1632,7 @@ static int gfx_v11_0_sw_init(struct amdgpu_ip_block *ip_block)
case IP_VERSION(11, 0, 3):
#ifdef CONFIG_DRM_AMDGPU_NAVI3X_USERQ
/* add firmware version checks here */
if (0) {
if (0 && !adev->gfx.disable_uq) {
adev->userq_funcs[AMDGPU_HW_IP_GFX] = &userq_mes_funcs;
adev->userq_funcs[AMDGPU_HW_IP_COMPUTE] = &userq_mes_funcs;
}
Expand All @@ -1646,7 +1646,7 @@ static int gfx_v11_0_sw_init(struct amdgpu_ip_block *ip_block)
case IP_VERSION(11, 5, 3):
#ifdef CONFIG_DRM_AMDGPU_NAVI3X_USERQ
/* add firmware version checks here */
if (0) {
if (0 && !adev->gfx.disable_uq) {
adev->userq_funcs[AMDGPU_HW_IP_GFX] = &userq_mes_funcs;
adev->userq_funcs[AMDGPU_HW_IP_COMPUTE] = &userq_mes_funcs;
}
Expand Down Expand Up @@ -5211,8 +5211,22 @@ static int gfx_v11_0_early_init(struct amdgpu_ip_block *ip_block)
{
struct amdgpu_device *adev = ip_block->adev;

if (amdgpu_disable_kq == 1)
switch (amdgpu_user_queue) {
case -1:
case 0:
default:
adev->gfx.disable_kq = false;
adev->gfx.disable_uq = true;
break;
case 1:
adev->gfx.disable_kq = false;
adev->gfx.disable_uq = false;
break;
case 2:
adev->gfx.disable_kq = true;
adev->gfx.disable_uq = false;
break;
}

adev->gfx.funcs = &gfx_v11_0_gfx_funcs;

Expand Down
18 changes: 16 additions & 2 deletions drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1418,7 +1418,7 @@ static int gfx_v12_0_sw_init(struct amdgpu_ip_block *ip_block)
case IP_VERSION(12, 0, 1):
#ifdef CONFIG_DRM_AMDGPU_NAVI3X_USERQ
/* add firmware version checks here */
if (0) {
if (0 && !adev->gfx.disable_uq) {
adev->userq_funcs[AMDGPU_HW_IP_GFX] = &userq_mes_funcs;
adev->userq_funcs[AMDGPU_HW_IP_COMPUTE] = &userq_mes_funcs;
}
Expand Down Expand Up @@ -3819,8 +3819,22 @@ static int gfx_v12_0_early_init(struct amdgpu_ip_block *ip_block)
{
struct amdgpu_device *adev = ip_block->adev;

if (amdgpu_disable_kq == 1)
switch (amdgpu_user_queue) {
case -1:
case 0:
default:
adev->gfx.disable_kq = false;
adev->gfx.disable_uq = true;
break;
case 1:
adev->gfx.disable_kq = false;
adev->gfx.disable_uq = false;
break;
case 2:
adev->gfx.disable_kq = true;
adev->gfx.disable_uq = false;
break;
}

adev->gfx.funcs = &gfx_v12_0_gfx_funcs;

Expand Down
18 changes: 16 additions & 2 deletions drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1269,8 +1269,22 @@ static int sdma_v6_0_early_init(struct amdgpu_ip_block *ip_block)
struct amdgpu_device *adev = ip_block->adev;
int r;

if (amdgpu_disable_kq == 1)
switch (amdgpu_user_queue) {
case -1:
case 0:
default:
adev->sdma.no_user_submission = false;
adev->sdma.disable_uq = true;
break;
case 1:
adev->sdma.no_user_submission = false;
adev->sdma.disable_uq = false;
break;
case 2:
adev->sdma.no_user_submission = true;
adev->sdma.disable_uq = false;
break;
}

r = amdgpu_sdma_init_microcode(adev, 0, true);
if (r)
Expand Down Expand Up @@ -1351,7 +1365,7 @@ static int sdma_v6_0_sw_init(struct amdgpu_ip_block *ip_block)

#ifdef CONFIG_DRM_AMDGPU_NAVI3X_USERQ
/* add firmware version checks here */
if (0)
if (0 && !adev->sdma.disable_uq)
adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
#endif
r = amdgpu_sdma_sysfs_reset_mask_init(adev);
Expand Down
18 changes: 16 additions & 2 deletions drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1254,8 +1254,22 @@ static int sdma_v7_0_early_init(struct amdgpu_ip_block *ip_block)
struct amdgpu_device *adev = ip_block->adev;
int r;

if (amdgpu_disable_kq == 1)
switch (amdgpu_user_queue) {
case -1:
case 0:
default:
adev->sdma.no_user_submission = false;
adev->sdma.disable_uq = true;
break;
case 1:
adev->sdma.no_user_submission = false;
adev->sdma.disable_uq = false;
break;
case 2:
adev->sdma.no_user_submission = true;
adev->sdma.disable_uq = false;
break;
}

r = amdgpu_sdma_init_microcode(adev, 0, true);
if (r) {
Expand Down Expand Up @@ -1326,7 +1340,7 @@ static int sdma_v7_0_sw_init(struct amdgpu_ip_block *ip_block)

#ifdef CONFIG_DRM_AMDGPU_NAVI3X_USERQ
/* add firmware version checks here */
if (0)
if (0 && !adev->sdma.disable_uq)
adev->userq_funcs[AMDGPU_HW_IP_DMA] = &userq_mes_funcs;
#endif

Expand Down

0 comments on commit fb20954

Please sign in to comment.