Add register list and enable devcoredump for JPEG2_5_0 Signed-off-by: Sathishkumar S <sathishkumar.sundararaju@xxxxxxx> --- drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 41 ++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c index 11f6af2646e7..ba180eeb8f7d 100644 --- a/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c +++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c @@ -36,6 +36,24 @@ #define JPEG25_MAX_HW_INSTANCES_ARCTURUS 2 +static const struct amdgpu_hwip_reg_entry jpeg_reg_list_2_5[] = { + SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_JPEG_POWER_STATUS), + SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_JPEG_INT_STAT), + SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_JRBC_RB_RPTR), + SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_JRBC_RB_WPTR), + SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_JRBC_RB_CNTL), + SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_JRBC_RB_SIZE), + SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_JRBC_STATUS), + SOC15_REG_ENTRY_STR(VCN, 0, mmJPEG_DEC_ADDR_MODE), + SOC15_REG_ENTRY_STR(VCN, 0, mmJPEG_DEC_GFX10_ADDR_CONFIG), + SOC15_REG_ENTRY_STR(VCN, 0, mmJPEG_DEC_Y_GFX10_TILING_SURFACE), + SOC15_REG_ENTRY_STR(VCN, 0, mmJPEG_DEC_UV_GFX10_TILING_SURFACE), + SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_JPEG_PITCH), + SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_JPEG_UV_PITCH), +}; +static void jpeg_v2_5_dump_ip_state(struct amdgpu_ip_block *ip_block); +static void jpeg_v2_5_print_ip_state(struct amdgpu_ip_block *ip_block, struct drm_printer *p); + static void jpeg_v2_5_set_dec_ring_funcs(struct amdgpu_device *adev); static void jpeg_v2_5_set_irq_funcs(struct amdgpu_device *adev); static int jpeg_v2_5_set_powergating_state(struct amdgpu_ip_block *ip_block, @@ -147,6 +165,12 @@ static int jpeg_v2_5_sw_init(struct amdgpu_ip_block *ip_block) if (r) return r; + adev->jpeg.ip_dump = kcalloc(adev->jpeg.num_jpeg_inst * ARRAY_SIZE(jpeg_reg_list_2_5), + sizeof(uint32_t), GFP_KERNEL); + if (!adev->jpeg.ip_dump) + DRM_ERROR("Failed to allocate memory for JPEG IP Dump\n"); + + return 0; } @@ -168,6 +192,8 @@ static int jpeg_v2_5_sw_fini(struct amdgpu_ip_block *ip_block) r = amdgpu_jpeg_sw_fini(adev); + kfree(adev->jpeg.ip_dump); + return r; } @@ -610,6 +636,17 @@ static int jpeg_v2_5_process_interrupt(struct amdgpu_device *adev, return 0; } +static void jpeg_v2_5_dump_ip_state(struct amdgpu_ip_block *ip_block) +{ + amdgpu_jpeg_dump_ip_state(ip_block, jpeg_reg_list_2_5, ARRAY_SIZE(jpeg_reg_list_2_5)); +} + +static void jpeg_v2_5_print_ip_state(struct amdgpu_ip_block *ip_block, struct drm_printer *p) +{ + amdgpu_jpeg_print_ip_state(ip_block, p, jpeg_reg_list_2_5, + ARRAY_SIZE(jpeg_reg_list_2_5)); +} + static const struct amd_ip_funcs jpeg_v2_5_ip_funcs = { .name = "jpeg_v2_5", .early_init = jpeg_v2_5_early_init, @@ -623,6 +660,8 @@ static const struct amd_ip_funcs jpeg_v2_5_ip_funcs = { .wait_for_idle = jpeg_v2_5_wait_for_idle, .set_clockgating_state = jpeg_v2_5_set_clockgating_state, .set_powergating_state = jpeg_v2_5_set_powergating_state, + .dump_ip_state = jpeg_v2_5_dump_ip_state, + .print_ip_state = jpeg_v2_5_print_ip_state, }; static const struct amd_ip_funcs jpeg_v2_6_ip_funcs = { @@ -638,6 +677,8 @@ static const struct amd_ip_funcs jpeg_v2_6_ip_funcs = { .wait_for_idle = jpeg_v2_5_wait_for_idle, .set_clockgating_state = jpeg_v2_5_set_clockgating_state, .set_powergating_state = jpeg_v2_5_set_powergating_state, + .dump_ip_state = jpeg_v2_5_dump_ip_state, + .print_ip_state = jpeg_v2_5_print_ip_state, }; static const struct amdgpu_ring_funcs jpeg_v2_5_dec_ring_vm_funcs = { -- 2.25.1