From: Marek Olšák <marek.olsak@amd.com>
Date: Fri, 20 Jul 2018 02:44:27 +0000 (-0400)
Subject: radeonsi: handle SI_FORCE_FAMILY early
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=98ab24fdab99ed54a1d1c89af74f8ec026b224af;p=mesa.git

radeonsi: handle SI_FORCE_FAMILY early

before LLVM target machines are created
---

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);