[Mesa-dev] [PATCH] r600: initialised PGM_RESOURCES_2 for ES/GS

[Glenn Kennard]

On Wed, 11 Nov 2015 23:42:18 +0100, Dave Airlie <airlied at gmail.com> wrote:

> From: Dave Airlie <airlied at redhat.com>
>
> This fixes the corruption on rendering that we are seeing in
> certain geometry shaders.
>

Specifically, this fixes  
https://bugs.freedesktop.org/show_bug.cgi?id=91780 and probably others

> Signed-off-by: Dave Airlie <airlied at redhat.com>
> ---
>  src/gallium/drivers/r600/evergreen_state.c | 4 ++++
>  src/gallium/drivers/r600/evergreend.h      | 2 ++
>  2 files changed, 6 insertions(+)
>
> diff --git a/src/gallium/drivers/r600/evergreen_state.c  
> b/src/gallium/drivers/r600/evergreen_state.c
> index c6702a9..a3bbbcc 100644
> --- a/src/gallium/drivers/r600/evergreen_state.c
> +++ b/src/gallium/drivers/r600/evergreen_state.c
> @@ -2362,6 +2362,8 @@ static void cayman_init_atom_start_cs(struct  
> r600_context *rctx)
> 	r600_store_context_reg(cb, R_028848_SQ_PGM_RESOURCES_2_PS,  
> S_028848_SINGLE_ROUND(V_SQ_ROUND_NEAREST_EVEN));
>  	r600_store_context_reg(cb, R_028864_SQ_PGM_RESOURCES_2_VS,  
> S_028864_SINGLE_ROUND(V_SQ_ROUND_NEAREST_EVEN));
> +	r600_store_context_reg(cb, R_02887C_SQ_PGM_RESOURCES_2_GS,  
> S_028848_SINGLE_ROUND(V_SQ_ROUND_NEAREST_EVEN));
> +	r600_store_context_reg(cb, R_028894_SQ_PGM_RESOURCES_2_ES,  
> S_028848_SINGLE_ROUND(V_SQ_ROUND_NEAREST_EVEN));
>  	r600_store_context_reg(cb, R_0288A8_SQ_PGM_RESOURCES_FS, 0);
> 	/* to avoid GPU doing any preloading of constant from random address */
> @@ -2801,6 +2803,8 @@ void evergreen_init_atom_start_cs(struct  
> r600_context *rctx)
> 	r600_store_context_reg(cb, R_028848_SQ_PGM_RESOURCES_2_PS,  
> S_028848_SINGLE_ROUND(V_SQ_ROUND_NEAREST_EVEN));
>  	r600_store_context_reg(cb, R_028864_SQ_PGM_RESOURCES_2_VS,  
> S_028864_SINGLE_ROUND(V_SQ_ROUND_NEAREST_EVEN));
> +	r600_store_context_reg(cb, R_02887C_SQ_PGM_RESOURCES_2_GS,  
> S_028848_SINGLE_ROUND(V_SQ_ROUND_NEAREST_EVEN));
> +	r600_store_context_reg(cb, R_028894_SQ_PGM_RESOURCES_2_ES,  
> S_028848_SINGLE_ROUND(V_SQ_ROUND_NEAREST_EVEN));

nitpick: separate macros for SINGLE_ROUND for each register

>  	r600_store_context_reg(cb, R_0288A8_SQ_PGM_RESOURCES_FS, 0);
> 	/* to avoid GPU doing any preloading of constant from random address */
> diff --git a/src/gallium/drivers/r600/evergreend.h  
> b/src/gallium/drivers/r600/evergreend.h
> index 937ffcb..cf8906c 100644
> --- a/src/gallium/drivers/r600/evergreend.h
> +++ b/src/gallium/drivers/r600/evergreend.h
> @@ -1497,6 +1497,7 @@
>  #define   S_028878_UNCACHED_FIRST_INST(x)              (((x) & 0x1) <<  
> 28)
>  #define   G_028878_UNCACHED_FIRST_INST(x)              (((x) >> 28) &  
> 0x1)
>  #define   C_028878_UNCACHED_FIRST_INST                 0xEFFFFFFF
> +#define R_02887C_SQ_PGM_RESOURCES_2_GS                 0x02887C
> #define R_028890_SQ_PGM_RESOURCES_ES                 0x028890
>  #define   S_028890_NUM_GPRS(x)                         (((x) & 0xFF) <<  
> 0)
> @@ -1511,6 +1512,7 @@
>  #define   S_028890_UNCACHED_FIRST_INST(x)              (((x) & 0x1) <<  
> 28)
>  #define   G_028890_UNCACHED_FIRST_INST(x)              (((x) >> 28) &  
> 0x1)
>  #define   C_028890_UNCACHED_FIRST_INST                 0xEFFFFFFF
> +#define R_028894_SQ_PGM_RESOURCES_2_ES                 0x028894
> #define R_028864_SQ_PGM_RESOURCES_2_VS               0x028864
>  #define   S_028864_SINGLE_ROUND(x)                     (((x) & 0x3) <<  
> 0)

Tested / Reviewed-by: Glenn Kennard <glenn.kennard at gmail.com>