diff --git a/src/freedreno/common/freedreno_dev_info.h b/src/freedreno/common/freedreno_dev_info.h index 0a1ab85ef9a..b88acace021 100644 --- a/src/freedreno/common/freedreno_dev_info.h +++ b/src/freedreno/common/freedreno_dev_info.h @@ -70,7 +70,7 @@ struct fd_dev_info { bool supports_multiview_mask; /* info for setting RB_CCU_CNTL */ - bool ccu_cntl_gmem_unk2; + bool concurrent_resolve; bool has_z24uint_s8uint; bool tess_use_shared; diff --git a/src/freedreno/common/freedreno_devices.py b/src/freedreno/common/freedreno_devices.py index 36b421b0e52..a3b64f69510 100644 --- a/src/freedreno/common/freedreno_devices.py +++ b/src/freedreno/common/freedreno_devices.py @@ -207,7 +207,7 @@ a6xx_gen1 = dict( fibers_per_sp = 128 * 16, reg_size_vec4 = 96, instr_cache_size = 64, - ccu_cntl_gmem_unk2 = True, + concurrent_resolve = True, indirect_draw_wfm_quirk = True, depth_bounds_require_depth_test_quirk = True, magic = dict( diff --git a/src/freedreno/registers/adreno/a6xx.xml b/src/freedreno/registers/adreno/a6xx.xml index cb73c3ce3ab..796cfb59825 100644 --- a/src/freedreno/registers/adreno/a6xx.xml +++ b/src/freedreno/registers/adreno/a6xx.xml @@ -2233,8 +2233,15 @@ to upconvert to 32b float internally? then probably a component mask, I always see 0xf - - + + + + @@ -2339,7 +2346,8 @@ to upconvert to 32b float internally? - + + diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c index d3fabefffe7..4257b2fe3c3 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_gmem.c @@ -762,7 +762,7 @@ emit_binning_pass(struct fd_batch *batch) assert_dt OUT_REG(ring, A6XX_RB_CCU_CNTL(.color_offset = screen->ccu_offset_gmem, .gmem = true, - .unk2 = screen->info->a6xx.ccu_cntl_gmem_unk2)); + .concurrent_resolve = screen->info->a6xx.concurrent_resolve)); } static void @@ -830,7 +830,7 @@ fd6_emit_tile_init(struct fd_batch *batch) assert_dt OUT_REG(ring, A6XX_RB_CCU_CNTL(.color_offset = screen->ccu_offset_gmem, .gmem = true, - .unk2 = screen->info->a6xx.ccu_cntl_gmem_unk2)); + .concurrent_resolve = screen->info->a6xx.concurrent_resolve)); emit_zs(ring, pfb->zsbuf, batch->gmem_state); emit_mrt(ring, pfb, batch->gmem_state);