summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2014-07-26 12:57:28 +0200
committerCarl Worth <cworth@cworth.org>2014-07-30 22:09:45 -0700
commitd26ac40bada800cce24ed7c988fbc31dff89681d (patch)
tree9242e0cd250c2e9ff62fe76b42bb18835a974509
parent50dcc2eb261b5a5f6e9446e6df12fde2395cbea4 (diff)
radeonsi: fix occlusion queries on Hawaii
This was just a guess - and it worked! Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 71ce92200e0314a0878088dec8c0c2a0270bc4dc)
-rw-r--r--src/gallium/drivers/radeon/r600_pipe_common.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
index 70c4d1adefb..fcb81647b8f 100644
--- a/src/gallium/drivers/radeon/r600_pipe_common.c
+++ b/src/gallium/drivers/radeon/r600_pipe_common.c
@@ -142,7 +142,13 @@ bool r600_common_context_init(struct r600_common_context *rctx,
rctx->ws = rscreen->ws;
rctx->family = rscreen->family;
rctx->chip_class = rscreen->chip_class;
- rctx->max_db = rscreen->chip_class >= EVERGREEN ? 8 : 4;
+
+ if (rscreen->family == CHIP_HAWAII)
+ rctx->max_db = 16;
+ else if (rscreen->chip_class >= EVERGREEN)
+ rctx->max_db = 8;
+ else
+ rctx->max_db = 4;
rctx->b.transfer_map = u_transfer_map_vtbl;
rctx->b.transfer_flush_region = u_default_transfer_flush_region;