diff options
| author | Tom Stellard <[email protected]> | 2014-12-05 23:59:10 +0000 |
|---|---|---|
| committer | Tom Stellard <[email protected]> | 2014-12-08 17:20:50 -0500 |
| commit | 0e1c085f17fdd774ff6b060dd03422e74ea3e2cc (patch) | |
| tree | 6a8d954778fb507c8c4c76be4f9cff8980bd249f /src/gallium | |
| parent | 67dcbcd92cb9877a04747d6cf7fef14c2b8af8b3 (diff) | |
winsys/radeon: Always report at least 1 compute unit
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).
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.c | 2 | ||||
| -rw-r--r-- | src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c index 8aad1782d1d..cb17e54e0d7 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 3974034c911..75fc80feebc 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c @@ -387,6 +387,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); |