freedreno: Stop forcing ALLOW_MAPPED_BUFFERS_DURING_EXEC off.

[mesa.git] / src / gallium / drivers / freedreno / freedreno_screen.c

diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c
index 6f75f6ed22bdaac3d3575fddb05e2e2f694544b3..eff95c2672532760f6a0bd737e0f6bfa69d4d888 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_screen.c
+++ b/src/gallium/drivers/freedreno/freedreno_screen.c
@@ -31,8 +31,8 @@
 
 #include "util/u_memory.h"
 #include "util/u_inlines.h"
-#include "util/u_format.h"
-#include "util/u_format_s3tc.h"
+#include "util/format/u_format.h"
+#include "util/format/u_format_s3tc.h"
 #include "util/u_screen.h"
 #include "util/u_string.h"
 #include "util/u_debug.h"
@@ -318,9 +318,6 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
                if (is_a6xx(screen)) return 1;
                return 0;
 
-       case PIPE_CAP_ALLOW_MAPPED_BUFFERS_DURING_EXECUTION:
-               return 0;
-
        case PIPE_CAP_CONTEXT_PRIORITY_MASK:
                return screen->priority_mask;
 
@@ -353,6 +350,9 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
                 */
                return 128;
 
+       case PIPE_CAP_MAX_TEXTURE_UPLOAD_MEMORY_BUDGET:
+               return 64 * 1024 * 1024;
+
        case PIPE_CAP_SHAREABLE_SHADERS:
        case PIPE_CAP_GLSL_OPTIMIZE_CONSERVATIVELY:
        /* manage the variants for these ourself, to avoid breaking precompile: */
@@ -919,6 +919,7 @@ fd_screen_create(struct fd_device *dev, struct renderonly *ro)
                break;
        case 618:
        case 630:
+       case 640:
                fd6_screen_init(pscreen);
                break;
        default:
@@ -940,6 +941,11 @@ fd_screen_create(struct fd_device *dev, struct renderonly *ro)
                screen->num_vsc_pipes = 8;
        }
 
+       if (fd_mesa_debug & FD_DBG_PERFC) {
+               screen->perfcntr_groups = fd_perfcntrs(screen->gpu_id,
+                               &screen->num_perfcntr_groups);
+       }
+
        /* NOTE: don't enable if we have too old of a kernel to support
         * growable cmdstream buffers, since memory requirement for cmdstream
         * buffers would be too much otherwise.