Revert "r300g: flush CS if a buffer being deleted is referenced by it"

As requested by just about everybody. I'm going back to actually reading
patches before ACKing and pushing them.

This reverts commit 417ce06306962a9355cbb35cefcdea1951b0ce85.

Conflicts:

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

diff --git a/src/gallium/winsys/drm/radeon/core/radeon_buffer.c b/src/gallium/winsys/drm/radeon/core/radeon_buffer.c
index b8be059ce86dc698e80d4b958ad04357fd71a628..d2367b245a2b490b7568b07a586bb4d98947c28d 100644 (file)
--- a/src/gallium/winsys/drm/radeon/core/radeon_buffer.c
+++ b/src/gallium/winsys/drm/radeon/core/radeon_buffer.c
@@ -82,7 +82,6 @@ static struct pipe_buffer *radeon_buffer_create(struct pipe_winsys *ws,
         domain |= RADEON_GEM_DOMAIN_GTT;
     }
 
-    radeon_buffer->ws = radeon_ws;
     radeon_buffer->bo = radeon_bo_open(radeon_ws->priv->bom, 0, size,
             alignment, domain, 0);
     if (radeon_buffer->bo == NULL) {
@@ -133,11 +132,6 @@ static void radeon_buffer_del(struct pipe_buffer *buffer)
 {
     struct radeon_pipe_buffer *radeon_buffer =
         (struct radeon_pipe_buffer*)buffer;
-    struct radeon_winsys_priv *priv = radeon_buffer->ws->priv;
-
-    if (radeon_bo_is_referenced_by_cs(radeon_buffer->bo, priv->cs)) {
-        priv->flush_cb(priv->flush_data);
-    }
 
     radeon_bo_unref(radeon_buffer->bo);
     free(radeon_buffer);

diff --git a/src/gallium/winsys/drm/radeon/core/radeon_buffer.h b/src/gallium/winsys/drm/radeon/core/radeon_buffer.h
index 950a1d66c3dcf321f5c6431c8b1512d88cbca83b..d7f17564a9f75b780711bf30fd824ac360242393 100644 (file)
--- a/src/gallium/winsys/drm/radeon/core/radeon_buffer.h
+++ b/src/gallium/winsys/drm/radeon/core/radeon_buffer.h
@@ -50,7 +50,6 @@
 struct radeon_pipe_buffer {
     struct pipe_buffer  base;
     struct radeon_bo    *bo;
-    struct radeon_winsys *ws;
     boolean flinked;
     uint32_t flink;
 };

diff --git a/src/gallium/winsys/drm/radeon/core/radeon_drm.c b/src/gallium/winsys/drm/radeon/core/radeon_drm.c
index 2f7fbc72423b7445ecf33668ff8912b68058bf45..dec7c065036d374bd4e3bac5ea6fe6667144a150 100644 (file)
--- a/src/gallium/winsys/drm/radeon/core/radeon_drm.c
+++ b/src/gallium/winsys/drm/radeon/core/radeon_drm.c
@@ -171,7 +171,6 @@ struct pipe_buffer* radeon_buffer_from_handle(struct drm_api* api,
     radeon_buffer->base.screen = screen;
     radeon_buffer->base.usage = PIPE_BUFFER_USAGE_PIXEL;
     radeon_buffer->bo = bo;
-    radeon_buffer->ws = (struct radeon_winsys*)screen->winsys;
     return &radeon_buffer->base;
 }