From e7908a95f9643c377df0d0f9021e509b3e4a2fe8 Mon Sep 17 00:00:00 2001 From: Nanley Chery Date: Wed, 24 Jun 2020 07:45:49 -0700 Subject: [PATCH] iris: Fold a condition into no_gpu for consistency Reviewed-by: Paulo Zanoni Reviewed-by: Kenneth Graunke Part-of: --- src/gallium/drivers/iris/iris_resource.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c index f1040073ed6..734441b8fae 100644 --- a/src/gallium/drivers/iris/iris_resource.c +++ b/src/gallium/drivers/iris/iris_resource.c @@ -1868,9 +1868,13 @@ iris_transfer_map(struct pipe_context *ctx, if (fmtl->txc == ISL_TXC_ASTC) no_gpu = true; - if ((map_would_stall || - res->aux.usage == ISL_AUX_USAGE_CCS_E || - res->aux.usage == ISL_AUX_USAGE_GEN12_CCS_E) && !no_gpu) { + if (!map_would_stall && + res->aux.usage != ISL_AUX_USAGE_CCS_E && + res->aux.usage != ISL_AUX_USAGE_GEN12_CCS_E) { + no_gpu = true; + } + + if (!no_gpu) { /* If we need a synchronous mapping and the resource is busy, or needs * resolving, we copy to/from a linear temporary buffer using the GPU. */ -- 2.30.2