From: Corbin Simpson <MostAwesomeDude@gmail.com>
Date: Mon, 25 Jan 2010 19:04:55 +0000 (-0800)
Subject: radeong: Make sure that we're not emitting relocations for local buffers.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1571602153128971ae9ed549d633d67aac65da14;p=mesa.git

radeong: Make sure that we're not emitting relocations for local buffers.

Split from Marek's immd-mode patch.
---

diff --git a/src/gallium/winsys/drm/radeon/core/radeon_r300.c b/src/gallium/winsys/drm/radeon/core/radeon_r300.c
index 0253bc2527e..d759beaba13 100644
--- a/src/gallium/winsys/drm/radeon/core/radeon_r300.c
+++ b/src/gallium/winsys/drm/radeon/core/radeon_r300.c
@@ -81,9 +81,13 @@ static void radeon_write_cs_reloc(struct radeon_winsys* winsys,
                                   uint32_t flags)
 {
     int retval = 0;
+    struct radeon_pipe_buffer* radeon_buffer =
+        (struct radeon_pipe_buffer*)pbuffer;
 
-    retval = radeon_cs_write_reloc(winsys->priv->cs,
-            ((struct radeon_pipe_buffer*)pbuffer)->bo, rd, wd, flags);
+    assert(!radeon_buffer->pb);
+
+    retval = radeon_cs_write_reloc(winsys->priv->cs, radeon_buffer->bo,
+                                   rd, wd, flags);
 
     if (retval) {
         debug_printf("radeon: Relocation of %p (%d, %d, %d) failed!\n",