diff options
| author | Marek Olšák <[email protected]> | 2016-03-15 21:49:54 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2016-03-17 18:30:45 +0100 |
| commit | 4ab2ac334921ae9bbd1791adaf8977fccf744580 (patch) | |
| tree | 96fcfe7674034adc83fb94123fd7bb77e620e007 | |
| parent | 151724159d00dac4fa0ebddc76389e3e6412fb5b (diff) | |
radeonsi: fix Hyper-Z hangs on P2 configs
Cc: 11.1 11.2 <[email protected]>
Reviewed-by: Nicolai Hähnle <[email protected]>
| -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 1ad70765781..c573b438b01 100644 --- a/src/gallium/drivers/radeon/r600_texture.c +++ b/src/gallium/drivers/radeon/r600_texture.c @@ -638,8 +638,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) { |