diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2016-03-15 21:49:54 +0100 |
|---|---|---|
| committer | Dylan Baker <baker.dylan.c@gmail.com> | 2016-03-28 16:13:41 -0700 |
| commit | 50e8994a0d7031f920ff4e4cf42383846d4735b1 (patch) | |
| tree | 2c7a5b1aa96343ea6c92d2b969c06406df192f19 | |
| parent | d8e8b5a9c210e67c8742d66d6b752f054cb15bd7 (diff) | |
radeonsi: fix Hyper-Z hangs on P2 configs
Cc: 11.1 11.2 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
(cherry picked from commit 4ab2ac334921ae9bbd1791adaf8977fccf744580)
| -rw-r--r-- | src/gallium/drivers/radeon/r600_texture.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c index 0b31d0a1f0..de41777e54 100644 --- a/src/gallium/drivers/radeon/r600_texture.c +++ b/src/gallium/drivers/radeon/r600_texture.c @@ -533,8 +533,14 @@ static unsigned r600_texture_get_htile_size(struct r600_common_screen *rscreen, rscreen->info.drm_major == 2 && rscreen->info.drm_minor < 38) return 0; - /* Overalign HTILE on Stoney to fix piglit/depthstencil-render-miplevels 585. */ - if (rscreen->family == CHIP_STONEY) + /* Overalign HTILE on P2 configs to work around GPU hangs in + * piglit/depthstencil-render-miplevels 585. + * + * This has been confirmed to help Kabini & Stoney, where the hangs + * are always reproducible. I think I have seen the test hang + * on Carrizo too, though it was very rare there. + */ + if (rscreen->chip_class >= CIK && num_pipes < 4) num_pipes = 4; switch (num_pipes) { |