From 9f19d52a2390ce370694d39510d520ef66cda844 Mon Sep 17 00:00:00 2001
From: Jose Maria Casanova Crespo <jmcasanova@igalia.com>
Date: Fri, 16 Jul 2021 14:30:51 +0200
Subject: [PATCH] v3d/driconf: Expose non-MSAA texture limits for mutter and
 gnome-shell

To enable dual 4k displays on mutter or gnome-shell under X11 we need to
expose the non-MSAA texture limit as we did for Xorg at 60a64f028d75ad6
("v3d: Use driconf to expose non-MSAA texture limits for Xorg.")

https://gitlab.gnome.org/GNOME/mutter/-/issues/1874

Cc: 21.1 21.2 mesa-stable
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11926>
(cherry picked from commit fd5fa73e6c8deeb8e09062e412d7d05fe57d0c59)
---
 .pick_status.json              | 2 +-
 src/util/00-mesa-defaults.conf | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index f89f9f69567..390bdeb2777 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1111,7 +1111,7 @@
         "description": "v3d/driconf: Expose non-MSAA texture limits for mutter and gnome-shell",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index a6967fc68db..a9cca067c4e 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -516,6 +516,7 @@ TODO: document the other workarounds.
         <!-- Adaptive sync denylist follows below: -->
         <application name="gnome-shell" executable="gnome-shell">
             <option name="adaptive_sync" value="false" />
+            <option name="v3d_nonmsaa_texture_size_limit" value="true" />
         </application>
         <application name="Desktop — Plasma" executable="plasmashell">
             <option name="adaptive_sync" value="false" />
@@ -564,6 +565,7 @@ TODO: document the other workarounds.
         </application>
         <application name="mutter" executable="mutter">
             <option name="adaptive_sync" value="false" />
+            <option name="v3d_nonmsaa_texture_size_limit" value="true" />
         </application>
         <application name="muffin" executable="muffin">
             <option name="adaptive_sync" value="false" />