mirror of
https://github.com/torvalds/linux.git
synced 2026-05-03 14:02:43 -04:00
drm/amdgpu: Enable devcoredump for JPEG4_0_5
Add register list and enable devcoredump for JPEG4_0_5 V2: (Lijo) - remove version specific callbacks and use simplified helper functions V3: (Lijo) - move amdgpu_jpeg_reg_dump_fini() to sw_fini() and avoid the call here Signed-off-by: Sathishkumar S <sathishkumar.sundararaju@amd.com> Reviewed-by: Leo Liu <leo.liu@amd.com> Acked-by: Lijo Lazar <lijo.lazar@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
committed by
Alex Deucher
parent
c3dddd6029
commit
2b0ccf3923
@@ -46,11 +46,26 @@
|
||||
#define regJPEG_CGC_GATE_INTERNAL_OFFSET 0x4160
|
||||
#define regUVD_NO_OP_INTERNAL_OFFSET 0x0029
|
||||
|
||||
static const struct amdgpu_hwip_reg_entry jpeg_reg_list_4_0_5[] = {
|
||||
SOC15_REG_ENTRY_STR(JPEG, 0, regUVD_JPEG_POWER_STATUS),
|
||||
SOC15_REG_ENTRY_STR(JPEG, 0, regUVD_JPEG_INT_STAT),
|
||||
SOC15_REG_ENTRY_STR(JPEG, 0, regUVD_JRBC_RB_RPTR),
|
||||
SOC15_REG_ENTRY_STR(JPEG, 0, regUVD_JRBC_RB_WPTR),
|
||||
SOC15_REG_ENTRY_STR(JPEG, 0, regUVD_JRBC_RB_CNTL),
|
||||
SOC15_REG_ENTRY_STR(JPEG, 0, regUVD_JRBC_RB_SIZE),
|
||||
SOC15_REG_ENTRY_STR(JPEG, 0, regUVD_JRBC_STATUS),
|
||||
SOC15_REG_ENTRY_STR(JPEG, 0, regJPEG_DEC_ADDR_MODE),
|
||||
SOC15_REG_ENTRY_STR(JPEG, 0, regJPEG_DEC_GFX10_ADDR_CONFIG),
|
||||
SOC15_REG_ENTRY_STR(JPEG, 0, regJPEG_DEC_Y_GFX10_TILING_SURFACE),
|
||||
SOC15_REG_ENTRY_STR(JPEG, 0, regJPEG_DEC_UV_GFX10_TILING_SURFACE),
|
||||
SOC15_REG_ENTRY_STR(JPEG, 0, regUVD_JPEG_PITCH),
|
||||
SOC15_REG_ENTRY_STR(JPEG, 0, regUVD_JPEG_UV_PITCH),
|
||||
};
|
||||
|
||||
static void jpeg_v4_0_5_set_dec_ring_funcs(struct amdgpu_device *adev);
|
||||
static void jpeg_v4_0_5_set_irq_funcs(struct amdgpu_device *adev);
|
||||
static int jpeg_v4_0_5_set_powergating_state(struct amdgpu_ip_block *ip_block,
|
||||
enum amd_powergating_state state);
|
||||
|
||||
static void jpeg_v4_0_5_dec_ring_set_wptr(struct amdgpu_ring *ring);
|
||||
|
||||
static int amdgpu_ih_clientid_jpeg[] = {
|
||||
@@ -58,6 +73,8 @@ static int amdgpu_ih_clientid_jpeg[] = {
|
||||
SOC15_IH_CLIENTID_VCN1
|
||||
};
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* jpeg_v4_0_5_early_init - set function pointers
|
||||
*
|
||||
@@ -153,6 +170,10 @@ static int jpeg_v4_0_5_sw_init(struct amdgpu_ip_block *ip_block)
|
||||
adev->jpeg.inst[i].external.jpeg_pitch[0] = SOC15_REG_OFFSET(JPEG, i, regUVD_JPEG_PITCH);
|
||||
}
|
||||
|
||||
r = amdgpu_jpeg_reg_dump_init(adev, jpeg_reg_list_4_0_5, ARRAY_SIZE(jpeg_reg_list_4_0_5));
|
||||
if (r)
|
||||
return r;
|
||||
|
||||
/* 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]);
|
||||
@@ -759,6 +780,8 @@ static const struct amd_ip_funcs jpeg_v4_0_5_ip_funcs = {
|
||||
.wait_for_idle = jpeg_v4_0_5_wait_for_idle,
|
||||
.set_clockgating_state = jpeg_v4_0_5_set_clockgating_state,
|
||||
.set_powergating_state = jpeg_v4_0_5_set_powergating_state,
|
||||
.dump_ip_state = amdgpu_jpeg_dump_ip_state,
|
||||
.print_ip_state = amdgpu_jpeg_print_ip_state,
|
||||
};
|
||||
|
||||
static const struct amdgpu_ring_funcs jpeg_v4_0_5_dec_ring_vm_funcs = {
|
||||
|
||||
Reference in New Issue
Block a user