From 66d4bafd5b3f9e86c258e5652d3bb26ea1c7d990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Tue, 3 May 2022 15:04:44 -0400
Subject: [PATCH] radeonsi/gfx11: resolve MSAA using u_blitter

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16328>
---
 src/gallium/drivers/radeonsi/si_blit.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c
index 2c7d1db6f60..25a897985ff 100644
--- a/src/gallium/drivers/radeonsi/si_blit.c
+++ b/src/gallium/drivers/radeonsi/si_blit.c
@@ -1204,9 +1204,10 @@ static void si_blit(struct pipe_context *ctx, const struct pipe_blit_info *info)
    struct si_context *sctx = (struct si_context *)ctx;
    struct si_texture *sdst = (struct si_texture *)info->dst.resource;
 
-   if (do_hardware_msaa_resolve(ctx, info)) {
+   /* Gfx11 doesn't have CB_RESOLVE. */
+   /* TODO: Use compute-based resolving instead. */
+   if (sctx->chip_class < GFX11 && do_hardware_msaa_resolve(ctx, info))
       return;
-   }
 
    if ((info->dst.resource->bind & PIPE_BIND_PRIME_BLIT_DST) && sdst->surface.is_linear &&
        sctx->chip_class >= GFX7) {