drm/amdgpu/gfx: Use CSB helpers in gfx_v6_0_get_csb_buffer

Remove duplications from gfx_v6_0_get_csb_buffer by using CSB helpers.

Signed-off-by: Rodrigo Siqueira <siqueira@igalia.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
index d86620f38855a606fa5f23e498bd67d8c074aff8..70d7a1f434c4b14c1723554d0a1574a63aa03155 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
@@ -2858,42 +2858,21 @@ static u32 gfx_v6_0_get_csb_size(struct amdgpu_device *adev)
 static void gfx_v6_0_get_csb_buffer(struct amdgpu_device *adev,
                                    volatile u32 *buffer)
 {
-       u32 count = 0, i;
-       const struct cs_section_def *sect = NULL;
-       const struct cs_extent_def *ext = NULL;
+       u32 count = 0;
 
        if (adev->gfx.rlc.cs_data == NULL)
                return;
        if (buffer == NULL)
                return;
 
-       buffer[count++] = cpu_to_le32(PACKET3(PACKET3_PREAMBLE_CNTL, 0));
-       buffer[count++] = cpu_to_le32(PACKET3_PREAMBLE_BEGIN_CLEAR_STATE);
-       buffer[count++] = cpu_to_le32(PACKET3(PACKET3_CONTEXT_CONTROL, 1));
-       buffer[count++] = cpu_to_le32(0x80000000);
-       buffer[count++] = cpu_to_le32(0x80000000);
-
-       for (sect = adev->gfx.rlc.cs_data; sect->section != NULL; ++sect) {
-               for (ext = sect->section; ext->extent != NULL; ++ext) {
-                       if (sect->id == SECT_CONTEXT) {
-                               buffer[count++] =
-                                       cpu_to_le32(PACKET3(PACKET3_SET_CONTEXT_REG, ext->reg_count));
-                               buffer[count++] = cpu_to_le32(ext->reg_index - 0xa000);
-                               for (i = 0; i < ext->reg_count; i++)
-                                       buffer[count++] = cpu_to_le32(ext->extent[i]);
-                       }
-               }
-       }
+       count = amdgpu_gfx_csb_preamble_start(buffer);
+       count = amdgpu_gfx_csb_data_parser(adev, buffer, count);
 
        buffer[count++] = cpu_to_le32(PACKET3(PACKET3_SET_CONTEXT_REG, 1));
        buffer[count++] = cpu_to_le32(mmPA_SC_RASTER_CONFIG - PACKET3_SET_CONTEXT_REG_START);
        buffer[count++] = cpu_to_le32(adev->gfx.config.rb_config[0][0].raster_config);
 
-       buffer[count++] = cpu_to_le32(PACKET3(PACKET3_PREAMBLE_CNTL, 0));
-       buffer[count++] = cpu_to_le32(PACKET3_PREAMBLE_END_CLEAR_STATE);
-
-       buffer[count++] = cpu_to_le32(PACKET3(PACKET3_CLEAR_STATE, 0));
-       buffer[count++] = cpu_to_le32(0);
+       amdgpu_gfx_csb_preamble_end(buffer, count);
 }
 
 static void gfx_v6_0_init_pg(struct amdgpu_device *adev)