drm/amd/amdgpu: Add VMID to SRBM debugfs bank selection
Subsystems (2)
PATCH 1/2 drm/amd/amdgpu: Add VMID to SRBM debugfs bank selection
Add 5 bits to the offset for SRBM selection to handle VMIDs. Also update the select_me_pipe_q() callback to also select VMID.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 9 +++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 4 ++-- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 ++-- 6 files changed, 14 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +5 -4
@@ -103,10 +103,10 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f,ssize_t result =0 ;int r;bool pm_pg_lock, use_bank, use_ring; -unsigned instance_bank, sh_bank, se_bank, me, pipe, queue; +unsigned instance_bank, sh_bank, se_bank, me, pipe, queue, vmid; pm_pg_lock = use_bank = use_ring = false; - instance_bank = sh_bank = se_bank = me = pipe = queue =0 ; + instance_bank = sh_bank = se_bank = me = pipe = queue = vmid =0 ;if (size &0x3 || *pos &0x3 || ((*pos & (1ULL <<62 )) && (*pos & (1ULL <<61 ))))
@@ -132,6 +132,7 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f, me = (*pos &GENMASK_ULL (33 ,24 )) >>24 ; pipe = (*pos &GENMASK_ULL (43 ,34 )) >>34 ; queue = (*pos &GENMASK_ULL (53 ,44 )) >>44 ; + vmid = (*pos &GENMASK_ULL (48 ,45 )) >>54 ; use_ring =1 ; }else {
@@ -149,7 +150,7 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f, sh_bank, instance_bank); }else if (use_ring) {mutex_lock (&adev->srbm_mutex); -amdgpu_gfx_select_me_pipe_q (adev, me, pipe, queue); +amdgpu_gfx_select_me_pipe_q (adev, me, pipe, queue, vmid); }if (pm_pg_lock)
@@ -182,7 +183,7 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f,amdgpu_gfx_select_se_sh (adev,0xffffffff ,0xffffffff ,0xffffffff );mutex_unlock (&adev->grbm_idx_mutex); }else if (use_ring) { -amdgpu_gfx_select_me_pipe_q (adev,0 ,0 ,0 ); +amdgpu_gfx_select_me_pipe_q (adev,0 ,0 ,0 ,0 );mutex_unlock (&adev->srbm_mutex); }
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +2 -2
@@ -195,7 +195,7 @@ struct amdgpu_gfx_funcs { uint32_t wave, uint32_t start, uint32_t size, uint32_t *dst);void (*select_me_pipe_q)(struct amdgpu_device *adev,u32 me,u32 pipe, -u32 queue); +u32 queue,u32 vmid); };struct amdgpu_ngg_buf {
@@ -327,7 +327,7 @@ struct amdgpu_gfx {#define amdgpu_gfx_get_gpu_clock_counter (adev) (adev)->gfx.funcs->get_gpu_clock_counter((adev))#define amdgpu_gfx_select_se_sh (adev, se, sh, instance) (adev)->gfx.funcs->select_se_sh((adev), (se), (sh), (instance)) -#define amdgpu_gfx_select_me_pipe_q (adev, me, pipe, q) (adev)->gfx.funcs->select_me_pipe_q((adev), (me), (pipe), (q)) +#define amdgpu_gfx_select_me_pipe_q (adev, me, pipe, q, vmid) (adev)->gfx.funcs->select_me_pipe_q((adev), (me), (pipe), (q), (vmid))/** * amdgpu_gfx_create_bitmask - create a bitmask
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1 -1
@@ -3041,7 +3041,7 @@ static void gfx_v6_0_read_wave_sgprs(struct amdgpu_device *adev, uint32_t simd, }static void gfx_v6_0_select_me_pipe_q (struct amdgpu_device *adev, -u32 me,u32 pipe,u32 q) +u32 me,u32 pipe,u32 q,u32 vm) {DRM_INFO ("Not implemented\n" ); }
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +2 -2
@@ -4167,9 +4167,9 @@ static void gfx_v7_0_read_wave_sgprs(struct amdgpu_device *adev, uint32_t simd, }static void gfx_v7_0_select_me_pipe_q (struct amdgpu_device *adev, -u32 me,u32 pipe,u32 q) +u32 me,u32 pipe,u32 q,u32 vm) { -cik_srbm_select (adev, me, pipe, q,0 ); +cik_srbm_select (adev, me, pipe, q, vm); }static const struct amdgpu_gfx_funcs gfx_v7_0_gfx_funcs = {
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +2 -2
@@ -3432,9 +3432,9 @@ static void gfx_v8_0_select_se_sh(struct amdgpu_device *adev, }static void gfx_v8_0_select_me_pipe_q (struct amdgpu_device *adev, -u32 me,u32 pipe,u32 q) +u32 me,u32 pipe,u32 q,u32 vm) { -vi_srbm_select (adev, me, pipe, q,0 ); +vi_srbm_select (adev, me, pipe, q, vm); }static u32 gfx_v8_0_get_rb_active_bitmap (struct amdgpu_device *adev)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +2 -2
@@ -1309,9 +1309,9 @@ static void gfx_v9_0_read_wave_vgprs(struct amdgpu_device *adev, uint32_t simd, }static void gfx_v9_0_select_me_pipe_q (struct amdgpu_device *adev, -u32 me,u32 pipe,u32 q) +u32 me,u32 pipe,u32 q,u32 vm) { -soc15_grbm_select (adev, me, pipe, q,0 ); +soc15_grbm_select (adev, me, pipe, q, vm); }static const struct amdgpu_gfx_funcs gfx_v9_0_gfx_funcs = {
Signature · 6 lines
2.21.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 2/2 drm/amd/amdgpu: Add missing select_me_pipe_q() for gfx10
--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +7 -0
@@ -1061,6 +1061,12 @@ static void gfx_v10_0_read_wave_vgprs(struct amdgpu_device *adev, uint32_t simd, start + SQIND_WAVE_VGPRS_OFFSET, size, dst); } +static void gfx_v10_0_select_me_pipe_q (struct amdgpu_device *adev, +u32 me,u32 pipe,u32 q,u32 vm) + { +nv_grbm_select (adev, me, pipe, q, vm); + } +static const struct amdgpu_gfx_funcs gfx_v10_0_gfx_funcs = { .get_gpu_clock_counter = &gfx_v10_0_get_gpu_clock_counter,
@@ -1068,6 +1074,7 @@ static const struct amdgpu_gfx_funcs gfx_v10_0_gfx_funcs = { .read_wave_data = &gfx_v10_0_read_wave_data, .read_wave_sgprs = &gfx_v10_0_read_wave_sgprs, .read_wave_vgprs = &gfx_v10_0_read_wave_vgprs, + .select_me_pipe_q = &gfx_v10_0_select_me_pipe_q, };static void gfx_v10_0_gpu_early_init (struct amdgpu_device *adev)
Signature · 6 lines
2.21.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Alex Deucher
Reviewed-byRe: [PATCH 2/2] drm/amd/amdgpu: Add missing select_me_pipe_q() for gfx10
Quoted 2 lines · Tom
Signed-off-by Tom St Denis <[email protected]>
Please add a patch description. With that fixed, the series is:
Quoted 32 lines
--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +7
-1@@ -1061,6 +1061,12 @@ static void gfx_v10_0_read_wave_vgprs(struct amdgpu_device *adev, uint32_t simd, start + SQIND_WAVE_VGPRS_OFFSET, size, dst); } +static void gfx_v10_0_select_me_pipe_q (struct amdgpu_device *adev, +u32 me,u32 pipe,u32 q,u32 vm) + { +nv_grbm_select (adev, me, pipe, q, vm); + } +static const struct amdgpu_gfx_funcs gfx_v10_0_gfx_funcs = { .get_gpu_clock_counter = &gfx_v10_0_get_gpu_clock_counter,@@ -1068,6 +1074,7 @@ static const struct amdgpu_gfx_funcs gfx_v10_0_gfx_funcs = { .read_wave_data = &gfx_v10_0_read_wave_data, .read_wave_sgprs = &gfx_v10_0_read_wave_sgprs, .read_wave_vgprs = &gfx_v10_0_read_wave_vgprs, + .select_me_pipe_q = &gfx_v10_0_select_me_pipe_q, };static void gfx_v10_0_gpu_early_init (struct amdgpu_device *adev) --2.21.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Christian König
Acked-byRe: [PATCH 2/2] drm/amd/amdgpu: Add missing select_me_pipe_q() for gfx10
In reply to a message not in the archiveAm 12.07.19 um 15:44 schrieb StDenis, Tom:
Quoted 10 lines
Signed-off-by Tom St Denis <[email protected]>--- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +0
-0
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c static void gfx_v10_0_read_wave_vgprs(struct amdgpu_device *adev, uint32_t simd, · line 1065
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +2
-0@@ -1061,6 +1061,12 @@ static void gfx_v10_0_read_wave_vgprs(struct amdgpu_device *adev, uint32_t simd, start + SQIND_WAVE_VGPRS_OFFSET, size, dst); } +static void gfx_v10_0_select_me_pipe_q (struct amdgpu_device *adev, +u32 me,u32 pipe,u32 q,u32 vm)
Looks oddly indented, but could as well be just my mail client.
Christian.
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +4
-0+ { +nv_grbm_select (adev, me, pipe, q, vm); + } +static const struct amdgpu_gfx_funcs gfx_v10_0_gfx_funcs = { .get_gpu_clock_counter = &gfx_v10_0_get_gpu_clock_counter,
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c static const struct amdgpu_gfx_funcs gfx_v10_0_gfx_funcs = { · line 1080
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +1
-0@@ -1068,6 +1074,7 @@ static const struct amdgpu_gfx_funcs gfx_v10_0_gfx_funcs = { .read_wave_data = &gfx_v10_0_read_wave_data, .read_wave_sgprs = &gfx_v10_0_read_wave_sgprs, .read_wave_vgprs = &gfx_v10_0_read_wave_vgprs, + .select_me_pipe_q = &gfx_v10_0_select_me_pipe_q, };static void gfx_v10_0_gpu_early_init (struct amdgpu_device *adev)
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 12.07.19 um 15:44 schrieb StDenis, Tom:
Quoted 2 lines
Add 5 bits to the offset for SRBM selection to handle VMIDs. Also update the
select_me_pipe_q()callback to also select VMID.
Maybe split in two patches? Either way Reviewed-by: Christian König <[email protected]>.
Quoted 127 lines
Signed-off-by Tom St Denis <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 9 +++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 4 ++-- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 ++-- 6 files changed, 14 insertions(+), 13 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +5
-4@@ -103,10 +103,10 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f,ssize_t result =0 ;int r;bool pm_pg_lock, use_bank, use_ring; -unsigned instance_bank, sh_bank, se_bank, me, pipe, queue; +unsigned instance_bank, sh_bank, se_bank, me, pipe, queue, vmid; pm_pg_lock = use_bank = use_ring = false; - instance_bank = sh_bank = se_bank = me = pipe = queue =0 ; + instance_bank = sh_bank = se_bank = me = pipe = queue = vmid =0 ;if (size &0x3 || *pos &0x3 || ((*pos & (1ULL <<62 )) && (*pos & (1ULL <<61 ))))@@ -132,6 +132,7 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f, me = (*pos &GENMASK_ULL (33 ,24 )) >>24 ; pipe = (*pos &GENMASK_ULL (43 ,34 )) >>34 ; queue = (*pos &GENMASK_ULL (53 ,44 )) >>44 ; + vmid = (*pos &GENMASK_ULL (48 ,45 )) >>54 ; use_ring =1 ; }else {@@ -149,7 +150,7 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f, sh_bank, instance_bank); }else if (use_ring) {mutex_lock (&adev->srbm_mutex); -amdgpu_gfx_select_me_pipe_q (adev, me, pipe, queue); +amdgpu_gfx_select_me_pipe_q (adev, me, pipe, queue, vmid); }if (pm_pg_lock)@@ -182,7 +183,7 @@ static int amdgpu_debugfs_process_reg_op(bool read, struct file *f,amdgpu_gfx_select_se_sh (adev,0xffffffff ,0xffffffff ,0xffffffff );mutex_unlock (&adev->grbm_idx_mutex); }else if (use_ring) { -amdgpu_gfx_select_me_pipe_q (adev,0 ,0 ,0 ); +amdgpu_gfx_select_me_pipe_q (adev,0 ,0 ,0 ,0 );mutex_unlock (&adev->srbm_mutex); }drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +2
-2@@ -195,7 +195,7 @@ struct amdgpu_gfx_funcs { uint32_t wave, uint32_t start, uint32_t size, uint32_t *dst);void (*select_me_pipe_q)(struct amdgpu_device *adev,u32 me,u32 pipe, -u32 queue); +u32 queue,u32 vmid); };struct amdgpu_ngg_buf {@@ -327,7 +327,7 @@ struct amdgpu_gfx {#define amdgpu_gfx_get_gpu_clock_counter (adev) (adev)->gfx.funcs->get_gpu_clock_counter((adev))#define amdgpu_gfx_select_se_sh (adev, se, sh, instance) (adev)->gfx.funcs->select_se_sh((adev), (se), (sh), (instance)) -#define amdgpu_gfx_select_me_pipe_q (adev, me, pipe, q) (adev)->gfx.funcs->select_me_pipe_q((adev), (me), (pipe), (q)) +#define amdgpu_gfx_select_me_pipe_q (adev, me, pipe, q, vmid) (adev)->gfx.funcs->select_me_pipe_q((adev), (me), (pipe), (q), (vmid))/** * amdgpu_gfx_create_bitmask - create a bitmask drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +1
-1@@ -3041,7 +3041,7 @@ static void gfx_v6_0_read_wave_sgprs(struct amdgpu_device *adev, uint32_t simd, }static void gfx_v6_0_select_me_pipe_q (struct amdgpu_device *adev, -u32 me,u32 pipe,u32 q) +u32 me,u32 pipe,u32 q,u32 vm) {DRM_INFO ("Not implemented\n" ); }drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +2
-2@@ -4167,9 +4167,9 @@ static void gfx_v7_0_read_wave_sgprs(struct amdgpu_device *adev, uint32_t simd, }static void gfx_v7_0_select_me_pipe_q (struct amdgpu_device *adev, -u32 me,u32 pipe,u32 q) +u32 me,u32 pipe,u32 q,u32 vm) { -cik_srbm_select (adev, me, pipe, q,0 ); +cik_srbm_select (adev, me, pipe, q, vm); }static const struct amdgpu_gfx_funcs gfx_v7_0_gfx_funcs = {drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +2
-2@@ -3432,9 +3432,9 @@ static void gfx_v8_0_select_se_sh(struct amdgpu_device *adev, }static void gfx_v8_0_select_me_pipe_q (struct amdgpu_device *adev, -u32 me,u32 pipe,u32 q) +u32 me,u32 pipe,u32 q,u32 vm) { -vi_srbm_select (adev, me, pipe, q,0 ); +vi_srbm_select (adev, me, pipe, q, vm); }static u32 gfx_v8_0_get_rb_active_bitmap (struct amdgpu_device *adev)drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +0
-0@@ -1309,9 +1309,9 @@ static void gfx_v9_0_read_wave_vgprs(struct amdgpu_device *adev, uint32_t simd, }
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c static void gfx_v9_0_read_wave_vgprs(struct amdgpu_device *adev, uint32_t simd, · line 1317
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +2
-2static void gfx_v9_0_select_me_pipe_q (struct amdgpu_device *adev, -u32 me,u32 pipe,u32 q) +u32 me,u32 pipe,u32 q,u32 vm) { -soc15_grbm_select (adev, me, pipe, q,0 ); +soc15_grbm_select (adev, me, pipe, q, vm); }static const struct amdgpu_gfx_funcs gfx_v9_0_gfx_funcs = {
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx