gallium-r300: Add primitive CS.

Enough to get us up and running, I suppose.
This needs to be pushed down into winsys!

diff --git a/src/gallium/drivers/r300/r300_blit.c b/src/gallium/drivers/r300/r300_blit.c
index 415e6e0a168cc8ce80cf17daca5f6fc30247f882..c404a667b105548e08544178d91b1a56de079a74 100644 (file)
--- a/src/gallium/drivers/r300/r300_blit.c
+++ b/src/gallium/drivers/r300/r300_blit.c
@@ -33,6 +33,7 @@ int r300_fill_blit(struct r300_context* r300,
                    short w, short h,
                    unsigned color)
 {
+    CS_LOCALS(r300);
     uint32_t dest_type;
 
     /* Check for fallbacks. */
@@ -56,6 +57,8 @@ int r300_fill_blit(struct r300_context* r300,
     /* XXX odds are *incredibly* good that we were in 3D just a bit ago,
      * so flush here first. */
 
+    BEGIN_CS(10 + 2 + 2);
+
     /* Set up the 2D engine. */
     OUT_CS_REG(RADEON_DEFAULT_SC_BOTTOM_RIGHT,
                   RADEON_DEFAULT_SC_RIGHT_MAX | RADEON_DEFAULT_SC_BOTTOM_MAX);
@@ -86,5 +89,8 @@ int r300_fill_blit(struct r300_context* r300,
     OUT_CS_REG(RADEON_DSTCACHE_CTLSTAT, RADEON_RB2D_DC_FLUSH_ALL);
     OUT_CS_REG(RADEON_WAIT_UNTIL,
                RADEON_WAIT_2D_IDLECLEAN | RADEON_WAIT_DMA_GUI_IDLE);
+
+    END_CS;
+
     return 1;
 }

diff --git a/src/gallium/drivers/r300/r300_blit.h b/src/gallium/drivers/r300/r300_blit.h
index 698b00083a90b8c17d8f73d8f8f3c1a05543c4e6..09cb566b95b3f7d75ac30dc963948f54cd4d91a3 100644 (file)
--- a/src/gallium/drivers/r300/r300_blit.h
+++ b/src/gallium/drivers/r300/r300_blit.h
@@ -25,7 +25,7 @@
 
 #include "pipe/p_state.h"
 
-#include "radeon_reg.h"
+#include "r300_cs.h"
 
 /* Forward declarations. */
 struct r300_context;

diff --git a/src/gallium/drivers/r300/r300_cs.h b/src/gallium/drivers/r300/r300_cs.h
new file mode 100644 (file)
index 0000000..ebd5324
--- /dev/null
+++ b/src/gallium/drivers/r300/r300_cs.h
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2008 Corbin Simpson <MostAwesomeDude@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE. */
+
+#ifndef R300_CS_H
+#define R300_CS_H
+
+#include "radeon_cs.h"
+#include "radeon_reg.h"
+
+/* Yes, I know macros are ugly. However, they are much prettier than the code
+ * that they neatly hide away, and don't have the cost of function setup,so
+ * we're going to use them. */
+
+#define MAX_CS_SIZE 64 * 1024 / 4
+
+#define CP_PACKET0(register, count) \
+    (RADEON_CP_PACKET0 | ((count) << 16) | ((register) >> 2))
+
+#define CS_LOCALS(context) \
+    struct radeon_cs* cs = context->cs
+
+
+#define CHECK_CS(size) do { \
+    if ((cs->cdw + (size) + 128) > MAX_CS_SIZE || radeon_cs_need_flush(cs)) { \
+        /* XXX flush the CS */ \
+    } } while (0)
+
+/* XXX radeon_cs_begin is currently unimplemented on the backend, but let's
+ * be future-proof, yeah? */
+#define BEGIN_CS(size) do { \
+    CHECK_CS(size); \
+    radeon_cs_begin(cs, (size), __FILE__, __FUNCTION__, __LINE__); \
+} while (0)
+
+#define OUT_CS(value) \
+    radeon_cs_write_dword(cs, value)
+
+#define OUT_CS_REG(register, value) do { \
+    OUT_CS(CP_PACKET0(register, 0)); \
+    OUT_CS(value); } while (0)
+
+#define OUT_CS_RELOC(bo, offset, rd, wd, flags) do { \
+    radeon_cs_write_dword(cs, offset); \
+    radeon_cs_write_reloc(cs, bo, rd, wd, flags); \
+} while (0)
+
+/* XXX more future-proofing */
+#define END_CS \
+    radeon_cs_end(cs, __FILE__, __FUNCTION__, __LINE__)
+
+#endif /* R300_CS_H */
\ No newline at end of file