Mesa (master): nvc0: check return value of nvc0_screen_resize_tls_area()
Samuel Pitoiset
hakzsam at kemper.freedesktop.org
Tue Aug 30 16:43:18 UTC 2016
Module: Mesa
Branch: master
Commit: 0fc3b7c88edc5f28d01230a7575f9b75c615e929
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0fc3b7c88edc5f28d01230a7575f9b75c615e929
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date: Tue Aug 30 16:45:29 2016 +0200
nvc0: check return value of nvc0_screen_resize_tls_area()
While we are at it, make it static and change the return values
policy to be consistent.
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
---
src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 16 ++++++++--------
src/gallium/drivers/nouveau/nvc0/nvc0_screen.h | 3 ---
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
index 8ff6c5d..b683804 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
@@ -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);
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.h b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.h
index 4a89794..672d515 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.h
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.h
@@ -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)
{
More information about the mesa-commit
mailing list