Mesa (master): gallium/radeon: Set gpu_address to 0 if r600_virtual_address is false

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 3d5e247de681dc6ee97ef26ff1b2268a81d2b070
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3d5e247de681dc6ee97ef26ff1b2268a81d2b070

Author: Niels Ole Salscheider <niels_ole at salscheider-online.de>
Date:   Sun Aug 10 12:52:12 2014 +0200

gallium/radeon: Set gpu_address to 0 if r600_virtual_address is false

Without this patch I get the following during DMA transfers:
[drm:radeon_cs_ib_chunk] *ERROR* Invalid command stream !
radeon 0000:01:00.0: CP DMA dst buffer too small (21475829792 4096)

This is a fixup for e878e154cdfd4dbb5474f776e0a6d86fcb983098.

Signed-off-by: Niels Ole Salscheider <niels_ole at salscheider-online.de>
Signed-off-by: Marek Olšák <marek.olsak at amd.com>

---

 src/gallium/drivers/radeon/r600_buffer_common.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gallium/drivers/radeon/r600_buffer_common.c b/src/gallium/drivers/radeon/r600_buffer_common.c
index a580685..22bc97e 100644
--- a/src/gallium/drivers/radeon/r600_buffer_common.c
+++ b/src/gallium/drivers/radeon/r600_buffer_common.c
@@ -171,6 +171,8 @@ bool r600_init_resource(struct r600_common_screen *rscreen,
 
 	if (rscreen->info.r600_virtual_address)
 		res->gpu_address = rscreen->ws->buffer_get_virtual_address(res->cs_buf);
+	else
+		res->gpu_address = 0;
 
 	pb_reference(&old_buf, NULL);