radeonsi: remove tabs

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5603>

diff --git a/src/gallium/drivers/radeon/radeon_vce.c b/src/gallium/drivers/radeon/radeon_vce.c
index 5dc81a5a3c2f5f1ad6655a54610b9ad3b6de6bcc..416240b6d1e02c262e9b0b6a545cba0dd66f6308 100644 (file)
--- a/src/gallium/drivers/radeon/radeon_vce.c
+++ b/src/gallium/drivers/radeon/radeon_vce.c
@@ -59,26 +59,26 @@ static void flush(struct rvce_encoder *enc)
 #if 0
 static void dump_feedback(struct rvce_encoder *enc, struct rvid_buffer *fb)
 {
 #if 0
 static void dump_feedback(struct rvce_encoder *enc, struct rvid_buffer *fb)
 {

-       uint32_t *ptr = enc->ws->buffer_map(fb->res->buf, enc->cs, PIPE_TRANSFER_READ_WRITE);
-       unsigned i = 0;
-       fprintf(stderr, "\n");
-       fprintf(stderr, "encStatus:\t\t\t%08x\n", ptr[i++]);
-       fprintf(stderr, "encHasBitstream:\t\t%08x\n", ptr[i++]);
-       fprintf(stderr, "encHasAudioBitstream:\t\t%08x\n", ptr[i++]);
-       fprintf(stderr, "encBitstreamOffset:\t\t%08x\n", ptr[i++]);
-       fprintf(stderr, "encBitstreamSize:\t\t%08x\n", ptr[i++]);
-       fprintf(stderr, "encAudioBitstreamOffset:\t%08x\n", ptr[i++]);
-       fprintf(stderr, "encAudioBitstreamSize:\t\t%08x\n", ptr[i++]);
-       fprintf(stderr, "encExtrabytes:\t\t\t%08x\n", ptr[i++]);
-       fprintf(stderr, "encAudioExtrabytes:\t\t%08x\n", ptr[i++]);
-       fprintf(stderr, "videoTimeStamp:\t\t\t%08x\n", ptr[i++]);
-       fprintf(stderr, "audioTimeStamp:\t\t\t%08x\n", ptr[i++]);
-       fprintf(stderr, "videoOutputType:\t\t%08x\n", ptr[i++]);
-       fprintf(stderr, "attributeFlags:\t\t\t%08x\n", ptr[i++]);
-       fprintf(stderr, "seiPrivatePackageOffset:\t%08x\n", ptr[i++]);
-       fprintf(stderr, "seiPrivatePackageSize:\t\t%08x\n", ptr[i++]);
-       fprintf(stderr, "\n");
-       enc->ws->buffer_unmap(fb->res->buf);
+   uint32_t *ptr = enc->ws->buffer_map(fb->res->buf, enc->cs, PIPE_TRANSFER_READ_WRITE);
+   unsigned i = 0;
+   fprintf(stderr, "\n");
+   fprintf(stderr, "encStatus:\t\t\t%08x\n", ptr[i++]);
+   fprintf(stderr, "encHasBitstream:\t\t%08x\n", ptr[i++]);
+   fprintf(stderr, "encHasAudioBitstream:\t\t%08x\n", ptr[i++]);
+   fprintf(stderr, "encBitstreamOffset:\t\t%08x\n", ptr[i++]);
+   fprintf(stderr, "encBitstreamSize:\t\t%08x\n", ptr[i++]);
+   fprintf(stderr, "encAudioBitstreamOffset:\t%08x\n", ptr[i++]);
+   fprintf(stderr, "encAudioBitstreamSize:\t\t%08x\n", ptr[i++]);
+   fprintf(stderr, "encExtrabytes:\t\t\t%08x\n", ptr[i++]);
+   fprintf(stderr, "encAudioExtrabytes:\t\t%08x\n", ptr[i++]);
+   fprintf(stderr, "videoTimeStamp:\t\t\t%08x\n", ptr[i++]);
+   fprintf(stderr, "audioTimeStamp:\t\t\t%08x\n", ptr[i++]);
+   fprintf(stderr, "videoOutputType:\t\t%08x\n", ptr[i++]);
+   fprintf(stderr, "attributeFlags:\t\t\t%08x\n", ptr[i++]);
+   fprintf(stderr, "seiPrivatePackageOffset:\t%08x\n", ptr[i++]);
+   fprintf(stderr, "seiPrivatePackageSize:\t\t%08x\n", ptr[i++]);
+   fprintf(stderr, "\n");
+   enc->ws->buffer_unmap(fb->res->buf);

 }
 #endif
 
 }
 #endif
 

diff --git a/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c b/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c
index 4c3176f8705106a82aec19d0e86691f0bd65a837..01db3b2cd24a58aca919e8e2f7eba433771e3aa3 100644 (file)
--- a/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c
+++ b/src/gallium/drivers/radeonsi/gfx10_shader_ngg.c
@@ -671,7 +671,7 @@ static void load_bitmasks_2x64(struct si_shader_context *ctx, LLVMValueRef lds_p
  * and return the per-wave thread count.
  *
  * \param new_num_threads    Total thread count on the input, per-wave thread count on the output.
  * and return the per-wave thread count.
  *
  * \param new_num_threads    Total thread count on the input, per-wave thread count on the output.

- * \param tg_info           tg_info SGPR value
+ * \param tg_info            tg_info SGPR value

  * \param tg_info_num_bits   the bit size of thread count field in tg_info
  * \param tg_info_shift      the bit offset of the thread count field in tg_info
  * \param wave_info          merged_wave_info SGPR value
  * \param tg_info_num_bits   the bit size of thread count field in tg_info
  * \param tg_info_shift      the bit offset of the thread count field in tg_info
  * \param wave_info          merged_wave_info SGPR value

diff --git a/src/gallium/drivers/radeonsi/si_cp_dma.c b/src/gallium/drivers/radeonsi/si_cp_dma.c
index 56d240c0a20ade8b56002c8d890c471ef1e3987e..e2fc6f30edfb5e50e07682e6fb6e272f58498831 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_cp_dma.c
+++ b/src/gallium/drivers/radeonsi/si_cp_dma.c
@@ -284,7 +284,7 @@ static void si_cp_dma_realign_engine(struct si_context *sctx, unsigned size, uns
  * Do memcpy between buffers using CP DMA.
  * If src or dst is NULL, it means read or write GDS, respectively.
  *
  * Do memcpy between buffers using CP DMA.
  * If src or dst is NULL, it means read or write GDS, respectively.
  *

- * \param user_flags   bitmask of SI_CPDMA_*
+ * \param user_flags    bitmask of SI_CPDMA_*

  */
 void si_cp_dma_copy_buffer(struct si_context *sctx, struct pipe_resource *dst,
                            struct pipe_resource *src, uint64_t dst_offset, uint64_t src_offset,
  */
 void si_cp_dma_copy_buffer(struct si_context *sctx, struct pipe_resource *dst,
                            struct pipe_resource *src, uint64_t dst_offset, uint64_t src_offset,

diff --git a/src/gallium/drivers/radeonsi/si_gfx_cs.c b/src/gallium/drivers/radeonsi/si_gfx_cs.c
index 188bda0858cb5e2d2ef2a204cf28a1e464d8bcd8..8ad95cba8af5fa1fa2e66bc81377ce469b5da219 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_gfx_cs.c
+++ b/src/gallium/drivers/radeonsi/si_gfx_cs.c
@@ -113,7 +113,7 @@ void si_flush_gfx_cs(struct si_context *ctx, unsigned flags, struct pipe_fence_h
 
    ctx->gfx_flush_in_progress = true;
 
 
    ctx->gfx_flush_in_progress = true;
 

-       /* If the gallium frontend is flushing the GFX IB, si_flush_from_st is
+   /* If the gallium frontend is flushing the GFX IB, si_flush_from_st is

     * responsible for flushing the DMA IB and merging the fences from both.
     * If the driver flushes the GFX IB internally, and it should never ask
     * for a fence handle.
     * responsible for flushing the DMA IB and merging the fences from both.
     * If the driver flushes the GFX IB internally, and it should never ask
     * for a fence handle.


@@ -326,25 +326,25 @@ void si_set_tracked_regs_to_clear_state(struct si_context *ctx)
    ctx->tracked_regs.reg_value[SI_TRACKED_SX_PS_DOWNCONVERT] = 0x00000000;
    ctx->tracked_regs.reg_value[SI_TRACKED_SX_BLEND_OPT_EPSILON] = 0x00000000;
    ctx->tracked_regs.reg_value[SI_TRACKED_SX_BLEND_OPT_CONTROL] = 0x00000000;
    ctx->tracked_regs.reg_value[SI_TRACKED_SX_PS_DOWNCONVERT] = 0x00000000;
    ctx->tracked_regs.reg_value[SI_TRACKED_SX_BLEND_OPT_EPSILON] = 0x00000000;
    ctx->tracked_regs.reg_value[SI_TRACKED_SX_BLEND_OPT_CONTROL] = 0x00000000;

-   ctx->tracked_regs.reg_value[SI_TRACKED_PA_SC_LINE_CNTL]     = 0x00001000;
-   ctx->tracked_regs.reg_value[SI_TRACKED_PA_SC_AA_CONFIG]     = 0x00000000;
-   ctx->tracked_regs.reg_value[SI_TRACKED_DB_EQAA]     = 0x00000000;
+   ctx->tracked_regs.reg_value[SI_TRACKED_PA_SC_LINE_CNTL] = 0x00001000;
+   ctx->tracked_regs.reg_value[SI_TRACKED_PA_SC_AA_CONFIG] = 0x00000000;
+   ctx->tracked_regs.reg_value[SI_TRACKED_DB_EQAA] = 0x00000000;

    ctx->tracked_regs.reg_value[SI_TRACKED_PA_SC_MODE_CNTL_1] = 0x00000000;
    ctx->tracked_regs.reg_value[SI_TRACKED_PA_SU_PRIM_FILTER_CNTL] = 0;
    ctx->tracked_regs.reg_value[SI_TRACKED_PA_SU_SMALL_PRIM_FILTER_CNTL] = 0x00000000;
    ctx->tracked_regs.reg_value[SI_TRACKED_PA_CL_VS_OUT_CNTL__VS] = 0x00000000;
    ctx->tracked_regs.reg_value[SI_TRACKED_PA_CL_VS_OUT_CNTL__CL] = 0x00000000;
    ctx->tracked_regs.reg_value[SI_TRACKED_PA_SC_MODE_CNTL_1] = 0x00000000;
    ctx->tracked_regs.reg_value[SI_TRACKED_PA_SU_PRIM_FILTER_CNTL] = 0;
    ctx->tracked_regs.reg_value[SI_TRACKED_PA_SU_SMALL_PRIM_FILTER_CNTL] = 0x00000000;
    ctx->tracked_regs.reg_value[SI_TRACKED_PA_CL_VS_OUT_CNTL__VS] = 0x00000000;
    ctx->tracked_regs.reg_value[SI_TRACKED_PA_CL_VS_OUT_CNTL__CL] = 0x00000000;

-   ctx->tracked_regs.reg_value[SI_TRACKED_PA_CL_CLIP_CNTL]     = 0x00090000;
+   ctx->tracked_regs.reg_value[SI_TRACKED_PA_CL_CLIP_CNTL] = 0x00090000;

    ctx->tracked_regs.reg_value[SI_TRACKED_PA_SC_BINNER_CNTL_0] = 0x00000003;
    ctx->tracked_regs.reg_value[SI_TRACKED_PA_SC_BINNER_CNTL_0] = 0x00000003;

-   ctx->tracked_regs.reg_value[SI_TRACKED_DB_DFSM_CONTROL]     = 0x00000000;
-   ctx->tracked_regs.reg_value[SI_TRACKED_PA_CL_GB_VERT_CLIP_ADJ]      = 0x3f800000;
-   ctx->tracked_regs.reg_value[SI_TRACKED_PA_CL_GB_VERT_DISC_ADJ]      = 0x3f800000;
-   ctx->tracked_regs.reg_value[SI_TRACKED_PA_CL_GB_HORZ_CLIP_ADJ]      = 0x3f800000;
-   ctx->tracked_regs.reg_value[SI_TRACKED_PA_CL_GB_HORZ_DISC_ADJ]      = 0x3f800000;
+   ctx->tracked_regs.reg_value[SI_TRACKED_DB_DFSM_CONTROL] = 0x00000000;
+   ctx->tracked_regs.reg_value[SI_TRACKED_PA_CL_GB_VERT_CLIP_ADJ] = 0x3f800000;
+   ctx->tracked_regs.reg_value[SI_TRACKED_PA_CL_GB_VERT_DISC_ADJ] = 0x3f800000;
+   ctx->tracked_regs.reg_value[SI_TRACKED_PA_CL_GB_HORZ_CLIP_ADJ] = 0x3f800000;
+   ctx->tracked_regs.reg_value[SI_TRACKED_PA_CL_GB_HORZ_DISC_ADJ] = 0x3f800000;

    ctx->tracked_regs.reg_value[SI_TRACKED_PA_SU_HARDWARE_SCREEN_OFFSET] = 0;
    ctx->tracked_regs.reg_value[SI_TRACKED_PA_SU_VTX_CNTL] = 0x00000005;
    ctx->tracked_regs.reg_value[SI_TRACKED_PA_SU_HARDWARE_SCREEN_OFFSET] = 0;
    ctx->tracked_regs.reg_value[SI_TRACKED_PA_SU_VTX_CNTL] = 0x00000005;

-   ctx->tracked_regs.reg_value[SI_TRACKED_PA_SC_CLIPRECT_RULE] = 0xffff;
-   ctx->tracked_regs.reg_value[SI_TRACKED_PA_SC_LINE_STIPPLE]  = 0;
+   ctx->tracked_regs.reg_value[SI_TRACKED_PA_SC_CLIPRECT_RULE] = 0xffff;
+   ctx->tracked_regs.reg_value[SI_TRACKED_PA_SC_LINE_STIPPLE] = 0;

    ctx->tracked_regs.reg_value[SI_TRACKED_VGT_ESGS_RING_ITEMSIZE]  = 0x00000000;
    ctx->tracked_regs.reg_value[SI_TRACKED_VGT_GSVS_RING_OFFSET_1]  = 0x00000000;
    ctx->tracked_regs.reg_value[SI_TRACKED_VGT_GSVS_RING_OFFSET_2]  = 0x00000000;
    ctx->tracked_regs.reg_value[SI_TRACKED_VGT_ESGS_RING_ITEMSIZE]  = 0x00000000;
    ctx->tracked_regs.reg_value[SI_TRACKED_VGT_GSVS_RING_OFFSET_1]  = 0x00000000;
    ctx->tracked_regs.reg_value[SI_TRACKED_VGT_GSVS_RING_OFFSET_2]  = 0x00000000;

diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index 4352def038e717f6c161e1d8e783ae7c77c3d783..7364277c96253d3a567f683d0bc030aab7fa5157 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -322,7 +322,7 @@ static enum pipe_reset_status si_get_reset_status(struct pipe_context *ctx)
    enum pipe_reset_status status = sctx->ws->ctx_query_reset_status(sctx->ctx);
 
    if (status != PIPE_NO_RESET) {
    enum pipe_reset_status status = sctx->ws->ctx_query_reset_status(sctx->ctx);
 
    if (status != PIPE_NO_RESET) {

-               /* Call the gallium frontend to set a no-op API dispatch. */
+      /* Call the gallium frontend to set a no-op API dispatch. */

       if (sctx->device_reset_callback.reset) {
          sctx->device_reset_callback.reset(sctx->device_reset_callback.data, status);
       }
       if (sctx->device_reset_callback.reset) {
          sctx->device_reset_callback.reset(sctx->device_reset_callback.data, status);
       }

diff --git a/src/gallium/drivers/radeonsi/si_query.c b/src/gallium/drivers/radeonsi/si_query.c
index 6ad293301cb566134e08c7c8daac6361159db088..eecfebadd51bf5b7ea8119c7cc048f6118923a0e 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_query.c
+++ b/src/gallium/drivers/radeonsi/si_query.c
@@ -1331,20 +1331,20 @@ static void si_query_hw_add_result(struct si_screen *sscreen, struct si_query_hw
       result->pipeline_statistics.ds_invocations += si_query_read_result(buffer, 18, 40, false);
       result->pipeline_statistics.cs_invocations += si_query_read_result(buffer, 20, 42, false);
 #if 0 /* for testing */
       result->pipeline_statistics.ds_invocations += si_query_read_result(buffer, 18, 40, false);
       result->pipeline_statistics.cs_invocations += si_query_read_result(buffer, 20, 42, false);
 #if 0 /* for testing */

-               printf("Pipeline stats: IA verts=%llu, IA prims=%llu, VS=%llu, HS=%llu, "
-                      "DS=%llu, GS=%llu, GS prims=%llu, Clipper=%llu, "
-                      "Clipper prims=%llu, PS=%llu, CS=%llu\n",
-                      result->pipeline_statistics.ia_vertices,
-                      result->pipeline_statistics.ia_primitives,
-                      result->pipeline_statistics.vs_invocations,
-                      result->pipeline_statistics.hs_invocations,
-                      result->pipeline_statistics.ds_invocations,
-                      result->pipeline_statistics.gs_invocations,
-                      result->pipeline_statistics.gs_primitives,
-                      result->pipeline_statistics.c_invocations,
-                      result->pipeline_statistics.c_primitives,
-                      result->pipeline_statistics.ps_invocations,
-                      result->pipeline_statistics.cs_invocations);
+      printf("Pipeline stats: IA verts=%llu, IA prims=%llu, VS=%llu, HS=%llu, "
+             "DS=%llu, GS=%llu, GS prims=%llu, Clipper=%llu, "
+             "Clipper prims=%llu, PS=%llu, CS=%llu\n",
+             result->pipeline_statistics.ia_vertices,
+             result->pipeline_statistics.ia_primitives,
+             result->pipeline_statistics.vs_invocations,
+             result->pipeline_statistics.hs_invocations,
+             result->pipeline_statistics.ds_invocations,
+             result->pipeline_statistics.gs_invocations,
+             result->pipeline_statistics.gs_primitives,
+             result->pipeline_statistics.c_invocations,
+             result->pipeline_statistics.c_primitives,
+             result->pipeline_statistics.ps_invocations,
+             result->pipeline_statistics.cs_invocations);

 #endif
       break;
    default:
 #endif
       break;
    default:

diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c
index 7ce107e1b0f931e99aee4cad9dcf7c6d45114c11..f26a93c16bcf3e2a2fa7573e6f27f1117a0ba4ab 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_shader_nir.c
+++ b/src/gallium/drivers/radeonsi/si_shader_nir.c
@@ -869,7 +869,7 @@ static void si_nir_lower_ps_inputs(struct nir_shader *nir)
 
 void si_nir_adjust_driver_locations(struct nir_shader *nir)
 {
 
 void si_nir_adjust_driver_locations(struct nir_shader *nir)
 {

-       /* Adjust the driver location of inputs and outputs. the gallium frontend
+   /* Adjust the driver location of inputs and outputs. the gallium frontend

     * interprets them as slots, while the ac/nir backend interprets them
     * as individual components.
     */
     * interprets them as slots, while the ac/nir backend interprets them
     * as individual components.
     */

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 1531ee5cf5e88ef772f79f36d01ee422c6dbce7d..feef17566fd6ca10abefc91bd0548be877934535 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -1777,8 +1777,8 @@ static uint32_t si_translate_texformat(struct pipe_screen *screen, enum pipe_for
    case 4:
       switch (desc->nr_channels) {
 #if 0 /* Not supported for render targets */
    case 4:
       switch (desc->nr_channels) {
 #if 0 /* Not supported for render targets */

-               case 2:
-                       return V_008F14_IMG_DATA_FORMAT_4_4;
+      case 2:
+         return V_008F14_IMG_DATA_FORMAT_4_4;

 #endif
       case 4:
          return V_008F14_IMG_DATA_FORMAT_4_4_4_4;
 #endif
       case 4:
          return V_008F14_IMG_DATA_FORMAT_4_4_4_4;


@@ -1811,8 +1811,8 @@ static uint32_t si_translate_texformat(struct pipe_screen *screen, enum pipe_for
       case 2:
          return V_008F14_IMG_DATA_FORMAT_32_32;
 #if 0 /* Not supported for render targets */
       case 2:
          return V_008F14_IMG_DATA_FORMAT_32_32;
 #if 0 /* Not supported for render targets */

-               case 3:
-                       return V_008F14_IMG_DATA_FORMAT_32_32_32;
+      case 3:
+         return V_008F14_IMG_DATA_FORMAT_32_32_32;

 #endif
       case 4:
          return V_008F14_IMG_DATA_FORMAT_32_32_32_32;
 #endif
       case 4:
          return V_008F14_IMG_DATA_FORMAT_32_32_32_32;


@@ -4524,7 +4524,7 @@ static void si_emit_sample_mask(struct si_context *sctx)
    unsigned mask = sctx->sample_mask;
 
    /* Needed for line and polygon smoothing as well as for the Polaris
    unsigned mask = sctx->sample_mask;
 
    /* Needed for line and polygon smoothing as well as for the Polaris

-        * small primitive filter. We expect the gallium frontend to take care of
+    * small primitive filter. We expect the gallium frontend to take care of

     * this for us.
     */
    assert(mask == 0xffff || sctx->framebuffer.nr_samples > 1 ||
     * this for us.
     */
    assert(mask == 0xffff || sctx->framebuffer.nr_samples > 1 ||

diff --git a/src/gallium/drivers/radeonsi/si_texture.c b/src/gallium/drivers/radeonsi/si_texture.c
index 45b4b84a6a806e815dcb376c7a34bcd837d66ebf..875341bf06e8a4ae5bf1dae942224a7694a52a43 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_texture.c
+++ b/src/gallium/drivers/radeonsi/si_texture.c
@@ -1281,7 +1281,7 @@ struct pipe_resource *si_texture_create(struct pipe_screen *screen,
 
    if (templ->nr_samples >= 2) {
       /* This is hackish (overwriting the const pipe_resource template),
 
    if (templ->nr_samples >= 2) {
       /* This is hackish (overwriting the const pipe_resource template),

-                * but should be harmless and gallium frontends can also see
+       * but should be harmless and gallium frontends can also see

        * the overriden number of samples in the created pipe_resource.
        */
       if (is_zs && sscreen->eqaa_force_z_samples) {
        * the overriden number of samples in the created pipe_resource.
        */
       if (is_zs && sscreen->eqaa_force_z_samples) {