summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2016-12-07 23:01:56 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2016-12-14 19:03:12 +0000
commit11b8d52dcea596ec4c604560e6c364759e7052c4 (patch)
treeff1c6a1558b1d261b9fe3457b9ee869bb50116df
parent18bb2d5c66133df790082aaba8359cc1beeee82f (diff)
downloadexternal_mesa3d-11b8d52dcea596ec4c604560e6c364759e7052c4.zip
external_mesa3d-11b8d52dcea596ec4c604560e6c364759e7052c4.tar.gz
external_mesa3d-11b8d52dcea596ec4c604560e6c364759e7052c4.tar.bz2
radeonsi: disable the constant engine (CE) on Carrizo and Stoney
It must be disabled until the kernel bug is fixed, and then we'll enable CE based on the DRM version. Cc: 12.0 13.0 <mesa-stable@lists.freedesktop.org> Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com> (cherry picked from commit 31f988a9d6d05f4aaea4d0455e509a5f6b667d9c)
-rw-r--r--src/gallium/drivers/radeonsi/si_pipe.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index a9faa75..26bd4e5 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -187,7 +187,10 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
/* SI + AMDGPU + CE = GPU hang */
if (!(sscreen->b.debug_flags & DBG_NO_CE) && ws->cs_add_const_ib &&
- sscreen->b.chip_class != SI) {
+ sscreen->b.chip_class != SI &&
+ /* These can't use CE due to a power gating bug in the kernel. */
+ sscreen->b.family != CHIP_CARRIZO &&
+ sscreen->b.family != CHIP_STONEY) {
sctx->ce_ib = ws->cs_add_const_ib(sctx->b.gfx.cs);
if (!sctx->ce_ib)
goto fail;