]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/amdgpu: update the handle ptr in print_ip_state
authorSunil Khatri <sunil.khatri@amd.com>
Wed, 25 Sep 2024 03:26:40 +0000 (08:56 +0530)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 1 Oct 2024 21:36:17 +0000 (17:36 -0400)
Update the ptr handle to amdgpu_ip_block ptr in all
the functions affected.

Signed-off-by: Sunil Khatri <sunil.khatri@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
21 files changed:
drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c
drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c
drivers/gpu/drm/amd/include/amd_shared.h

index 5ac59b62020cf27ce4a2747abf439e64084d4c30..946c48829f1970724654efec2eabf37ceb3b3013 100644 (file)
@@ -203,6 +203,7 @@ amdgpu_devcoredump_read(char *buffer, loff_t offset, size_t count,
        struct amdgpu_coredump_info *coredump = data;
        struct drm_print_iterator iter;
        struct amdgpu_vm_fault_info *fault_info;
+       struct amdgpu_ip_block *ip_block;
        int ver;
 
        iter.data = buffer;
@@ -282,13 +283,10 @@ amdgpu_devcoredump_read(char *buffer, loff_t offset, size_t count,
        /* dump the ip state for each ip */
        drm_printf(&p, "IP Dump\n");
        for (int i = 0; i < coredump->adev->num_ip_blocks; i++) {
-               if (coredump->adev->ip_blocks[i].version->funcs->print_ip_state) {
-                       drm_printf(&p, "IP: %s\n",
-                                  coredump->adev->ip_blocks[i]
-                                          .version->funcs->name);
-                       coredump->adev->ip_blocks[i]
-                               .version->funcs->print_ip_state(
-                                       (void *)coredump->adev, &p);
+               ip_block = &coredump->adev->ip_blocks[i];
+               if (ip_block->version->funcs->print_ip_state) {
+                       drm_printf(&p, "IP: %s\n", ip_block->version->funcs->name);
+                       ip_block->version->funcs->print_ip_state(ip_block, &p);
                        drm_printf(&p, "\n");
                }
        }
index 61300eb88ab4dae3d1c235e72c7d4e218d8f1be9..4b889a2acb109fcee8c7cc36e19fe1b8b81257de 100644 (file)
@@ -9568,9 +9568,9 @@ static int gfx_v10_0_reset_kcq(struct amdgpu_ring *ring,
        return amdgpu_ring_test_ring(ring);
 }
 
-static void gfx_v10_ip_print(void *handle, struct drm_printer *p)
+static void gfx_v10_ip_print(struct amdgpu_ip_block *ip_block, struct drm_printer *p)
 {
-       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+       struct amdgpu_device *adev = ip_block->adev;
        uint32_t i, j, k, reg, index = 0;
        uint32_t reg_count = ARRAY_SIZE(gc_reg_list_10_1);
 
index acf2e7634200cd5066ee2fd317c4c9aa60191dc1..3f29b36323a155b55eb7a8adc519d1a56364d434 100644 (file)
@@ -6641,9 +6641,9 @@ static int gfx_v11_0_reset_kcq(struct amdgpu_ring *ring, unsigned int vmid)
        return amdgpu_ring_test_ring(ring);
 }
 
-static void gfx_v11_ip_print(void *handle, struct drm_printer *p)
+static void gfx_v11_ip_print(struct amdgpu_ip_block *ip_block, struct drm_printer *p)
 {
-       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+       struct amdgpu_device *adev = ip_block->adev;
        uint32_t i, j, k, reg, index = 0;
        uint32_t reg_count = ARRAY_SIZE(gc_reg_list_11_0);
 
index 13baa6868a78906b432ea1c792917c95c72f8004..3044436436c862eafb6df3adc73f673dad7c2503 100644 (file)
@@ -5038,9 +5038,9 @@ static void gfx_v12_ring_insert_nop(struct amdgpu_ring *ring, uint32_t num_nop)
                amdgpu_ring_write(ring, ring->funcs->nop);
 }
 
-static void gfx_v12_ip_print(void *handle, struct drm_printer *p)
+static void gfx_v12_ip_print(struct amdgpu_ip_block *ip_block, struct drm_printer *p)
 {
-       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+       struct amdgpu_device *adev = ip_block->adev;
        uint32_t i, j, k, reg, index = 0;
        uint32_t reg_count = ARRAY_SIZE(gc_reg_list_12_0);
 
index fb4402f9bd8d41576da43a5f2b1ad536635bc5d9..f9f2410ee7d1c33d6f18575f0c7c37e205563784 100644 (file)
@@ -7337,9 +7337,9 @@ static int gfx_v9_0_reset_kcq(struct amdgpu_ring *ring,
        return amdgpu_ring_test_ring(ring);
 }
 
-static void gfx_v9_ip_print(void *handle, struct drm_printer *p)
+static void gfx_v9_ip_print(struct amdgpu_ip_block *ip_block, struct drm_printer *p)
 {
-       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+       struct amdgpu_device *adev = ip_block->adev;
        uint32_t i, j, k, reg, index = 0;
        uint32_t reg_count = ARRAY_SIZE(gc_reg_list_9);
 
index 3d48eb281e99b260698b1f8efa96113b6512a866..eabe0cf6191c1e946ed3cdcc7fa3f1030b445336 100644 (file)
@@ -4585,9 +4585,9 @@ static void gfx_v9_4_3_ring_insert_nop(struct amdgpu_ring *ring, uint32_t num_no
                amdgpu_ring_write(ring, ring->funcs->nop);
 }
 
-static void gfx_v9_4_3_ip_print(void *handle, struct drm_printer *p)
+static void gfx_v9_4_3_ip_print(struct amdgpu_ip_block *ip_block, struct drm_printer *p)
 {
-       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+       struct amdgpu_device *adev = ip_block->adev;
        uint32_t i, j, k;
        uint32_t xcc_id, xcc_offset, inst_offset;
        uint32_t num_xcc, reg, num_inst;
index 50ad06f06c62353bd7e3922374ed090c8f8e529c..f17ce2d53b9299656ef50396157c40a3943fb014 100644 (file)
@@ -2350,9 +2350,9 @@ static void sdma_v4_0_get_clockgating_state(void *handle, u64 *flags)
                *flags |= AMD_CG_SUPPORT_SDMA_LS;
 }
 
-static void sdma_v4_0_print_ip_state(void *handle, struct drm_printer *p)
+static void sdma_v4_0_print_ip_state(struct amdgpu_ip_block *ip_block, struct drm_printer *p)
 {
-       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+       struct amdgpu_device *adev = ip_block->adev;
        int i, j;
        uint32_t reg_count = ARRAY_SIZE(sdma_reg_list_4_0);
        uint32_t instance_offset;
index 487cc0992263bba21794e9756825ccfc139a634b..d577b973d0a4090fdafbb3650cb4934d5291479d 100644 (file)
@@ -1857,9 +1857,9 @@ static void sdma_v4_4_2_get_clockgating_state(void *handle, u64 *flags)
                *flags |= AMD_CG_SUPPORT_SDMA_LS;
 }
 
-static void sdma_v4_4_2_print_ip_state(void *handle, struct drm_printer *p)
+static void sdma_v4_4_2_print_ip_state(struct amdgpu_ip_block *ip_block, struct drm_printer *p)
 {
-       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+       struct amdgpu_device *adev = ip_block->adev;
        int i, j;
        uint32_t reg_count = ARRAY_SIZE(sdma_reg_list_4_4_2);
        uint32_t instance_offset;
index 4dc8ff761888516f2b26521b5db726123dd6be6e..d3d2c8bf9000e934dc7e63495f7de91f9a0a5f3b 100644 (file)
@@ -1801,9 +1801,9 @@ static void sdma_v5_0_get_clockgating_state(void *handle, u64 *flags)
                *flags |= AMD_CG_SUPPORT_SDMA_LS;
 }
 
-static void sdma_v5_0_print_ip_state(void *handle, struct drm_printer *p)
+static void sdma_v5_0_print_ip_state(struct amdgpu_ip_block *ip_block, struct drm_printer *p)
 {
-       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+       struct amdgpu_device *adev = ip_block->adev;
        int i, j;
        uint32_t reg_count = ARRAY_SIZE(sdma_reg_list_5_0);
        uint32_t instance_offset;
index d19dde1d6fc5b9cb3d9550395665d2cc6be8c857..8761b54050ca8a27e9be5c22b8b55d0e9fe4f201 100644 (file)
@@ -1736,9 +1736,9 @@ static void sdma_v5_2_ring_end_use(struct amdgpu_ring *ring)
        amdgpu_gfx_off_ctrl(adev, true);
 }
 
-static void sdma_v5_2_print_ip_state(void *handle, struct drm_printer *p)
+static void sdma_v5_2_print_ip_state(struct amdgpu_ip_block *ip_block, struct drm_printer *p)
 {
-       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+       struct amdgpu_device *adev = ip_block->adev;
        int i, j;
        uint32_t reg_count = ARRAY_SIZE(sdma_reg_list_5_2);
        uint32_t instance_offset;
index ed7413c1954c419c646bb29a50d063c5da7daf72..5eafc81e82f9460f5e07dfdece3632a444bf9221 100644 (file)
@@ -1603,9 +1603,9 @@ static void sdma_v6_0_get_clockgating_state(void *handle, u64 *flags)
 {
 }
 
-static void sdma_v6_0_print_ip_state(void *handle, struct drm_printer *p)
+static void sdma_v6_0_print_ip_state(struct amdgpu_ip_block *ip_block, struct drm_printer *p)
 {
-       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+       struct amdgpu_device *adev = ip_block->adev;
        int i, j;
        uint32_t reg_count = ARRAY_SIZE(sdma_reg_list_6_0);
        uint32_t instance_offset;
index 9e8b1ec4e6cb88f10c9af84c27ef4cf7db72bdc1..8509769db9c01bfa60dd76e6fe901fb4a40ec78a 100644 (file)
@@ -1538,9 +1538,9 @@ static void sdma_v7_0_get_clockgating_state(void *handle, u64 *flags)
 {
 }
 
-static void sdma_v7_0_print_ip_state(void *handle, struct drm_printer *p)
+static void sdma_v7_0_print_ip_state(struct amdgpu_ip_block *ip_block, struct drm_printer *p)
 {
-       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+       struct amdgpu_device *adev = ip_block->adev;
        int i, j;
        uint32_t reg_count = ARRAY_SIZE(sdma_reg_list_7_0);
        uint32_t instance_offset;
index 78dfcd02d8da4e2e1ba115bd6ff46c9aac902207..21e0962e53c20d16c02f17ced6c583e68f34fea3 100644 (file)
@@ -1925,9 +1925,9 @@ void vcn_v1_0_ring_end_use(struct amdgpu_ring *ring)
        mutex_unlock(&ring->adev->vcn.vcn1_jpeg1_workaround);
 }
 
-static void vcn_v1_0_print_ip_state(void *handle, struct drm_printer *p)
+static void vcn_v1_0_print_ip_state(struct amdgpu_ip_block *ip_block, struct drm_printer *p)
 {
-       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+       struct amdgpu_device *adev = ip_block->adev;
        int i, j;
        uint32_t reg_count = ARRAY_SIZE(vcn_reg_list_1_0);
        uint32_t inst_off, is_powered;
index 5d6accdba4804eb868330fc5b87697416dad49e5..b6d41d531ef930684c4785719c786e5970be1a4c 100644 (file)
@@ -2034,9 +2034,9 @@ static int vcn_v2_0_start_sriov(struct amdgpu_device *adev)
        return vcn_v2_0_start_mmsch(adev, &adev->virt.mm_table);
 }
 
-static void vcn_v2_0_print_ip_state(void *handle, struct drm_printer *p)
+static void vcn_v2_0_print_ip_state(struct amdgpu_ip_block *ip_block, struct drm_printer *p)
 {
-       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+       struct amdgpu_device *adev = ip_block->adev;
        int i, j;
        uint32_t reg_count = ARRAY_SIZE(vcn_reg_list_2_0);
        uint32_t inst_off, is_powered;
index 8896c25fd1d43839a14aa007f447bcbf4c752b63..6be770a060eff6f36b1336929b7b2e6049e62152 100644 (file)
@@ -1926,9 +1926,9 @@ static void vcn_v2_5_set_irq_funcs(struct amdgpu_device *adev)
        }
 }
 
-static void vcn_v2_5_print_ip_state(void *handle, struct drm_printer *p)
+static void vcn_v2_5_print_ip_state(struct amdgpu_ip_block *ip_block, struct drm_printer *p)
 {
-       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+       struct amdgpu_device *adev = ip_block->adev;
        int i, j;
        uint32_t reg_count = ARRAY_SIZE(vcn_reg_list_2_5);
        uint32_t inst_off, is_powered;
index 3009f52f62d7c1aa3c832a39ecedcdf01442c8f9..0c2d698ca0464e36c331a6ef4886a410d9a04627 100644 (file)
@@ -2251,9 +2251,9 @@ static void vcn_v3_0_set_irq_funcs(struct amdgpu_device *adev)
        }
 }
 
-static void vcn_v3_0_print_ip_state(void *handle, struct drm_printer *p)
+static void vcn_v3_0_print_ip_state(struct amdgpu_ip_block *ip_block, struct drm_printer *p)
 {
-       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+       struct amdgpu_device *adev = ip_block->adev;
        int i, j;
        uint32_t reg_count = ARRAY_SIZE(vcn_reg_list_3_0);
        uint32_t inst_off;
index 17ea10c14e299701910bb63108832e259dd4c2b7..d3aa1a5b2529f44ce1ad3e0aaebd2cba96e033e7 100644 (file)
@@ -2158,9 +2158,9 @@ static void vcn_v4_0_set_irq_funcs(struct amdgpu_device *adev)
        }
 }
 
-static void vcn_v4_0_print_ip_state(void *handle, struct drm_printer *p)
+static void vcn_v4_0_print_ip_state(struct amdgpu_ip_block *ip_block, struct drm_printer *p)
 {
-       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+       struct amdgpu_device *adev = ip_block->adev;
        int i, j;
        uint32_t reg_count = ARRAY_SIZE(vcn_reg_list_4_0);
        uint32_t inst_off, is_powered;
index 742bf09ae195e3335f47ab1ec48597ca32c88e75..ca5ac917f07d31a7b03eb7308ced409258fb7d3f 100644 (file)
@@ -1733,9 +1733,9 @@ static void vcn_v4_0_3_set_irq_funcs(struct amdgpu_device *adev)
        adev->vcn.inst->irq.funcs = &vcn_v4_0_3_irq_funcs;
 }
 
-static void vcn_v4_0_3_print_ip_state(void *handle, struct drm_printer *p)
+static void vcn_v4_0_3_print_ip_state(struct amdgpu_ip_block *ip_block, struct drm_printer *p)
 {
-       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+       struct amdgpu_device *adev = ip_block->adev;
        int i, j;
        uint32_t reg_count = ARRAY_SIZE(vcn_reg_list_4_0_3);
        uint32_t inst_off, is_powered;
index 3fb8b218e27819eccad033caa5d9b8a763894949..0d8aa5a0904b082dbc69ab4f057d6608548716fa 100644 (file)
@@ -1616,9 +1616,9 @@ static void vcn_v4_0_5_set_irq_funcs(struct amdgpu_device *adev)
        }
 }
 
-static void vcn_v4_0_5_print_ip_state(void *handle, struct drm_printer *p)
+static void vcn_v4_0_5_print_ip_state(struct amdgpu_ip_block *ip_block, struct drm_printer *p)
 {
-       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+       struct amdgpu_device *adev = ip_block->adev;
        int i, j;
        uint32_t reg_count = ARRAY_SIZE(vcn_reg_list_4_0_5);
        uint32_t inst_off, is_powered;
index 25ae338df3461e1d64052009d71a2b7d6ccfbf97..8a2e217ae5c97604c73df701f6ff25cb1c8a3ec5 100644 (file)
@@ -1343,9 +1343,9 @@ static void vcn_v5_0_0_set_irq_funcs(struct amdgpu_device *adev)
        }
 }
 
-static void vcn_v5_0_print_ip_state(void *handle, struct drm_printer *p)
+static void vcn_v5_0_print_ip_state(struct amdgpu_ip_block *ip_block, struct drm_printer *p)
 {
-       struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+       struct amdgpu_device *adev = ip_block->adev;
        int i, j;
        uint32_t reg_count = ARRAY_SIZE(vcn_reg_list_5_0);
        uint32_t inst_off, is_powered;
index cbb19895ddaf566db6340b1e8f629463762e3961..9b02ab1c2048a223ac7c66870824dbb05bd33af9 100644 (file)
@@ -402,7 +402,7 @@ struct amd_ip_funcs {
                                     enum amd_powergating_state state);
        void (*get_clockgating_state)(void *handle, u64 *flags);
        void (*dump_ip_state)(struct amdgpu_ip_block *ip_block);
-       void (*print_ip_state)(void *handle, struct drm_printer *p);
+       void (*print_ip_state)(struct amdgpu_ip_block *ip_block, struct drm_printer *p);
 };