drm/amd/amdgpu: Fix SQ_DEBUG_STS_GLOBAL* registers
Subsystems (2)
PATCH 1/1 drm/amd/amdgpu: Fix SQ_DEBUG_STS_GLOBAL* registers
Forgot to subtract the SOC15 IP offsetand add the BASE_IDX values.
Signed-off-by Tom St Denis <[email protected]>
--- .../gpu/drm/amd/include/asic_reg/gc/gc_10_1_0_offset.h | 6 ++++-- .../gpu/drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 6 ++++-- drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_0_offset.h | 9 ++++++--- drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_1_offset.h | 9 ++++++--- .../gpu/drm/amd/include/asic_reg/gc/gc_9_2_1_offset.h | 9 ++++++--- 5 files changed, 26 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_1_0_offset.h +4 -2
@@ -21,8 +21,10 @@#ifndef _gc_10_1_0_OFFSET_HEADER#define _gc_10_1_0_OFFSET_HEADER -#define mmSQ_DEBUG_STS_GLOBAL 0x2309 -#define mmSQ_DEBUG_STS_GLOBAL2 0x2310 +#define mmSQ_DEBUG_STS_GLOBAL 0x0309 +#define mmSQ_DEBUG_STS_GLOBAL_BASE_IDX 0 +#define mmSQ_DEBUG_STS_GLOBAL2 0x0310 +#define mmSQ_DEBUG_STS_GLOBAL2_BASE_IDX 0// addressBlock: gc_sdma0_sdma0dec // base address: 0x4980
drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h +4 -2
@@ -22,8 +22,10 @@#ifndef _gc_10_3_0_OFFSET_HEADER#define _gc_10_3_0_OFFSET_HEADER -#define mmSQ_DEBUG_STS_GLOBAL 0x2309 -#define mmSQ_DEBUG_STS_GLOBAL2 0x2310 +#define mmSQ_DEBUG_STS_GLOBAL 0x0309 +#define mmSQ_DEBUG_STS_GLOBAL_BASE_IDX 0 +#define mmSQ_DEBUG_STS_GLOBAL2 0x0310 +#define mmSQ_DEBUG_STS_GLOBAL2_BASE_IDX 0// addressBlock: gc_sdma0_sdma0dec // base address: 0x4980
drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_0_offset.h +6 -3
@@ -21,9 +21,12 @@#ifndef _gc_9_0_OFFSET_HEADER#define _gc_9_0_OFFSET_HEADER -#define mmSQ_DEBUG_STS_GLOBAL 0x2309 -#define mmSQ_DEBUG_STS_GLOBAL2 0x2310 -#define mmSQ_DEBUG_STS_GLOBAL3 0x2311 +#define mmSQ_DEBUG_STS_GLOBAL 0x0309 +#define mmSQ_DEBUG_STS_GLOBAL_BASE_IDX 0 +#define mmSQ_DEBUG_STS_GLOBAL2 0x0310 +#define mmSQ_DEBUG_STS_GLOBAL2_BASE_IDX 0 +#define mmSQ_DEBUG_STS_GLOBAL3 0x0311 +#define mmSQ_DEBUG_STS_GLOBAL3_BASE_IDX 0// addressBlock: gc_grbmdec // base address: 0x8000
drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_1_offset.h +6 -3
@@ -21,9 +21,12 @@#ifndef _gc_9_1_OFFSET_HEADER#define _gc_9_1_OFFSET_HEADER -#define mmSQ_DEBUG_STS_GLOBAL 0x2309 -#define mmSQ_DEBUG_STS_GLOBAL2 0x2310 -#define mmSQ_DEBUG_STS_GLOBAL3 0x2311 +#define mmSQ_DEBUG_STS_GLOBAL 0x0309 +#define mmSQ_DEBUG_STS_GLOBAL_BASE_IDX 0 +#define mmSQ_DEBUG_STS_GLOBAL2 0x0310 +#define mmSQ_DEBUG_STS_GLOBAL2_BASE_IDX 0 +#define mmSQ_DEBUG_STS_GLOBAL3 0x0311 +#define mmSQ_DEBUG_STS_GLOBAL3_BASE_IDX 0// addressBlock: gc_grbmdec // base address: 0x8000
drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_2_1_offset.h +6 -3
@@ -21,9 +21,12 @@#ifndef _gc_9_2_1_OFFSET_HEADER#define _gc_9_2_1_OFFSET_HEADER -#define mmSQ_DEBUG_STS_GLOBAL 0x2309 -#define mmSQ_DEBUG_STS_GLOBAL2 0x2310 -#define mmSQ_DEBUG_STS_GLOBAL3 0x2311 +#define mmSQ_DEBUG_STS_GLOBAL 0x0309 +#define mmSQ_DEBUG_STS_GLOBAL_BASE_IDX 0 +#define mmSQ_DEBUG_STS_GLOBAL2 0x0310 +#define mmSQ_DEBUG_STS_GLOBAL2_BASE_IDX 0 +#define mmSQ_DEBUG_STS_GLOBAL3 0x0311 +#define mmSQ_DEBUG_STS_GLOBAL3_BASE_IDX 0// addressBlock: gc_grbmdec // base address: 0x8000
Signature · 6 lines
2.26.2 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 4 lines · Tom St Denis
Forgot to subtract the SOC15 IP offsetand add the
BASE_IDXvalues.Signed-off-by Tom St Denis <[email protected]>
Reviewed-by Alex Deucher <[email protected]>
Quoted 105 lines
--- .../gpu/drm/amd/include/asic_reg/gc/gc_10_1_0_offset.h | 6 ++++-- .../gpu/drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 6 ++++-- drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_0_offset.h | 9 ++++++--- drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_1_offset.h | 9 ++++++--- .../gpu/drm/amd/include/asic_reg/gc/gc_9_2_1_offset.h | 9 ++++++--- 5 files changed, 26 insertions(+), 13 deletions(-)drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_1_0_offset.h +4
-2@@ -21,8 +21,10 @@#ifndef _gc_10_1_0_OFFSET_HEADER#define _gc_10_1_0_OFFSET_HEADER -#define mmSQ_DEBUG_STS_GLOBAL 0x2309 -#define mmSQ_DEBUG_STS_GLOBAL2 0x2310 +#define mmSQ_DEBUG_STS_GLOBAL 0x0309 +#define mmSQ_DEBUG_STS_GLOBAL_BASE_IDX 0 +#define mmSQ_DEBUG_STS_GLOBAL2 0x0310 +#define mmSQ_DEBUG_STS_GLOBAL2_BASE_IDX 0// addressBlock: gc_sdma0_sdma0dec // base address: 0x4980 drivers/gpu/drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h +4
-2@@ -22,8 +22,10 @@#ifndef _gc_10_3_0_OFFSET_HEADER#define _gc_10_3_0_OFFSET_HEADER -#define mmSQ_DEBUG_STS_GLOBAL 0x2309 -#define mmSQ_DEBUG_STS_GLOBAL2 0x2310 +#define mmSQ_DEBUG_STS_GLOBAL 0x0309 +#define mmSQ_DEBUG_STS_GLOBAL_BASE_IDX 0 +#define mmSQ_DEBUG_STS_GLOBAL2 0x0310 +#define mmSQ_DEBUG_STS_GLOBAL2_BASE_IDX 0// addressBlock: gc_sdma0_sdma0dec // base address: 0x4980 drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_0_offset.h +6
-3@@ -21,9 +21,12 @@#ifndef _gc_9_0_OFFSET_HEADER#define _gc_9_0_OFFSET_HEADER -#define mmSQ_DEBUG_STS_GLOBAL 0x2309 -#define mmSQ_DEBUG_STS_GLOBAL2 0x2310 -#define mmSQ_DEBUG_STS_GLOBAL3 0x2311 +#define mmSQ_DEBUG_STS_GLOBAL 0x0309 +#define mmSQ_DEBUG_STS_GLOBAL_BASE_IDX 0 +#define mmSQ_DEBUG_STS_GLOBAL2 0x0310 +#define mmSQ_DEBUG_STS_GLOBAL2_BASE_IDX 0 +#define mmSQ_DEBUG_STS_GLOBAL3 0x0311 +#define mmSQ_DEBUG_STS_GLOBAL3_BASE_IDX 0// addressBlock: gc_grbmdec // base address: 0x8000 drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_1_offset.h +6
-3@@ -21,9 +21,12 @@#ifndef _gc_9_1_OFFSET_HEADER#define _gc_9_1_OFFSET_HEADER -#define mmSQ_DEBUG_STS_GLOBAL 0x2309 -#define mmSQ_DEBUG_STS_GLOBAL2 0x2310 -#define mmSQ_DEBUG_STS_GLOBAL3 0x2311 +#define mmSQ_DEBUG_STS_GLOBAL 0x0309 +#define mmSQ_DEBUG_STS_GLOBAL_BASE_IDX 0 +#define mmSQ_DEBUG_STS_GLOBAL2 0x0310 +#define mmSQ_DEBUG_STS_GLOBAL2_BASE_IDX 0 +#define mmSQ_DEBUG_STS_GLOBAL3 0x0311 +#define mmSQ_DEBUG_STS_GLOBAL3_BASE_IDX 0// addressBlock: gc_grbmdec // base address: 0x8000 drivers/gpu/drm/amd/include/asic_reg/gc/gc_9_2_1_offset.h +6
-4@@ -21,9 +21,12 @@#ifndef _gc_9_2_1_OFFSET_HEADER#define _gc_9_2_1_OFFSET_HEADER -#define mmSQ_DEBUG_STS_GLOBAL 0x2309 -#define mmSQ_DEBUG_STS_GLOBAL2 0x2310 -#define mmSQ_DEBUG_STS_GLOBAL3 0x2311 +#define mmSQ_DEBUG_STS_GLOBAL 0x0309 +#define mmSQ_DEBUG_STS_GLOBAL_BASE_IDX 0 +#define mmSQ_DEBUG_STS_GLOBAL2 0x0310 +#define mmSQ_DEBUG_STS_GLOBAL2_BASE_IDX 0 +#define mmSQ_DEBUG_STS_GLOBAL3 0x0311 +#define mmSQ_DEBUG_STS_GLOBAL3_BASE_IDX 0// addressBlock: gc_grbmdec // base address: 0x8000 --2.26.2
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