Module: Mesa Branch: master Commit: ce8e6b970b5bb765630bfffce67545b63542b78a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ce8e6b970b5bb765630bfffce67545b63542b78a
Author: Marek Olšák <[email protected]> Date: Wed Jul 25 23:14:28 2018 -0400 ac: fix typo DSL_SEL -> DST_SEL --- src/amd/common/sid.h | 4 ++-- src/amd/vulkan/si_cmd_buffer.c | 4 ++-- src/gallium/drivers/radeonsi/si_cp_dma.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/amd/common/sid.h b/src/amd/common/sid.h index e922b38ae3..3c3bc541b4 100644 --- a/src/amd/common/sid.h +++ b/src/amd/common/sid.h @@ -239,7 +239,7 @@ #define S_411_ENGINE(x) (((unsigned)(x) & 0x1) << 27) #define V_411_ME 0 #define V_411_PFP 1 -#define S_411_DSL_SEL(x) (((unsigned)(x) & 0x3) << 20) +#define S_411_DST_SEL(x) (((unsigned)(x) & 0x3) << 20) #define V_411_DST_ADDR 0 #define V_411_GDS 1 /* program DAS to 1 as well */ #define V_411_NOWHERE 2 /* new for GFX9 */ @@ -294,7 +294,7 @@ #define V_500_GDS 1 /* program SAS to 1 as well */ #define V_500_DATA 2 #define V_500_SRC_ADDR_TC_L2 3 /* new for CIK */ -#define S_500_DSL_SEL(x) (((unsigned)(x) & 0x3) << 20) +#define S_500_DST_SEL(x) (((unsigned)(x) & 0x3) << 20) #define V_500_DST_ADDR 0 #define V_500_GDS 1 /* program DAS to 1 as well */ #define V_500_NOWHERE 2 /* new for GFX9 */ diff --git a/src/amd/vulkan/si_cmd_buffer.c b/src/amd/vulkan/si_cmd_buffer.c index 5b88fdcf3e..e2bdbe889a 100644 --- a/src/amd/vulkan/si_cmd_buffer.c +++ b/src/amd/vulkan/si_cmd_buffer.c @@ -1092,9 +1092,9 @@ static void si_emit_cp_dma(struct radv_cmd_buffer *cmd_buffer, if (cmd_buffer->device->physical_device->rad_info.chip_class >= GFX9 && !(flags & CP_DMA_CLEAR) && src_va == dst_va) - header |= S_411_DSL_SEL(V_411_NOWHERE); /* prefetch only */ + header |= S_411_DST_SEL(V_411_NOWHERE); /* prefetch only */ else if (flags & CP_DMA_USE_L2) - header |= S_411_DSL_SEL(V_411_DST_ADDR_TC_L2); + header |= S_411_DST_SEL(V_411_DST_ADDR_TC_L2); if (flags & CP_DMA_CLEAR) header |= S_411_SRC_SEL(V_411_DATA); diff --git a/src/gallium/drivers/radeonsi/si_cp_dma.c b/src/gallium/drivers/radeonsi/si_cp_dma.c index db26dec8c4..f98fad43b3 100644 --- a/src/gallium/drivers/radeonsi/si_cp_dma.c +++ b/src/gallium/drivers/radeonsi/si_cp_dma.c @@ -88,9 +88,9 @@ static void si_emit_cp_dma(struct si_context *sctx, uint64_t dst_va, /* Src and dst flags. */ if (sctx->chip_class >= GFX9 && !(flags & CP_DMA_CLEAR) && src_va == dst_va) - header |= S_411_DSL_SEL(V_411_NOWHERE); /* prefetch only */ + header |= S_411_DST_SEL(V_411_NOWHERE); /* prefetch only */ else if (flags & CP_DMA_USE_L2) - header |= S_411_DSL_SEL(V_411_DST_ADDR_TC_L2); + header |= S_411_DST_SEL(V_411_DST_ADDR_TC_L2); if (flags & CP_DMA_CLEAR) header |= S_411_SRC_SEL(V_411_DATA); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
