Mesa (9.2): nouveau: initialise the nouveau_transfer maps

Carl Worth cworth at kemper.freedesktop.org
Fri Sep 27 23:03:18 UTC 2013


Module: Mesa
Branch: 9.2
Commit: 47da22626d4c732fe04f44f3394aa352f9dd0755
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=47da22626d4c732fe04f44f3394aa352f9dd0755

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Fri Aug  9 19:51:02 2013 +0100

nouveau: initialise the nouveau_transfer maps

Cc: "9.2 and 9.1" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
(cherry picked from commit dc10251d086576a007c77b7ca7854f5fe8c7e134)

---

 src/gallium/drivers/nouveau/nouveau_buffer.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nouveau_buffer.c b/src/gallium/drivers/nouveau/nouveau_buffer.c
index 02bc6f0..3e04049 100644
--- a/src/gallium/drivers/nouveau/nouveau_buffer.c
+++ b/src/gallium/drivers/nouveau/nouveau_buffer.c
@@ -289,6 +289,7 @@ nouveau_buffer_cache(struct nouveau_context *nv, struct nv04_resource *buf)
    tx.base.box.x = 0;
    tx.base.box.width = buf->base.width0;
    tx.bo = NULL;
+   tx.map = NULL;
 
    if (!buf->data)
       if (!nouveau_buffer_malloc(buf))
@@ -690,6 +691,7 @@ nouveau_buffer_migrate(struct nouveau_context *nv,
       tx.base.box.x = 0;
       tx.base.box.width = buf->base.width0;
       tx.bo = NULL;
+      tx.map = NULL;
       if (!nouveau_transfer_staging(nv, &tx, FALSE))
          return FALSE;
       nouveau_transfer_write(nv, &tx, 0, tx.base.box.width);




More information about the mesa-commit mailing list