Add register list and enable devcoredump for JPEG4_0_0
Signed-off-by: Sathishkumar S <[email protected]>
---
drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 40 +++++++++++++++++++++++++-
1 file changed, 39 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c
b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c
index 0aef1f64afd0..e5803cb07925 100644
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c
@@ -36,13 +36,30 @@
#define regUVD_JPEG_PITCH_INTERNAL_OFFSET 0x401f
+static const struct amdgpu_hwip_reg_entry jpeg_reg_list_4_0[] = {
+ SOC15_REG_ENTRY_STR(VCN, 0, regUVD_JPEG_POWER_STATUS),
+ SOC15_REG_ENTRY_STR(VCN, 0, regUVD_JPEG_INT_STAT),
+ SOC15_REG_ENTRY_STR(VCN, 0, regUVD_JRBC_RB_RPTR),
+ SOC15_REG_ENTRY_STR(VCN, 0, regUVD_JRBC_RB_WPTR),
+ SOC15_REG_ENTRY_STR(VCN, 0, regUVD_JRBC_RB_CNTL),
+ SOC15_REG_ENTRY_STR(VCN, 0, regUVD_JRBC_RB_SIZE),
+ SOC15_REG_ENTRY_STR(VCN, 0, regUVD_JRBC_STATUS),
+ SOC15_REG_ENTRY_STR(VCN, 0, regJPEG_DEC_ADDR_MODE),
+ SOC15_REG_ENTRY_STR(VCN, 0, regJPEG_DEC_GFX10_ADDR_CONFIG),
+ SOC15_REG_ENTRY_STR(VCN, 0, regJPEG_DEC_Y_GFX10_TILING_SURFACE),
+ SOC15_REG_ENTRY_STR(VCN, 0, regJPEG_DEC_UV_GFX10_TILING_SURFACE),
+ SOC15_REG_ENTRY_STR(VCN, 0, regUVD_JPEG_PITCH),
+ SOC15_REG_ENTRY_STR(VCN, 0, regUVD_JPEG_UV_PITCH),
+};
+
static int jpeg_v4_0_start_sriov(struct amdgpu_device *adev);
static void jpeg_v4_0_set_dec_ring_funcs(struct amdgpu_device *adev);
static void jpeg_v4_0_set_irq_funcs(struct amdgpu_device *adev);
static int jpeg_v4_0_set_powergating_state(struct amdgpu_ip_block *ip_block,
enum amd_powergating_state state);
static void jpeg_v4_0_set_ras_funcs(struct amdgpu_device *adev);
-
+static void jpeg_v4_0_dump_ip_state(struct amdgpu_ip_block *ip_block);
+static void jpeg_v4_0_print_ip_state(struct amdgpu_ip_block *ip_block, struct
drm_printer *p);
static void jpeg_v4_0_dec_ring_set_wptr(struct amdgpu_ring *ring);
/**
@@ -123,6 +140,12 @@ static int jpeg_v4_0_sw_init(struct amdgpu_ip_block
*ip_block)
r = amdgpu_jpeg_ras_sw_init(adev);
if (r)
return r;
+
+ adev->jpeg.ip_dump = kcalloc(adev->jpeg.num_jpeg_inst *
ARRAY_SIZE(jpeg_reg_list_4_0),
+ sizeof(uint32_t), GFP_KERNEL);
+ if (!adev->jpeg.ip_dump)
+ DRM_ERROR("Failed to allocate memory for JPEG IP Dump\n");
+
/* TODO: Add queue reset mask when FW fully supports it */
adev->jpeg.supported_reset =
amdgpu_get_soft_full_reset_mask(&adev->jpeg.inst[0].ring_dec[0]);
@@ -152,6 +175,8 @@ static int jpeg_v4_0_sw_fini(struct amdgpu_ip_block
*ip_block)
amdgpu_jpeg_sysfs_reset_mask_fini(adev);
r = amdgpu_jpeg_sw_fini(adev);
+ kfree(adev->jpeg.ip_dump);
+
return r;
}
@@ -704,6 +729,17 @@ static int jpeg_v4_0_process_interrupt(struct
amdgpu_device *adev,
return 0;
}
+static void jpeg_v4_0_dump_ip_state(struct amdgpu_ip_block *ip_block)
+{
+ amdgpu_jpeg_dump_ip_state(ip_block, jpeg_reg_list_4_0,
ARRAY_SIZE(jpeg_reg_list_4_0));
+}
+
+static void jpeg_v4_0_print_ip_state(struct amdgpu_ip_block *ip_block, struct
drm_printer *p)
+{
+ amdgpu_jpeg_print_ip_state(ip_block, p, jpeg_reg_list_4_0,
+ ARRAY_SIZE(jpeg_reg_list_4_0));
+}
+
static const struct amd_ip_funcs jpeg_v4_0_ip_funcs = {
.name = "jpeg_v4_0",
.early_init = jpeg_v4_0_early_init,
@@ -717,6 +753,8 @@ static const struct amd_ip_funcs jpeg_v4_0_ip_funcs = {
.wait_for_idle = jpeg_v4_0_wait_for_idle,
.set_clockgating_state = jpeg_v4_0_set_clockgating_state,
.set_powergating_state = jpeg_v4_0_set_powergating_state,
+ .dump_ip_state = jpeg_v4_0_dump_ip_state,
+ .print_ip_state = jpeg_v4_0_print_ip_state,
};
static const struct amdgpu_ring_funcs jpeg_v4_0_dec_ring_vm_funcs = {
--
2.25.1
