anv: Fix transfer type assert
authorVinson Lee <vlee@freedesktop.org>
Sun, 8 Oct 2023 17:09:59 +0000 (10:09 -0700)
committerVinson Lee <vlee@freedesktop.org>
Mon, 9 Oct 2023 05:39:41 +0000 (22:39 -0700)
Fix defect reported by Coverity Scan.

Constant expression result (CONSTANT_EXPRESSION_RESULT)
always_true_or: The or condition
type != ANV_TIMESTAMP_CAPTURE_AT_CS_STALL || type != ANV_TIMESTAMP_REWRITE_COMPUTE_WALKER
will always be true because type cannot be equal to two different values
at the same time, so it must be not equal to at least one of them.

Fixes: 5112b421462 ("anv: Handle end of pipe with MI_FLUSH_DW on transfer queue")
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Sagar Ghuge <sagar.ghuge@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25605>

src/intel/vulkan/genX_cmd_buffer.c

index 9473d760313c3c628685b7fe29c91e12dcd6b985..1ff61335b2aba0c08567f13c84ddae7bf0bd2ef6 100644 (file)
@@ -8158,7 +8158,7 @@ void genX(cmd_emit_timestamp)(struct anv_batch *batch,
     * transfer queue.
     */
    if (batch->engine_class == INTEL_ENGINE_CLASS_COPY) {
-      assert(type != ANV_TIMESTAMP_CAPTURE_AT_CS_STALL ||
+      assert(type != ANV_TIMESTAMP_CAPTURE_AT_CS_STALL &&
              type != ANV_TIMESTAMP_REWRITE_COMPUTE_WALKER);
    }