nvc0: make sure that the local memory allocation is aligned to 0x10
authorIlia Mirkin <imirkin@alum.mit.edu>
Fri, 18 Jul 2014 02:11:56 +0000 (22:11 -0400)
committerIlia Mirkin <imirkin@alum.mit.edu>
Thu, 24 Jul 2014 12:26:41 +0000 (08:26 -0400)
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: <mesa-stable@lists.freedesktop.org>
src/gallium/drivers/nouveau/nvc0/nvc0_program.c

index 7e49b06dee24f53027e8e85f8828cce774bf22d8..dbb7c5503302fb5d299751dd2edebd8f760bb853 100644 (file)
@@ -629,7 +629,7 @@ nvc0_program_translate(struct nvc0_program *prog, uint16_t chipset)
    if (info->bin.tlsSpace) {
       assert(info->bin.tlsSpace < (1 << 24));
       prog->hdr[0] |= 1 << 26;
-      prog->hdr[1] |= info->bin.tlsSpace; /* l[] size */
+      prog->hdr[1] |= align(info->bin.tlsSpace, 0x10); /* l[] size */
       prog->need_tls = TRUE;
    }
    /* TODO: factor 2 only needed where joinat/precont is used,