fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 13:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

nvc0: handle NULL pointer in nvc0_get_compute_param()

Browse source 
To get the size (in bytes) of a compute parameter, clover first calls
get_compute_param() with a NULL data pointer. The RET() macro is based
on nv50.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Samuel Pitoiset 2015-11-03 19:32:49 +01:00
parent dde33fc23c
commit e640ba41ed
1 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
View file

@ -353,45 +353,42 @@ static int
nvc0_screen_get_compute_param(struct pipe_screen *pscreen, nvc0_screen_get_compute_param(struct pipe_screen *pscreen,
enum pipe_compute_cap param, void *data) enum pipe_compute_cap param, void *data)
{ {
uint64_t *data64 = (uint64_t *)data;
uint32_t *data32 = (uint32_t *)data;
const uint16_t obj_class = nvc0_screen(pscreen)->compute->oclass; const uint16_t obj_class = nvc0_screen(pscreen)->compute->oclass;
#define RET(x) do { \
if (data) \
memcpy(data, x, sizeof(x)); \
return sizeof(x); \
} while (0)
switch (param) { switch (param) {
case PIPE_COMPUTE_CAP_GRID_DIMENSION: case PIPE_COMPUTE_CAP_GRID_DIMENSION:
data64[0] = 3; RET((uint64_t []) { 3 });
return 8;
case PIPE_COMPUTE_CAP_MAX_GRID_SIZE: case PIPE_COMPUTE_CAP_MAX_GRID_SIZE:
data64[0] = (obj_class >= NVE4_COMPUTE_CLASS) ? 0x7fffffff : 65535; if (obj_class >= NVE4_COMPUTE_CLASS) {
data64[1] = 65535; RET(((uint64_t []) { 0x7fffffff, 65535, 65535 }));
data64[2] = 65535; } else {
return 24; RET(((uint64_t []) { 65535, 65535, 65535 }));
}
case PIPE_COMPUTE_CAP_MAX_BLOCK_SIZE: case PIPE_COMPUTE_CAP_MAX_BLOCK_SIZE:
data64[0] = 1024; RET(((uint64_t []) { 1024, 1024, 64 }));
data64[1] = 1024;
data64[2] = 64;
return 24;
case PIPE_COMPUTE_CAP_MAX_THREADS_PER_BLOCK: case PIPE_COMPUTE_CAP_MAX_THREADS_PER_BLOCK:
data64[0] = 1024; RET((uint64_t []) { 1024 });
return 8;
case PIPE_COMPUTE_CAP_MAX_GLOBAL_SIZE: /* g[] */ case PIPE_COMPUTE_CAP_MAX_GLOBAL_SIZE: /* g[] */
data64[0] = (uint64_t)1 << 40; RET((uint64_t []) { 1ULL << 40 });
return 8;
case PIPE_COMPUTE_CAP_MAX_LOCAL_SIZE: /* s[] */ case PIPE_COMPUTE_CAP_MAX_LOCAL_SIZE: /* s[] */
data64[0] = 48 << 10; RET((uint64_t []) { 48 << 10 });
return 8;
case PIPE_COMPUTE_CAP_MAX_PRIVATE_SIZE: /* l[] */ case PIPE_COMPUTE_CAP_MAX_PRIVATE_SIZE: /* l[] */
data64[0] = 512 << 10; RET((uint64_t []) { 512 << 10 });
return 8;
case PIPE_COMPUTE_CAP_MAX_INPUT_SIZE: /* c[], arbitrary limit */ case PIPE_COMPUTE_CAP_MAX_INPUT_SIZE: /* c[], arbitrary limit */
data64[0] = 4096; RET((uint64_t []) { 4096 });
return 8;
case PIPE_COMPUTE_CAP_SUBGROUP_SIZE: case PIPE_COMPUTE_CAP_SUBGROUP_SIZE:
data32[0] = 32; RET((uint32_t []) { 32 });
return 4;
default: default:
return 0; return 0;
} }
#undef RET
} }
static void static void