Mesa (12.0): radeonsi: emit TA_CS_BC_BASE_ADDR on SI only if the kernel allows it
Emil Velikov
evelikov at kemper.freedesktop.org
Fri Dec 2 19:58:34 UTC 2016
Module: Mesa
Branch: 12.0
Commit: 0afbb9d0525719bef1044e7f7e59e56178e63160
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0afbb9d0525719bef1044e7f7e59e56178e63160
Author: Marek Olšák <marek.olsak at amd.com>
Date: Mon Oct 10 13:23:55 2016 +0200
radeonsi: emit TA_CS_BC_BASE_ADDR on SI only if the kernel allows it
Reviewed-by: Edmondo Tommasina <edmondo.tommasina at gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
Reviewed-by: Edward O'Callaghan <funfunctor at folklore1984.net>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
(cherry picked from commit b425b57d1e215810ac1ddabba62e89c8bd39a453)
---
src/gallium/drivers/radeonsi/si_compute.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c
index c279c77..87940db 100644
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -202,7 +202,12 @@ static void si_initialize_compute(struct si_context *sctx)
radeon_emit(cs, bc_va >> 8); /* R_030E00_TA_CS_BC_BASE_ADDR */
radeon_emit(cs, bc_va >> 40); /* R_030E04_TA_CS_BC_BASE_ADDR_HI */
} else {
- radeon_set_config_reg(cs, R_00950C_TA_CS_BC_BASE_ADDR, bc_va >> 8);
+ if (sctx->screen->b.info.drm_major == 3 ||
+ (sctx->screen->b.info.drm_major == 2 &&
+ sctx->screen->b.info.drm_minor >= 48)) {
+ radeon_set_config_reg(cs, R_00950C_TA_CS_BC_BASE_ADDR,
+ bc_va >> 8);
+ }
}
sctx->cs_shader_state.emitted_program = NULL;
More information about the mesa-commit
mailing list