diff options
| author | Marek Olšák <[email protected]> | 2017-10-08 00:03:10 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-10-09 16:27:05 +0200 |
| commit | 76997e9133eea8e5c4fcdc935cd279fcf5156ca5 (patch) | |
| tree | 6ee33572c7a5155606d2151f700433bec0ab943f /src/gallium/drivers/r600/r600_streamout.c | |
| parent | 0ecf9b90efa7b6df5a16560797fb9e1355a6965d (diff) | |
radeonsi: shrink r600d_common.h and stop using it
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/r600_streamout.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_streamout.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/gallium/drivers/r600/r600_streamout.c b/src/gallium/drivers/r600/r600_streamout.c index a18089a3b39..6d45a07d5c9 100644 --- a/src/gallium/drivers/r600/r600_streamout.c +++ b/src/gallium/drivers/r600/r600_streamout.c @@ -28,6 +28,11 @@ #include "r600_cs.h" #include "util/u_memory.h" +#include "evergreend.h" + +#define R_008490_CP_STRMOUT_CNTL 0x008490 +#define R_028AB0_VGT_STRMOUT_EN 0x028AB0 +#define R_028B20_VGT_STRMOUT_BUFFER_EN 0x028B20 static void r600_set_streamout_enable(struct r600_common_context *rctx, bool enable); @@ -157,9 +162,7 @@ static void r600_flush_vgt_streamout(struct r600_common_context *rctx) unsigned reg_strmout_cntl; /* The register is at different places on different ASICs. */ - if (rctx->chip_class >= CIK) { - reg_strmout_cntl = R_0300FC_CP_STRMOUT_CNTL; - } else if (rctx->chip_class >= EVERGREEN) { + if (rctx->chip_class >= EVERGREEN) { reg_strmout_cntl = R_0084FC_CP_STRMOUT_CNTL; } else { reg_strmout_cntl = R_008490_CP_STRMOUT_CNTL; @@ -178,8 +181,8 @@ static void r600_flush_vgt_streamout(struct r600_common_context *rctx) radeon_emit(cs, WAIT_REG_MEM_EQUAL); /* wait until the register is equal to the reference value */ radeon_emit(cs, reg_strmout_cntl >> 2); /* register */ radeon_emit(cs, 0); - radeon_emit(cs, S_008490_OFFSET_UPDATE_DONE(1)); /* reference value */ - radeon_emit(cs, S_008490_OFFSET_UPDATE_DONE(1)); /* mask */ + radeon_emit(cs, S_0084FC_OFFSET_UPDATE_DONE(1)); /* reference value */ + radeon_emit(cs, S_0084FC_OFFSET_UPDATE_DONE(1)); /* mask */ radeon_emit(cs, 4); /* poll interval */ } @@ -326,7 +329,6 @@ static void r600_emit_streamout_enable(struct r600_common_context *rctx, strmout_config_reg = R_028B94_VGT_STRMOUT_CONFIG; strmout_config_val |= - S_028B94_RAST_STREAM(0) | S_028B94_STREAMOUT_1_EN(r600_get_strmout_en(rctx)) | S_028B94_STREAMOUT_2_EN(r600_get_strmout_en(rctx)) | S_028B94_STREAMOUT_3_EN(r600_get_strmout_en(rctx)); |