[Mesa-dev] [PATCH] winsys/amdgpu: add an assertion to cik_get_num_tile_pipes (v2)

[Michel Dänzer]

On 05.02.2016 01:15, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak at amd.com>
> 
> v2: print an error to stderr
> ---
>  src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
> index d1ba259..2c4de75 100644
> --- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
> +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
> @@ -68,7 +68,6 @@ static unsigned cik_get_num_tile_pipes(struct amdgpu_gpu_info *info)
>  
>     switch (CIK__GB_TILE_MODE__PIPE_CONFIG(mode2d)) {
>     case CIK__PIPE_CONFIG__ADDR_SURF_P2:
> -   default:
>         return 2;
>     case CIK__PIPE_CONFIG__ADDR_SURF_P4_8x16:
>     case CIK__PIPE_CONFIG__ADDR_SURF_P4_16x16:
> @@ -86,6 +85,10 @@ static unsigned cik_get_num_tile_pipes(struct amdgpu_gpu_info *info)
>     case CIK__PIPE_CONFIG__ADDR_SURF_P16_32X32_8X16:
>     case CIK__PIPE_CONFIG__ADDR_SURF_P16_32X32_16X16:
>         return 16;
> +   default:
> +       fprintf(stderr, "Invalid CIK pipe configuration, assuming P2\n");

Hmm, actually it might be nice to include the mode2d value in the
message. Either way,

Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>


-- 
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer