diff options
| author | Marek Olšák <[email protected]> | 2016-12-02 15:39:25 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2016-12-07 18:46:54 +0100 |
| commit | 6dc96de303290e8d1fc294da478c4f370be98dea (patch) | |
| tree | 4c1c5d7e8d11a7d94ae6fb0314dca0d6db9b78ab | |
| parent | e9133dd90ec498cfb6a23fa22504e06488352c51 (diff) | |
cso: don't release sampler states that are bound
This fixes random radeonsi GPU hangs in Batman Arkham: Origins (Wine) and
probably many other games too.
cso_cache deletes sampler states when the cache size is too big and doesn't
check which sampler states are bound, causing use-after-free in drivers.
Because of that, radeonsi uploaded garbage sampler states and the hardware
went bananas. Other drivers may have experienced similar issues.
Cc: 12.0 13.0 <[email protected]>
Reviewed-by: Nicolai Hähnle <[email protected]>
Reviewed-by: Edward O'Callaghan <[email protected]>
| -rw-r--r-- | src/gallium/auxiliary/cso_cache/cso_cache.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/cso_cache/cso_cache.c b/src/gallium/auxiliary/cso_cache/cso_cache.c index b240c938dcc..1f3be4b28c7 100644 --- a/src/gallium/auxiliary/cso_cache/cso_cache.c +++ b/src/gallium/auxiliary/cso_cache/cso_cache.c @@ -188,7 +188,9 @@ cso_insert_state(struct cso_cache *sc, void *state) { struct cso_hash *hash = _cso_hash_for_type(sc, type); - sanitize_hash(sc, hash, type, sc->max_size); + + if (type != CSO_SAMPLER) + sanitize_hash(sc, hash, type, sc->max_size); return cso_hash_insert(hash, hash_key, state); } |