From: Rajnesh Kanwal <rajnesh.kanwal@imgtec.com>
Date: Sun, 25 Sep 2022 18:38:37 +0000 (+0100)
Subject: pvr: Remove redundant instruction buffer check.
X-Git-Tag: upstream/22.3.5~2102
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4f965ad8ee87286ec8b4aadbe3b13ddb6be75d60;p=platform%2Fupstream%2Fmesa.git

pvr: Remove redundant instruction buffer check.

Fixes: CID 1503273.

Signed-off-by: Rajnesh Kanwal <rajnesh.kanwal@imgtec.com>
Reviewed-by: Frank Binns <frank.binns@imgtec.com>
Reviewed-by: Karmjit Mahil <Karmjit.Mahil@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18866>
---

diff --git a/src/imagination/vulkan/pds/pvr_pds.c b/src/imagination/vulkan/pds/pvr_pds.c
index 578c0d8..3711c87 100644
--- a/src/imagination/vulkan/pds/pvr_pds.c
+++ b/src/imagination/vulkan/pds/pvr_pds.c
@@ -2680,7 +2680,8 @@ uint32_t *pvr_pds_pixel_shader_uniform_texture_code(
    assert((((uintptr_t)buffer) & (PDS_ROGUE_TA_STATE_PDS_ADDR_ALIGNSIZE - 1)) ==
           0);
 
-   assert(gen_mode != PDS_GENERATE_DATA_SEGMENT);
+   assert((gen_mode == PDS_GENERATE_CODE_SEGMENT && buffer) ||
+          gen_mode == PDS_GENERATE_SIZES);
 
    /* clang-format off */
    /* Shape of code segment (note: clear is different)
@@ -2718,7 +2719,7 @@ uint32_t *pvr_pds_pixel_shader_uniform_texture_code(
       uint32_t control_word_constant1 =
          pvr_pds_get_constants(&next_constant, 2, &data_size);
 
-      if (gen_mode == PDS_GENERATE_CODE_SEGMENT && instruction) {
+      if (gen_mode == PDS_GENERATE_CODE_SEGMENT) {
          /* DOUTW the clear color to the USC constants. Predicate with
           * uniform loading flag (IF0).
           */
@@ -2750,7 +2751,7 @@ uint32_t *pvr_pds_pixel_shader_uniform_texture_code(
             pvr_pds_get_constants(&next_constant, 2, &data_size);
          color_constant4 = pvr_pds_get_constants(&next_constant, 2, &data_size);
 
-         if (gen_mode == PDS_GENERATE_CODE_SEGMENT && instruction) {
+         if (gen_mode == PDS_GENERATE_CODE_SEGMENT) {
             /* DOUTW the clear color to the USSE constants. Predicate with
              * uniform loading flag (IF0).
              */
@@ -2790,7 +2791,7 @@ uint32_t *pvr_pds_pixel_shader_uniform_texture_code(
          control_word_last_constant =
             pvr_pds_get_constants(&next_constant, 2, &data_size);
 
-         if (gen_mode == PDS_GENERATE_CODE_SEGMENT && instruction) {
+         if (gen_mode == PDS_GENERATE_CODE_SEGMENT) {
             /* DOUTW the clear color to the USSE constants. Predicate with
              * uniform loading flag (IF0).
              */
@@ -2820,7 +2821,7 @@ uint32_t *pvr_pds_pixel_shader_uniform_texture_code(
          doutu_constant64 =
             pvr_pds_get_constants(&next_constant, 2, &data_size);
 
-         if (gen_mode == PDS_GENERATE_CODE_SEGMENT && instruction) {
+         if (gen_mode == PDS_GENERATE_CODE_SEGMENT) {
             /* Issue the task to the USC.
              *
              * dout ds1[constant_use], ds0[constant_use],
@@ -2836,7 +2837,7 @@ uint32_t *pvr_pds_pixel_shader_uniform_texture_code(
          code_size += 1;
       }
 
-      if (gen_mode == PDS_GENERATE_CODE_SEGMENT && instruction) {
+      if (gen_mode == PDS_GENERATE_CODE_SEGMENT) {
          /* End the program. */
          *instruction++ = pvr_pds_inst_encode_halt(0);
       }
@@ -2855,7 +2856,7 @@ uint32_t *pvr_pds_pixel_shader_uniform_texture_code(
           * it. We therefore don't need to branch when there is only a
           * texture OR a uniform update program.
           */
-         if (gen_mode == PDS_GENERATE_CODE_SEGMENT && instruction) {
+         if (gen_mode == PDS_GENERATE_CODE_SEGMENT) {
             uint32_t branch_address =
                MAX2(1 + program->num_texture_dma_kicks, 2);
 
@@ -2882,7 +2883,7 @@ uint32_t *pvr_pds_pixel_shader_uniform_texture_code(
 
          for (uint32_t dma = 0; dma < program->num_texture_dma_kicks; dma++) {
             code_size += 1;
-            if (gen_mode != PDS_GENERATE_CODE_SEGMENT || !instruction)
+            if (gen_mode != PDS_GENERATE_CODE_SEGMENT)
                continue;
 
             /* DMA the state into the secondary attributes. */
@@ -2898,7 +2899,7 @@ uint32_t *pvr_pds_pixel_shader_uniform_texture_code(
             dma_control_constant32 += 1;
          }
       } else if (both_textures_and_uniforms) {
-         if (gen_mode == PDS_GENERATE_CODE_SEGMENT && instruction) {
+         if (gen_mode == PDS_GENERATE_CODE_SEGMENT) {
             /* End the program. */
             *instruction++ = pvr_pds_inst_encode_halt(0);
          }
@@ -2967,7 +2968,7 @@ uint32_t *pvr_pds_pixel_shader_uniform_texture_code(
          for (uint32_t dma = 0; dma < program->num_uniform_dma_kicks; dma++) {
             code_size += 1;
 
-            if (gen_mode != PDS_GENERATE_CODE_SEGMENT || !instruction)
+            if (gen_mode != PDS_GENERATE_CODE_SEGMENT)
                continue;
 
             bool last_instruction = false;
@@ -2991,7 +2992,7 @@ uint32_t *pvr_pds_pixel_shader_uniform_texture_code(
       }
 
       if (program->kick_usc) {
-         if (gen_mode == PDS_GENERATE_CODE_SEGMENT && instruction) {
+         if (gen_mode == PDS_GENERATE_CODE_SEGMENT) {
             /* Issue the task to the USC.
              *
              * dout ds1[constant_use], ds0[constant_use],
@@ -3006,7 +3007,7 @@ uint32_t *pvr_pds_pixel_shader_uniform_texture_code(
 
          code_size += 1;
       } else if (program->num_uniform_dma_kicks == 0 && total_num_doutw == 0) {
-         if (gen_mode == PDS_GENERATE_CODE_SEGMENT && instruction) {
+         if (gen_mode == PDS_GENERATE_CODE_SEGMENT) {
             /* End the program. */
             *instruction++ = pvr_pds_inst_encode_halt(0);
          }