[Mesa-dev] [PATCH 1/2] winsys/radeon: Always report at least 1 compute unit

[Marek Olšák]

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

Marek

On Sat, Dec 6, 2014 at 12:59 AM, Tom Stellard <thomas.stellard at amd.com> wrote:
> All uses of this require that the value be at least one, so it's
> easier to report at least one than having to wrap all uses
> in MAX2(max_compute_units, 1).
> ---
>  src/gallium/drivers/radeon/r600_pipe_common.c     | 2 +-
>  src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 2 ++
>  2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
> index 8aad178..cb17e54 100644
> --- a/src/gallium/drivers/radeon/r600_pipe_common.c
> +++ b/src/gallium/drivers/radeon/r600_pipe_common.c
> @@ -607,7 +607,7 @@ static int r600_get_compute_param(struct pipe_screen *screen,
>         case PIPE_COMPUTE_CAP_MAX_COMPUTE_UNITS:
>                 if (ret) {
>                         uint32_t *max_compute_units = ret;
> -                       *max_compute_units = MAX2(rscreen->info.max_compute_units, 1);
> +                       *max_compute_units = rscreen->info.max_compute_units;
>                 }
>                 return sizeof(uint32_t);
>
> diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
> index c207a85..f6349a0 100644
> --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
> +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
> @@ -384,6 +384,8 @@ static boolean do_winsys_init(struct radeon_drm_winsys *ws)
>      radeon_get_drm_value(ws->fd, RADEON_INFO_MAX_PIPES, NULL,
>                           &ws->info.r600_max_pipes);
>
> +    /* All GPUs have at least one compute unit */
> +    ws->info.max_compute_units = 1;
>      radeon_get_drm_value(ws->fd, RADEON_INFO_ACTIVE_CU_COUNT, NULL,
>                           &ws->info.max_compute_units);
>
> --
> 2.0.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev