From 98ab24fdab99ed54a1d1c89af74f8ec026b224af Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Thu, 19 Jul 2018 22:44:27 -0400 Subject: [PATCH] radeonsi: handle SI_FORCE_FAMILY early before LLVM target machines are created --- src/gallium/drivers/radeonsi/si_pipe.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 9823ddbaf83..9e3a579d743 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -791,6 +791,7 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws, sscreen->ws = ws; ws->query_info(ws, &sscreen->info); + si_handle_env_var_force_family(sscreen); sscreen->debug_flags = debug_get_flags_option("R600_DEBUG", debug_options, 0); @@ -880,8 +881,6 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws, return NULL; } - si_handle_env_var_force_family(sscreen); - if (!debug_get_bool_option("RADEON_DISABLE_PERFCOUNTERS", false)) si_init_perfcounters(sscreen); -- 2.11.0