Re: [Mesa-dev] [PATCH 1/2] radv: assert on CP_DMA_USE_L2 for SI

2017-06-10 Thread Bas Nieuwenhuizen
The series is

Reviewed-by: Bas Nieuwenhuizen 

On Sat, Jun 10, 2017 at 5:53 PM, Grazvydas Ignotas  wrote:
> The register header (and radeonsi comment) states V_411_SRC_ADDR_TC_L2
> is for CIK+ only, so let's assert on earlier ASICs.
>
> Signed-off-by: Grazvydas Ignotas 
> ---
>  src/amd/vulkan/si_cmd_buffer.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/src/amd/vulkan/si_cmd_buffer.c b/src/amd/vulkan/si_cmd_buffer.c
> index 33414c1..962b76f 100644
> --- a/src/amd/vulkan/si_cmd_buffer.c
> +++ b/src/amd/vulkan/si_cmd_buffer.c
> @@ -1191,10 +1191,11 @@ static void si_emit_cp_dma(struct radv_cmd_buffer 
> *cmd_buffer,
> radeon_emit(cs, src_va >> 32);  /* SRC_ADDR_HI [31:0] 
> */
> radeon_emit(cs, dst_va);/* DST_ADDR_LO [31:0] 
> */
> radeon_emit(cs, dst_va >> 32);  /* DST_ADDR_HI [31:0] 
> */
> radeon_emit(cs, command);
> } else {
> +   assert(!(flags & CP_DMA_USE_L2));
> header |= S_411_SRC_ADDR_HI(src_va >> 32);
> radeon_emit(cs, PKT3(PKT3_CP_DMA, 4, 0));
> radeon_emit(cs, src_va);/* 
> SRC_ADDR_LO [31:0] */
> radeon_emit(cs, header);/* 
> SRC_ADDR_HI [15:0] + flags. */
> radeon_emit(cs, dst_va);/* 
> DST_ADDR_LO [31:0] */
> --
> 2.7.4
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH 1/2] radv: assert on CP_DMA_USE_L2 for SI

2017-06-10 Thread Grazvydas Ignotas
The register header (and radeonsi comment) states V_411_SRC_ADDR_TC_L2
is for CIK+ only, so let's assert on earlier ASICs.

Signed-off-by: Grazvydas Ignotas 
---
 src/amd/vulkan/si_cmd_buffer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/amd/vulkan/si_cmd_buffer.c b/src/amd/vulkan/si_cmd_buffer.c
index 33414c1..962b76f 100644
--- a/src/amd/vulkan/si_cmd_buffer.c
+++ b/src/amd/vulkan/si_cmd_buffer.c
@@ -1191,10 +1191,11 @@ static void si_emit_cp_dma(struct radv_cmd_buffer 
*cmd_buffer,
radeon_emit(cs, src_va >> 32);  /* SRC_ADDR_HI [31:0] */
radeon_emit(cs, dst_va);/* DST_ADDR_LO [31:0] */
radeon_emit(cs, dst_va >> 32);  /* DST_ADDR_HI [31:0] */
radeon_emit(cs, command);
} else {
+   assert(!(flags & CP_DMA_USE_L2));
header |= S_411_SRC_ADDR_HI(src_va >> 32);
radeon_emit(cs, PKT3(PKT3_CP_DMA, 4, 0));
radeon_emit(cs, src_va);/* SRC_ADDR_LO 
[31:0] */
radeon_emit(cs, header);/* SRC_ADDR_HI 
[15:0] + flags. */
radeon_emit(cs, dst_va);/* DST_ADDR_LO 
[31:0] */
-- 
2.7.4

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev