summaryrefslogtreecommitdiff
path: root/src/gallium/winsys
diff options
context:
space:
mode:
authorRob Clark <robdclark@chromium.org>2021-02-25 10:04:50 -0800
committerMarge Bot <eric+marge@anholt.net>2021-02-26 18:31:19 +0000
commita9618e7c4214e29c97009870ad8904623746ffe9 (patch)
tree38fd42ed90c3a31d0c6816ee58a11f40d76cca85 /src/gallium/winsys
parent9fb9019bebe955ce0510799f02b0dddd6fe9efbe (diff)
util: Add accessor for util_cpu_caps
In release builds, there should be no change, but in debug builds the assert will help us catch undefined behavior resulting from using util_cpu_caps before it is initialized. With fix for u_half_test for MSVC from Jesse Natalie squashed in. Signed-off-by: Rob Clark <robdclark@chromium.org> Reviewed-by: Marek Olšák <marek.olsak@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9266>
Diffstat (limited to 'src/gallium/winsys')
-rw-r--r--src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c4
-rw-r--r--src/gallium/winsys/radeon/drm/radeon_drm_winsys.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
index 15cbafe69ff..88bff45f7b6 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
@@ -331,8 +331,8 @@ static void amdgpu_pin_threads_to_L3_cache(struct radeon_winsys *rws,
struct amdgpu_winsys *ws = amdgpu_winsys(rws);
util_set_thread_affinity(ws->cs_queue.threads[0],
- util_cpu_caps.L3_affinity_mask[cache],
- NULL, util_cpu_caps.num_cpu_mask_bits);
+ util_get_cpu_caps()->L3_affinity_mask[cache],
+ NULL, util_get_cpu_caps()->num_cpu_mask_bits);
}
static uint32_t kms_handle_hash(const void *key)
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
index a720345c8a2..90b92a3b444 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
@@ -809,8 +809,8 @@ static void radeon_pin_threads_to_L3_cache(struct radeon_winsys *ws,
if (util_queue_is_initialized(&rws->cs_queue)) {
util_set_thread_affinity(rws->cs_queue.threads[0],
- util_cpu_caps.L3_affinity_mask[cache],
- NULL, util_cpu_caps.num_cpu_mask_bits);
+ util_get_cpu_caps()->L3_affinity_mask[cache],
+ NULL, util_get_cpu_caps()->num_cpu_mask_bits);
}
}