vcn code is restructured for per instance basis. Each
vcn instance is represented by an ip_block and hence a
need to update the dump and print functions for each
instance as an IP.
Signed-off-by: Sunil Khatri <sunil.khatri@xxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 80 +++++++++++++--------------
1 file changed, 38 insertions(+), 42 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
index 8aa30a4bddbf..a4126c066b58 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
@@ -237,12 +237,12 @@ static int vcn_v4_0_sw_init(struct amdgpu_ip_block *ip_block)
return r;
/* Allocate memory for VCN IP Dump buffer */
- ptr = kcalloc(adev->vcn.num_vcn_inst * reg_count, sizeof(uint32_t), GFP_KERNEL);
+ ptr = kcalloc(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;
+ ip_block->ip_dump = NULL;
} else {
- adev->vcn.ip_dump = ptr;
+ ip_block->ip_dump = ptr;
}
return 0;
@@ -283,7 +283,7 @@ static int vcn_v4_0_sw_fini(struct amdgpu_ip_block *ip_block)
r = amdgpu_vcn_sw_fini(adev, inst);
- kfree(adev->vcn.ip_dump);
+ kfree(ip_block->ip_dump);
return r;
}
@@ -2141,62 +2141,58 @@ static void vcn_v4_0_set_irq_funcs(struct amdgpu_device *adev, int inst)
static void vcn_v4_0_print_ip_state(struct amdgpu_ip_block *ip_block, struct drm_printer *p)
{
struct amdgpu_device *adev = ip_block->adev;
- int i, j;
+ int i;
uint32_t reg_count = ARRAY_SIZE(vcn_reg_list_4_0);
- uint32_t inst_off, is_powered;
+ uint32_t is_powered;
+ int inst = ip_block->instance;
- if (!adev->vcn.ip_dump)
+ if (!ip_block->ip_dump)
return;
- drm_printf(p, "num_instances:%d\n", adev->vcn.num_vcn_inst);
- for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
- if (adev->vcn.harvest_config & (1 << i)) {
- drm_printf(p, "\nHarvested Instance:VCN%d Skipping dump\n", i);
- continue;
- }
+ drm_printf(p, "Instance no:VCN%d\n", inst);
- inst_off = i * reg_count;
- is_powered = (adev->vcn.ip_dump[inst_off] &
- UVD_POWER_STATUS__UVD_POWER_STATUS_MASK) != 1;
+ if (adev->vcn.harvest_config & (1 << inst)) {
+ drm_printf(p, "\nHarvested Instance:VCN%d Skipping dump\n", inst);
+ return;
+ }
- if (is_powered) {
- drm_printf(p, "\nActive Instance:VCN%d\n", i);
- for (j = 0; j < reg_count; j++)
- drm_printf(p, "%-50s \t 0x%08x\n", vcn_reg_list_4_0[j].reg_name,
- adev->vcn.ip_dump[inst_off + j]);
- } else {
- drm_printf(p, "\nInactive Instance:VCN%d\n", i);
- }
+ is_powered = (ip_block->ip_dump[0] &
+ UVD_POWER_STATUS__UVD_POWER_STATUS_MASK) != 1;
+
+ if (is_powered) {
+ drm_printf(p, "\nActive Instance:VCN%d\n", inst);
+ for (i = 0; i < reg_count; i++)
+ drm_printf(p, "%-50s \t 0x%08x\n",
+ vcn_reg_list_4_0[i].reg_name,
+ ip_block->ip_dump[i]);
+ } else {
+ drm_printf(p, "\nInactive Instance:VCN%d\n", inst);
}
}
static void vcn_v4_0_dump_ip_state(struct amdgpu_ip_block *ip_block)
{
struct amdgpu_device *adev = ip_block->adev;
- int i, j;
+ int i;
bool is_powered;
- uint32_t inst_off;
uint32_t reg_count = ARRAY_SIZE(vcn_reg_list_4_0);
+ int inst = ip_block->instance;
- if (!adev->vcn.ip_dump)
+ if (!ip_block->ip_dump)
return;
- for (i = 0; i < adev->vcn.num_vcn_inst; i++) {
- if (adev->vcn.harvest_config & (1 << i))
- continue;
+ if (adev->vcn.harvest_config & (1 << inst))
+ return;
- 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, regUVD_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_4_0[j],
- i));
- }
+ /* mmUVD_POWER_STATUS is always readable and is first element of the array */
+ ip_block->ip_dump[0] = RREG32_SOC15(VCN, inst, regUVD_POWER_STATUS);
+ is_powered = (ip_block->ip_dump[0] &
+ UVD_POWER_STATUS__UVD_POWER_STATUS_MASK) != 1;
+
+ if (is_powered)
+ for (i = 1; i < reg_count; i++)
+ ip_block->ip_dump[i] =
+ RREG32(SOC15_REG_ENTRY_OFFSET_INST(vcn_reg_list_4_0[i], inst));
}
static const struct amd_ip_funcs vcn_v4_0_ip_funcs = {
--
2.34.1
