From 864f4e2b15ebd80856b5d10db79ca28f6451d686 Mon Sep 17 00:00:00 2001
From: Boris Brezillon <boris.brezillon@collabora.com>
Date: Tue, 17 Nov 2020 11:20:35 +0100
Subject: [PATCH] panfrost: Set sample_count when packing bifrost texture
 descriptors

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7653>
---
 src/panfrost/lib/pan_texture.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/panfrost/lib/pan_texture.c b/src/panfrost/lib/pan_texture.c
index c668b282a60..23f4679bfe2 100644
--- a/src/panfrost/lib/pan_texture.c
+++ b/src/panfrost/lib/pan_texture.c
@@ -476,6 +476,8 @@ panfrost_new_texture_bifrost(
                 cfg.height = u_minify(height, first_level);
                 if (dim == MALI_TEXTURE_DIMENSION_3D)
                         cfg.depth = u_minify(depth, first_level);
+                else
+                        cfg.sample_count = MAX2(nr_samples, 1);
                 cfg.swizzle = swizzle;
                 cfg.texel_ordering = panfrost_modifier_to_layout(modifier);
                 cfg.levels = last_level - first_level;