Mesa (staging/20.1): radeonsi: revert an accidental change in si_clear_buffer

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: 725f45bc63a7f95672b3bd83e435c6a95c1edd28
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=725f45bc63a7f95672b3bd83e435c6a95c1edd28

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Tue Apr 28 12:51:22 2020 -0400

radeonsi: revert an accidental change in si_clear_buffer

The change was in: 7b0b085c94347cb9c94d88e11a64a6c341d95477

Fixes: 7b0b085c943 ("radeonsi: drop the negation from fmask_is_not_identity")

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4761>
(cherry picked from commit bdd2f284d90b7f07ac5e878490be8d216d0d23c6)

---

 .pick_status.json                              | 2 +-
 src/gallium/drivers/radeonsi/si_compute_blit.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 513e56ab8b9..de218564fd0 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -868,7 +868,7 @@
         "description": "radeonsi: revert an accidental change in si_clear_buffer",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "7b0b085c94347cb9c94d88e11a64a6c341d95477"
     },
diff --git a/src/gallium/drivers/radeonsi/si_compute_blit.c b/src/gallium/drivers/radeonsi/si_compute_blit.c
index 0a81c6867e6..50ba4380115 100644
--- a/src/gallium/drivers/radeonsi/si_compute_blit.c
+++ b/src/gallium/drivers/radeonsi/si_compute_blit.c
@@ -299,7 +299,7 @@ void si_clear_buffer(struct si_context *sctx, struct pipe_resource *dst, uint64_
        * about buffer placements.
        */
       if (clear_value_size > 4 || (!force_cpdma && clear_value_size == 4 && offset % 4 == 0 &&
-                                   (size > 32 * 1024 || sctx->chip_class <= GFX9))) {
+                                   (size > 32 * 1024 || sctx->chip_class <= GFX8))) {
          si_compute_do_clear_or_copy(sctx, dst, offset, NULL, 0, aligned_size, clear_value,
                                      clear_value_size, coher);
       } else {