Mesa (staging/20.0): radeonsi: don't report that multi-plane formats are supported

[GitLab Mirror]

Module: Mesa
Branch: staging/20.0
Commit: 027f9c887c3ce4e0aa77051dc1c488b375696d2a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=027f9c887c3ce4e0aa77051dc1c488b375696d2a

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Wed Jan 29 17:25:45 2020 -0500

radeonsi: don't report that multi-plane formats are supported

Fixes: a554b45d - st/mesa: don't lower YUV when driver supports it natively
Closes: #2376

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3632>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3632>
(cherry picked from commit 35961b10da2dee4d3820ab1f250007412b06d876)

---

 .pick_status.json                       | 2 +-
 src/gallium/drivers/radeonsi/si_state.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 32ecfbcad45..86cc18e9e44 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -67,7 +67,7 @@
         "description": "radeonsi: don't report that multi-plane formats are supported",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "a554b45d736073bbea4978118c02f7929f75cd77"
     },
diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 86c2daff0de..afa1029c1ac 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -2242,13 +2242,6 @@ static bool si_is_format_supported(struct pipe_screen *screen,
 		return false;
 	}
 
-	if (util_format_get_num_planes(format) >= 2) {
-		return util_format_planar_is_supported(screen, format, target,
-						       sample_count,
-						       storage_sample_count,
-						       usage);
-	}
-
 	if (MAX2(1, sample_count) < MAX2(1, storage_sample_count))
 		return false;