Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu: Add CM_TEST_DEBUG regs for DCN

We'd like to use them for reading DCN debug status.

Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Harry Wentland and committed by
Alex Deucher
86993018 871e899d

+24 -3
+16 -3
drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_1_0_offset.h
··· 3895 3895 #define mmCM0_CM_MEM_PWR_CTRL_BASE_IDX 2 3896 3896 #define mmCM0_CM_MEM_PWR_STATUS 0x0d33 3897 3897 #define mmCM0_CM_MEM_PWR_STATUS_BASE_IDX 2 3898 + #define mmCM0_CM_TEST_DEBUG_INDEX 0x0d35 3899 + #define mmCM0_CM_TEST_DEBUG_INDEX_BASE_IDX 2 3900 + #define mmCM0_CM_TEST_DEBUG_DATA 0x0d36 3901 + #define mmCM0_CM_TEST_DEBUG_DATA_BASE_IDX 2 3898 3902 3899 3903 3900 3904 // addressBlock: dce_dc_dpp0_dispdec_dpp_dcperfmon_dc_perfmon_dispdec ··· 4371 4367 #define mmCM1_CM_MEM_PWR_CTRL_BASE_IDX 2 4372 4368 #define mmCM1_CM_MEM_PWR_STATUS 0x0e4e 4373 4369 #define mmCM1_CM_MEM_PWR_STATUS_BASE_IDX 2 4374 - 4370 + #define mmCM1_CM_TEST_DEBUG_INDEX 0x0e50 4371 + #define mmCM1_CM_TEST_DEBUG_INDEX_BASE_IDX 2 4372 + #define mmCM1_CM_TEST_DEBUG_DATA 0x0e51 4373 + #define mmCM1_CM_TEST_DEBUG_DATA_BASE_IDX 2 4375 4374 4376 4375 // addressBlock: dce_dc_dpp1_dispdec_dpp_dcperfmon_dc_perfmon_dispdec 4377 4376 // base address: 0x399c ··· 4846 4839 #define mmCM2_CM_MEM_PWR_CTRL_BASE_IDX 2 4847 4840 #define mmCM2_CM_MEM_PWR_STATUS 0x0f69 4848 4841 #define mmCM2_CM_MEM_PWR_STATUS_BASE_IDX 2 4849 - 4842 + #define mmCM2_CM_TEST_DEBUG_INDEX 0x0f6b 4843 + #define mmCM2_CM_TEST_DEBUG_INDEX_BASE_IDX 2 4844 + #define mmCM2_CM_TEST_DEBUG_DATA 0x0f6c 4845 + #define mmCM2_CM_TEST_DEBUG_DATA_BASE_IDX 2 4850 4846 4851 4847 // addressBlock: dce_dc_dpp2_dispdec_dpp_dcperfmon_dc_perfmon_dispdec 4852 4848 // base address: 0x3e08 ··· 5321 5311 #define mmCM3_CM_MEM_PWR_CTRL_BASE_IDX 2 5322 5312 #define mmCM3_CM_MEM_PWR_STATUS 0x1084 5323 5313 #define mmCM3_CM_MEM_PWR_STATUS_BASE_IDX 2 5324 - 5314 + #define mmCM3_CM_TEST_DEBUG_INDEX 0x1086 5315 + #define mmCM3_CM_TEST_DEBUG_INDEX_BASE_IDX 2 5316 + #define mmCM3_CM_TEST_DEBUG_DATA 0x1087 5317 + #define mmCM3_CM_TEST_DEBUG_DATA_BASE_IDX 2 5325 5318 5326 5319 // addressBlock: dce_dc_dpp3_dispdec_dpp_dcperfmon_dc_perfmon_dispdec 5327 5320 // base address: 0x4274
+8
drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_1_0_sh_mask.h
··· 14049 14049 #define CM0_CM_MEM_PWR_STATUS__RGAM_MEM_PWR_STATE__SHIFT 0x2 14050 14050 #define CM0_CM_MEM_PWR_STATUS__SHARED_MEM_PWR_STATE_MASK 0x00000003L 14051 14051 #define CM0_CM_MEM_PWR_STATUS__RGAM_MEM_PWR_STATE_MASK 0x0000000CL 14052 + //CM0_CM_TEST_DEBUG_INDEX 14053 + #define CM0_CM_TEST_DEBUG_INDEX__CM_TEST_DEBUG_INDEX__SHIFT 0x0 14054 + #define CM0_CM_TEST_DEBUG_INDEX__CM_TEST_DEBUG_WRITE_EN__SHIFT 0x8 14055 + #define CM0_CM_TEST_DEBUG_INDEX__CM_TEST_DEBUG_INDEX_MASK 0x000000FFL 14056 + #define CM0_CM_TEST_DEBUG_INDEX__CM_TEST_DEBUG_WRITE_EN_MASK 0x00000100L 14057 + //CM0_CM_TEST_DEBUG_DATA 14058 + #define CM0_CM_TEST_DEBUG_DATA__CM_TEST_DEBUG_DATA__SHIFT 0x0 14059 + #define CM0_CM_TEST_DEBUG_DATA__CM_TEST_DEBUG_DATA_MASK 0xFFFFFFFFL 14052 14060 14053 14061 14054 14062 // addressBlock: dce_dc_dpp0_dispdec_dpp_dcperfmon_dc_perfmon_dispdec