Mesa (main): iris: call brw_process_intel_debug_variable() earlier

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: a9c1cc63c6c1bf47386ff19f1bec5466fde781b4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a9c1cc63c6c1bf47386ff19f1bec5466fde781b4

Author: Paulo Zanoni <paulo.r.zanoni at intel.com>
Date:   Fri Nov 12 15:16:38 2021 -0800

iris: call brw_process_intel_debug_variable() earlier

We're currently only calling it after creating the screen and the
bufmgr. There are a few cases where Iris checks for the DEBUG_BUFMGR
bit before we call brw_process_intel_debug_variable(), which means
intel_debug is 0 and so we don't run the debug code. Today, these are
all related to the creation of the workaround bo and its mmap.

I found this in a custom branch after I converted to INTEL_DEBUG an
environment variable that I had.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13780>

---

 src/gallium/drivers/iris/iris_screen.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/iris/iris_screen.c b/src/gallium/drivers/iris/iris_screen.c
index 5e7e5dd9f19..167875c180d 100644
--- a/src/gallium/drivers/iris/iris_screen.c
+++ b/src/gallium/drivers/iris/iris_screen.c
@@ -802,6 +802,8 @@ iris_screen_create(int fd, const struct pipe_screen_config *config)
       break;
    }
 
+   brw_process_intel_debug_variable();
+
    screen->bufmgr = iris_bufmgr_get_for_fd(&screen->devinfo, fd, bo_reuse);
    if (!screen->bufmgr)
       return NULL;
@@ -820,8 +822,6 @@ iris_screen_create(int fd, const struct pipe_screen_config *config)
    if (!iris_init_identifier_bo(screen))
       return NULL;
 
-   brw_process_intel_debug_variable();
-
    screen->driconf.dual_color_blend_by_location =
       driQueryOptionb(config->options, "dual_color_blend_by_location");
    screen->driconf.disable_throttling =