From: Marek Olšák <marek.ol...@amd.com>
This will get more complicated with mipmapped DCC or when DCC is enabled
after allocation.
---
src/gallium/drivers/radeon/r600_pipe_common.h | 1 -
src/gallium/drivers/radeon/r600_texture.c | 2 --
src/gallium/drivers/radeon/r600d_common.h | 1 -
src/gallium/drivers/radeonsi/si_state.c | 22 ++++++++++++----------
4 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h
b/src/gallium/drivers/radeon/r600_pipe_common.h
index fd658b6..a917549 100644
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -288,7 +288,6 @@ struct r600_surface {
unsigned cb_color_dim; /* EG only */
unsigned cb_color_pitch; /* EG and later */
unsigned cb_color_slice; /* EG and later */
- unsigned cb_dcc_base; /* VI and later */
unsigned cb_color_attrib; /* EG and later */
unsigned cb_dcc_control; /* VI and later */
unsigned cb_color_fmask; /* CB_COLORn_FMASK (EG and later) or
CB_COLORn_FRAG (r600) */
diff --git a/src/gallium/drivers/radeon/r600_texture.c
b/src/gallium/drivers/radeon/r600_texture.c
index ca91c37..37f8e02 100644
--- a/src/gallium/drivers/radeon/r600_texture.c
+++ b/src/gallium/drivers/radeon/r600_texture.c
@@ -405,7 +405,6 @@ static bool r600_texture_discard_dcc(struct
r600_common_screen *rscreen,
/* Disable DCC. */
rtex->dcc_offset = 0;
- rtex->cb_color_info &= ~VI_S_028C70_DCC_ENABLE(1);
/* Notify all contexts about the change. */
r600_dirty_all_framebuffer_states(rscreen);
@@ -1056,7 +1055,6 @@ r600_texture_create_object(struct pipe_screen *screen,
/* Reserve space for the DCC buffer. */
rtex->dcc_offset = align64(rtex->size,
rtex->surface.dcc_alignment);
rtex->size = rtex->dcc_offset + rtex->surface.dcc_size;
- rtex->cb_color_info |= VI_S_028C70_DCC_ENABLE(1);
}
}
diff --git a/src/gallium/drivers/radeon/r600d_common.h
b/src/gallium/drivers/radeon/r600d_common.h
index fd9d79e..e50de96 100644
--- a/src/gallium/drivers/radeon/r600d_common.h
+++ b/src/gallium/drivers/radeon/r600d_common.h
@@ -216,7 +216,6 @@
#define EG_S_028C70_FAST_CLEAR(x) (((unsigned)(x) &
0x1) << 17)
#define SI_S_028C70_FAST_CLEAR(x) (((unsigned)(x) &
0x1) << 13)
-#define VI_S_028C70_DCC_ENABLE(x) (((unsigned)(x) &
0x1) << 28)
/*CIK+*/
#define R_0300FC_CP_STRMOUT_CNTL 0x0300FC
diff --git a/src/gallium/drivers/radeonsi/si_state.c
b/src/gallium/drivers/radeonsi/si_state.c
index e506ec9..c13d8f2 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -1959,7 +1959,6 @@ static void si_initialize_color_surface(struct si_context
*sctx,
struct r600_surface *surf)
{
struct r600_texture *rtex = (struct r600_texture*)surf->base.texture;
- unsigned level = surf->base.u.tex.level;
unsigned color_info, color_attrib, color_view;
unsigned format, swap, ntype, endian;
const struct util_format_description *desc;
@@ -2059,7 +2058,7 @@ static void si_initialize_color_surface(struct si_context
*sctx,
surf->cb_color_info = color_info;
surf->cb_color_attrib = color_attrib;
- if (sctx->b.chip_class >= VI && rtex->dcc_offset) {
+ if (sctx->b.chip_class >= VI) {
unsigned max_uncompressed_block_size = 2;
if (rtex->surface.nsamples > 1) {
@@ -2071,9 +2070,6 @@ static void si_initialize_color_surface(struct si_context
*sctx,
surf->cb_dcc_control =
S_028C78_MAX_UNCOMPRESSED_BLOCK_SIZE(max_uncompressed_block_size) |
S_028C78_INDEPENDENT_64B_BLOCKS(1);
- surf->cb_dcc_base = (rtex->resource.gpu_address +
- rtex->dcc_offset +
- rtex->surface.level[level].dcc_offset) >>
8;
}
/* This must be set for fast clear to work without FMASK. */
@@ -2390,6 +2386,7 @@ static void si_emit_framebuffer_state(struct si_context
*sctx, struct r600_atom
unsigned i, nr_cbufs = state->nr_cbufs;
struct r600_texture *tex = NULL;
struct r600_surface *cb = NULL;
+ unsigned cb_color_info = 0;
/* Colorbuffers. */
for (i = 0; i < nr_cbufs; i++) {
@@ -2447,13 +2444,17 @@ static void si_emit_framebuffer_state(struct si_context
*sctx, struct r600_atom
cb_color_fmask_slice =
S_028C88_TILE_MAX(slice_tile_max);
}
+ cb_color_info = cb->cb_color_info | tex->cb_color_info;
+ if (tex->dcc_offset)
+ cb_color_info |= S_028C70_DCC_ENABLE(1);
+
radeon_set_context_reg_seq(cs, R_028C60_CB_COLOR0_BASE + i *
0x3C,
sctx->b.chip_class >= VI ? 14 : 13);
radeon_emit(cs, cb_color_base); /*
R_028C60_CB_COLOR0_BASE */
radeon_emit(cs, cb_color_pitch); /*
R_028C64_CB_COLOR0_PITCH */
radeon_emit(cs, cb_color_slice); /*
R_028C68_CB_COLOR0_SLICE */
radeon_emit(cs, cb->cb_color_view); /*
R_028C6C_CB_COLOR0_VIEW */
- radeon_emit(cs, cb->cb_color_info | tex->cb_color_info); /*
R_028C70_CB_COLOR0_INFO */
+ radeon_emit(cs, cb_color_info); /*
R_028C70_CB_COLOR0_INFO */
radeon_emit(cs, cb_color_attrib); /*
R_028C74_CB_COLOR0_ATTRIB */
radeon_emit(cs, cb->cb_dcc_control); /*
R_028C78_CB_COLOR0_DCC_CONTROL */
radeon_emit(cs, tex->cmask.base_address_reg); /*
R_028C7C_CB_COLOR0_CMASK */
@@ -2463,14 +2464,16 @@ static void si_emit_framebuffer_state(struct si_context
*sctx, struct r600_atom
radeon_emit(cs, tex->color_clear_value[0]); /*
R_028C8C_CB_COLOR0_CLEAR_WORD0 */
radeon_emit(cs, tex->color_clear_value[1]); /*
R_028C90_CB_COLOR0_CLEAR_WORD1 */
- if (sctx->b.chip_class >= VI)
- radeon_emit(cs, cb->cb_dcc_base); /*
R_028C94_CB_COLOR0_DCC_BASE */
+ if (sctx->b.chip_class >= VI) /* R_028C94_CB_COLOR0_DCC_BASE */
+ radeon_emit(cs, (tex->resource.gpu_address +
+ tex->dcc_offset +
+
tex->surface.level[cb->base.u.tex.level].dcc_offset) >> 8);
}
/* set CB_COLOR1_INFO for possible dual-src blending */
if (i == 1 && state->cbufs[0] &&
sctx->framebuffer.dirty_cbufs & (1 << 0)) {
radeon_set_context_reg(cs, R_028C70_CB_COLOR0_INFO + 1 * 0x3C,
- cb->cb_color_info | tex->cb_color_info);
+ cb_color_info);
i++;
}
for (; i < 8 ; i++)
@@ -3488,7 +3491,6 @@ static void si_apply_opaque_metadata(struct
r600_common_screen *rscreen,
* be cleared here.
*/
rtex->dcc_offset = 0;
- rtex->cb_color_info &= ~VI_S_028C70_DCC_ENABLE(1);
}
void si_init_screen_state_functions(struct si_screen *sscreen)
--
2.7.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
