diff options
| author | Leonid Shatz <[email protected]> | 2014-12-31 19:07:44 +0100 |
|---|---|---|
| committer | Roland Scheidegger <[email protected]> | 2015-01-05 17:58:39 +0100 |
| commit | 5fea39ace311723dab53460ae7b51b80746e0d3f (patch) | |
| tree | ca761eeead796c68b9a27a8bbf24af31264aab7f | |
| parent | b59c7ed0ab1ac5b6d9f8d409f1a90401ab7775b6 (diff) | |
gallium/util: make sure cache line size is not zero
The "normal" detection (querying clflush size) already made sure it is
non-zero, however another method did not. This lead to crashes if this
value happened to be zero (apparently can happen in virtualized environments
at least).
This fixes https://bugs.freedesktop.org/show_bug.cgi?id=87913
Cc: "10.4" <[email protected]>
| -rw-r--r-- | src/gallium/auxiliary/util/u_cpu_detect.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/util/u_cpu_detect.c b/src/gallium/auxiliary/util/u_cpu_detect.c index 28197f4a9d8..23ab46c54bc 100644 --- a/src/gallium/auxiliary/util/u_cpu_detect.c +++ b/src/gallium/auxiliary/util/u_cpu_detect.c @@ -409,8 +409,12 @@ util_cpu_detect(void) } if (regs[0] >= 0x80000006) { + /* should we really do this if the clflush size above worked? */ + unsigned int cacheline; cpuid(0x80000006, regs2); - util_cpu_caps.cacheline = regs2[2] & 0xFF; + cacheline = regs2[2] & 0xFF; + if (cacheline > 0) + util_cpu_caps.cacheline = cacheline; } if (!util_cpu_caps.has_sse) { |