freedreno: Disallow tiled if SHARED and not QCOM_COMPRESSED

If the user is not aware of modifiers, and wants to allocate a shared
resource, we shouldn't leave them with tiled.

Cc: mesa-stable
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3678
Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7308>

diff --git a/src/gallium/drivers/freedreno/freedreno_resource.c b/src/gallium/drivers/freedreno/freedreno_resource.c
index 142dade..2851f66 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_resource.c
+++ b/src/gallium/drivers/freedreno/freedreno_resource.c
@@ -936,8 +936,12 @@ fd_resource_allocate_and_resolve(struct pipe_screen *pscreen,
         * should.)
         */
        bool allow_ubwc = drm_find_modifier(DRM_FORMAT_MOD_INVALID, modifiers, count);
-       if (tmpl->bind & PIPE_BIND_SHARED)
+       if (tmpl->bind & PIPE_BIND_SHARED) {
                allow_ubwc = drm_find_modifier(DRM_FORMAT_MOD_QCOM_COMPRESSED, modifiers, count);
+               if (!allow_ubwc) {
+                       linear = true;
+               }
+       }
 
        allow_ubwc &= !(fd_mesa_debug & FD_DBG_NOUBWC);