radeonsi: decompress DCC for resident textures/images

Analogous to bound textures/images. We should also update the
resident descriptors and disable COMPRESSION_EN for avoiding
useless DCC fetches, but I postpone this optimization for a
separate series.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c
index 524b20a04b50cc04d872534eca1d8d1bcf6b4660..520797a723669c381f4744f25fed9166576474cb 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_blit.c
+++ b/src/gallium/drivers/radeonsi/si_blit.c
@@ -631,6 +631,64 @@ static void si_check_render_feedback_images(struct si_context *sctx,
        }
 }
 
+static void si_check_render_feedback_resident_textures(struct si_context *sctx)
+{
+       unsigned num_resident_tex_handles;
+       unsigned i;
+
+       num_resident_tex_handles = sctx->resident_tex_handles.size /
+                                  sizeof(struct si_texture_handle *);
+
+       for (i = 0; i < num_resident_tex_handles; i++) {
+               struct si_texture_handle *tex_handle =
+                       *util_dynarray_element(&sctx->resident_tex_handles,
+                                              struct si_texture_handle *, i);
+               struct pipe_sampler_view *view;
+               struct r600_texture *tex;
+
+               view = tex_handle->view;
+               if (view->texture->target == PIPE_BUFFER)
+                       continue;
+
+               tex = (struct r600_texture *)view->texture;
+
+               si_check_render_feedback_texture(sctx, tex,
+                                                view->u.tex.first_level,
+                                                view->u.tex.last_level,
+                                                view->u.tex.first_layer,
+                                                view->u.tex.last_layer);
+       }
+}
+
+static void si_check_render_feedback_resident_images(struct si_context *sctx)
+{
+       unsigned num_resident_img_handles;
+       unsigned i;
+
+       num_resident_img_handles = sctx->resident_img_handles.size /
+                                  sizeof(struct si_image_handle *);
+
+       for (i = 0; i < num_resident_img_handles; i++) {
+               struct si_image_handle *img_handle =
+                       *util_dynarray_element(&sctx->resident_img_handles,
+                                              struct si_image_handle *, i);
+               struct pipe_image_view *view;
+               struct r600_texture *tex;
+
+               view = &img_handle->view;
+               if (view->resource->target == PIPE_BUFFER)
+                       continue;
+
+               tex = (struct r600_texture *)view->resource;
+
+               si_check_render_feedback_texture(sctx, tex,
+                                                view->u.tex.level,
+                                                view->u.tex.level,
+                                                view->u.tex.first_layer,
+                                                view->u.tex.last_layer);
+       }
+}
+
 static void si_check_render_feedback(struct si_context *sctx)
 {
 
@@ -641,6 +699,10 @@ static void si_check_render_feedback(struct si_context *sctx)
                si_check_render_feedback_images(sctx, &sctx->images[i]);
                si_check_render_feedback_textures(sctx, &sctx->samplers[i]);
        }
+
+       si_check_render_feedback_resident_images(sctx);
+       si_check_render_feedback_resident_textures(sctx);
+
        sctx->need_check_render_feedback = false;
 }
 

diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c
index 12b82a139dd2ae9e2802e81a181a09cf413c4e4d..b3fb16f320b5138f2f5ddc6404e1fdad87a8cd27 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_descriptors.c
+++ b/src/gallium/drivers/radeonsi/si_descriptors.c
@@ -2237,6 +2237,15 @@ static void si_make_texture_handle_resident(struct pipe_context *ctx,
        sview = (struct si_sampler_view *)tex_handle->view;
 
        if (resident) {
+               if (sview->base.texture->target != PIPE_BUFFER) {
+                       struct r600_texture *rtex =
+                               (struct r600_texture *)sview->base.texture;
+
+                       if (rtex->dcc_offset &&
+                           p_atomic_read(&rtex->framebuffers_bound))
+                               sctx->need_check_render_feedback = true;
+               }
+
                /* Add the texture handle to the per-context list. */
                util_dynarray_append(&sctx->resident_tex_handles,
                                     struct si_texture_handle *, tex_handle);
@@ -2339,6 +2348,18 @@ static void si_make_image_handle_resident(struct pipe_context *ctx,
        view = &img_handle->view;
 
        if (resident) {
+               struct r600_resource *res =
+                       (struct r600_resource *)view->resource;
+
+               if (res->b.b.target != PIPE_BUFFER) {
+                       struct r600_texture *rtex = (struct r600_texture *)res;
+                       unsigned level = view->u.tex.level;
+
+                       if (vi_dcc_enabled(rtex, level) &&
+                           p_atomic_read(&rtex->framebuffers_bound))
+                               sctx->need_check_render_feedback = true;
+               }
+
                /* Add the image handle to the per-context list. */
                util_dynarray_append(&sctx->resident_img_handles,
                                     struct si_image_handle *, img_handle);