r300g: cache tiling flags to reduce the number of DRM calls

[mesa.git] / src / gallium / winsys / radeon / drm / radeon_drm_buffer.c

diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_buffer.c b/src/gallium/winsys/radeon/drm/radeon_drm_buffer.c
index c9179a3620aa62c8a46e33888c3bf34c817844d0..b8366498922803844b3d895e23242e8caf5e1ee1 100644 (file)
--- a/src/gallium/winsys/radeon/drm/radeon_drm_buffer.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_buffer.c
@@ -22,6 +22,8 @@ struct radeon_drm_buffer {
 
     boolean flinked;
     uint32_t flink;
+    uint32_t tileflags;
+    uint32_t pitch;
 
     struct radeon_drm_buffer *next, *prev;
 };
@@ -318,6 +320,9 @@ void radeon_drm_bufmgr_get_tiling(struct pb_buffer *_buf,
 
     radeon_bo_get_tiling(buf->bo, &flags, &pitch);
 
+    buf->tileflags = flags;
+    buf->pitch = pitch;
+
     *microtiled = R300_BUFFER_LINEAR;
     *macrotiled = R300_BUFFER_LINEAR;
     if (flags & RADEON_BO_FLAGS_MICRO_TILE)
@@ -333,7 +338,7 @@ void radeon_drm_bufmgr_set_tiling(struct pb_buffer *_buf,
                                   uint32_t pitch)
 {
     struct radeon_drm_buffer *buf = get_drm_buffer(_buf);
-    uint32_t flags = 0, old_flags, old_pitch;
+    uint32_t flags = 0;
     if (microtiled == R300_BUFFER_TILED)
         flags |= RADEON_BO_FLAGS_MICRO_TILE;
 /* XXX Remove this ifdef when libdrm version 2.4.19 becomes mandatory. */
@@ -344,17 +349,15 @@ void radeon_drm_bufmgr_set_tiling(struct pb_buffer *_buf,
     if (macrotiled == R300_BUFFER_TILED)
         flags |= RADEON_BO_FLAGS_MACRO_TILE;
 
-    radeon_bo_get_tiling(buf->bo, &old_flags, &old_pitch);
-
-    if (flags != old_flags || pitch != old_pitch) {
+    if (flags != buf->tileflags || pitch != buf->pitch) {
         /* Tiling determines how DRM treats the buffer data.
          * We must flush CS when changing it if the buffer is referenced. */
         if (radeon_bo_is_referenced_by_cs(buf->bo,  buf->mgr->rws->cs)) {
            buf->mgr->rws->flush_cb(buf->mgr->rws->flush_data);
         }
-    }
-    radeon_bo_set_tiling(buf->bo, flags, pitch);
 
+        radeon_bo_set_tiling(buf->bo, flags, pitch);
+    }
 }
 
 boolean radeon_drm_bufmgr_add_buffer(struct pb_buffer *_buf,
@@ -381,13 +384,25 @@ void radeon_drm_bufmgr_write_reloc(struct pb_buffer *_buf,
     }
 }
 
-boolean radeon_drm_bufmgr_is_buffer_referenced(struct pb_buffer *_buf)
+boolean radeon_drm_bufmgr_is_buffer_referenced(struct pb_buffer *_buf,
+                                               enum r300_reference_domain domain)
 {
     struct radeon_drm_buffer *buf = get_drm_buffer(_buf);
-    uint32_t domain;
+    uint32_t tmp;
+
+    if (domain & R300_REF_CS) {
+        if (radeon_bo_is_referenced_by_cs(buf->bo, buf->mgr->rws->cs)) {
+            return TRUE;
+        }
+    }
+
+    if (domain & R300_REF_HW) {
+        if (radeon_bo_is_busy(buf->bo, &tmp)) {
+            return TRUE;
+        }
+    }
 
-    return (radeon_bo_is_referenced_by_cs(buf->bo, buf->mgr->rws->cs) ||
-           radeon_bo_is_busy(buf->bo, &domain));
+    return FALSE;
 }