Skip to content

Commit

Permalink
drm/amdgpu: add vcn_v2_5 ip dump support
Browse files Browse the repository at this point in the history
Add support of vcn ip dump in the devcoredump
for vcn_v2_5.

Signed-off-by: Sunil Khatri <sunil.khatri@amd.com>
Acked-by: Leo Liu <leo.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
Sunil Khatri authored and Alex Deucher committed Aug 16, 2024
1 parent b910cac commit 0eea81e
Showing 1 changed file with 79 additions and 1 deletion.
80 changes: 79 additions & 1 deletion drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,43 @@

#define VCN25_MAX_HW_INSTANCES_ARCTURUS 2

static const struct amdgpu_hwip_reg_entry vcn_reg_list_2_5[] = {
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_POWER_STATUS),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_POWER_STATUS),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_STATUS),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_CONTEXT_ID),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_CONTEXT_ID2),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_GPCOM_VCPU_DATA0),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_GPCOM_VCPU_DATA1),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_GPCOM_VCPU_CMD),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_RB_BASE_HI),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_RB_BASE_LO),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_RB_BASE_HI2),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_RB_BASE_LO2),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_RB_BASE_HI3),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_RB_BASE_LO3),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_RB_BASE_HI4),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_RB_BASE_LO4),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_RB_RPTR),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_RB_WPTR),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_RB_RPTR2),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_RB_WPTR2),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_RB_RPTR3),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_RB_WPTR3),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_RB_RPTR4),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_RB_WPTR4),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_RB_SIZE),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_RB_SIZE2),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_RB_SIZE3),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_RB_SIZE4),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_PGFSM_CONFIG),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_PGFSM_STATUS),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_DPG_LMA_CTL),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_DPG_LMA_DATA),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_DPG_LMA_MASK),
SOC15_REG_ENTRY_STR(VCN, 0, mmUVD_DPG_PAUSE)
};

static void vcn_v2_5_set_dec_ring_funcs(struct amdgpu_device *adev);
static void vcn_v2_5_set_enc_ring_funcs(struct amdgpu_device *adev);
static void vcn_v2_5_set_irq_funcs(struct amdgpu_device *adev);
Expand Down Expand Up @@ -122,6 +159,8 @@ static int vcn_v2_5_sw_init(void *handle)
{
struct amdgpu_ring *ring;
int i, j, r;
uint32_t reg_count = ARRAY_SIZE(vcn_reg_list_2_5);
uint32_t *ptr;
struct amdgpu_device *adev = (struct amdgpu_device *)handle;

for (j = 0; j < adev->vcn.num_vcn_inst; j++) {
Expand Down Expand Up @@ -241,6 +280,15 @@ static int vcn_v2_5_sw_init(void *handle)
if (r)
return r;

/* Allocate memory for VCN IP Dump buffer */
ptr = kcalloc(adev->vcn.num_vcn_inst * reg_count, sizeof(uint32_t), GFP_KERNEL);
if (!ptr) {
DRM_ERROR("Failed to allocate memory for VCN IP Dump\n");
adev->vcn.ip_dump = NULL;
} else {
adev->vcn.ip_dump = ptr;
}

return 0;
}

Expand Down Expand Up @@ -277,6 +325,8 @@ static int vcn_v2_5_sw_fini(void *handle)

r = amdgpu_vcn_sw_fini(adev);

kfree(adev->vcn.ip_dump);

return r;
}

Expand Down Expand Up @@ -1876,6 +1926,34 @@ static void vcn_v2_5_set_irq_funcs(struct amdgpu_device *adev)
}
}

static void vcn_v2_5_dump_ip_state(void *handle)
{
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
int i, j;
bool is_powered;
uint32_t inst_off;
uint32_t reg_count = ARRAY_SIZE(vcn_reg_list_2_5);

if (!adev->vcn.ip_dump)
return;

for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
if (adev->vcn.harvest_config & (1 << i))
continue;

inst_off = i * reg_count;
/* mmUVD_POWER_STATUS is always readable and is first element of the array */
adev->vcn.ip_dump[inst_off] = RREG32_SOC15(VCN, i, mmUVD_POWER_STATUS);
is_powered = (adev->vcn.ip_dump[inst_off] &
UVD_POWER_STATUS__UVD_POWER_STATUS_MASK) != 1;

if (is_powered)
for (j = 1; j < reg_count; j++)
adev->vcn.ip_dump[inst_off + j] =
RREG32(SOC15_REG_ENTRY_OFFSET_INST(vcn_reg_list_2_5[j], i));
}
}

static const struct amd_ip_funcs vcn_v2_5_ip_funcs = {
.name = "vcn_v2_5",
.early_init = vcn_v2_5_early_init,
Expand All @@ -1894,7 +1972,7 @@ static const struct amd_ip_funcs vcn_v2_5_ip_funcs = {
.post_soft_reset = NULL,
.set_clockgating_state = vcn_v2_5_set_clockgating_state,
.set_powergating_state = vcn_v2_5_set_powergating_state,
.dump_ip_state = NULL,
.dump_ip_state = vcn_v2_5_dump_ip_state,
.print_ip_state = NULL,
};

Expand Down

0 comments on commit 0eea81e

Please sign in to comment.