fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-30 01:20:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nvc0: check return value of nvc0_screen_resize_tls_area()

Browse source 
While we are at it, make it static and change the return values
policy to be consistent.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Samuel Pitoiset 2016-08-30 16:45:29 +02:00
parent b489ac88f6
commit 0fc3b7c88e
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -673,7 +673,7 @@ nvc0_screen_init_compute(struct nvc0_screen *screen)
}
}
bool
static int
nvc0_screen_resize_tls_area(struct nvc0_screen *screen,
uint32_t lpos, uint32_t lneg, uint32_t cstack)
{
@ -683,7 +683,7 @@ nvc0_screen_resize_tls_area(struct nvc0_screen *screen,
if (size >= (1 << 20)) {
NOUVEAU_ERR("requested TLS size too large: 0x%"PRIx64"\n", size);
return false;
return -1;
}
size *= (screen->base.device->chipset >= 0xe0) ? 64 : 48; /* max warps */
@ -694,13 +694,11 @@ nvc0_screen_resize_tls_area(struct nvc0_screen *screen,
ret = nouveau_bo_new(screen->base.device, NV_VRAM_DOMAIN(&screen->base), 1 << 17, size,
NULL, &bo);
if (ret) {
NOUVEAU_ERR("failed to allocate TLS area, size: 0x%"PRIx64"\n", size);
return false;
}
if (ret)
return ret;
nouveau_bo_ref(NULL, &screen->tls);
screen->tls = bo;
return true;
return 0;
}
#define FAIL_SCREEN_INIT(str, err) \
@ -1042,7 +1040,9 @@ nvc0_screen_create(struct nouveau_device *dev)
screen->mp_count = value >> 8;
screen->mp_count_compute = screen->mp_count;
nvc0_screen_resize_tls_area(screen, 128 * 16, 0, 0x200);
ret = nvc0_screen_resize_tls_area(screen, 128 * 16, 0, 0x200);
if (ret)
FAIL_SCREEN_INIT("Error allocating TLS area: %d\n", ret);
BEGIN_NVC0(push, NVC0_3D(CODE_ADDRESS_HIGH), 2);
PUSH_DATAh(push, screen->text->offset);

3
src/gallium/drivers/nouveau/nvc0/nvc0_screen.h
View file

@ -136,9 +136,6 @@ int nvc0_screen_tsc_alloc(struct nvc0_screen *, void *);
int nve4_screen_compute_setup(struct nvc0_screen *, struct nouveau_pushbuf *);
int nvc0_screen_compute_setup(struct nvc0_screen *, struct nouveau_pushbuf *);
bool nvc0_screen_resize_tls_area(struct nvc0_screen *, uint32_t lpos,
uint32_t lneg, uint32_t cstack);
static inline void
nvc0_resource_fence(struct nv04_resource *res, uint32_t flags)
{