commit 85059964307c3f10e4a328d82af2bb791a5a4927
author Marek Olšák <maraeo@gmail.com> Sat Jan 23 17:19:44 2010 +0100
committer Corbin Simpson <MostAwesomeDude@gmail.com> Sun Jan 24 23:03:29 2010 -0800
tree 5d2e0499c3b2de9e56feb2e30f2727978735a523
parent 4aed0944f4b8b8d14d210cf6bc87ccddfa9a77ec

radeong: do not emit a zero-sized command stream

Fixing a hardlock introduced in fcbd285e421903ee0a65f19f5d633b25b5923c24 and
reproducible with piglit/bugs/fdo23489.

src/gallium/winsys/drm/radeon/core/radeon_r300.c

diff --git a/src/gallium/winsys/drm/radeon/core/radeon_r300.c b/src/gallium/winsys/drm/radeon/core/radeon_r300.c
index 0875ee4..0253bc2 100644
--- a/src/gallium/winsys/drm/radeon/core/radeon_r300.c
+++ b/src/gallium/winsys/drm/radeon/core/radeon_r300.c
@@ -108,6 +108,11 @@
 {
     int retval;
 
+    /* Don't flush a zero-sized CS. */
+    if (!winsys->priv->cs->cdw) {
+        return;
+    }
+
     /* Emit the CS. */
     retval = radeon_cs_emit(winsys->priv->cs);
     if (retval) {