Mesa (master): r600g: add vgt dma src defines

Dave Airlie airlied at kemper.freedesktop.org
Wed Sep 15 23:44:23 UTC 2010


Module: Mesa
Branch: master
Commit: 1a20aae581dae3d8d733f7f18414737a6924e981
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1a20aae581dae3d8d733f7f18414737a6924e981

Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Sep 16 09:41:43 2010 +1000

r600g: add vgt dma src defines

---

 src/gallium/drivers/r600/r600_draw.c |    6 +++---
 src/gallium/drivers/r600/r600d.h     |    2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_draw.c b/src/gallium/drivers/r600/r600_draw.c
index 17cc5a4..d0de165 100644
--- a/src/gallium/drivers/r600/r600_draw.c
+++ b/src/gallium/drivers/r600/r600_draw.c
@@ -54,15 +54,15 @@ static int r600_draw_common(struct r600_draw *draw)
 		return r;
 	switch (draw->index_size) {
 	case 2:
-		vgt_draw_initiator = 0;
+		vgt_draw_initiator = S_0287F0_SOURCE_SELECT(V_0287F0_DI_SRC_SEL_DMA);
 		vgt_dma_index_type = 0;
 		break;
 	case 4:
-		vgt_draw_initiator = 0;
+		vgt_draw_initiator = S_0287F0_SOURCE_SELECT(V_0287F0_DI_SRC_SEL_DMA);
 		vgt_dma_index_type = 1;
 		break;
 	case 0:
-		vgt_draw_initiator = 2;
+		vgt_draw_initiator = S_0287F0_SOURCE_SELECT(V_0287F0_DI_SRC_SEL_AUTO_INDEX);
 		vgt_dma_index_type = 0;
 		break;
 	default:
diff --git a/src/gallium/drivers/r600/r600d.h b/src/gallium/drivers/r600/r600d.h
index 259927e..8ef0074 100644
--- a/src/gallium/drivers/r600/r600d.h
+++ b/src/gallium/drivers/r600/r600d.h
@@ -831,6 +831,8 @@
 #define   S_0287F0_SOURCE_SELECT(x)                    (((x) & 0x3) << 0)
 #define   G_0287F0_SOURCE_SELECT(x)                    (((x) >> 0) & 0x3)
 #define   C_0287F0_SOURCE_SELECT                       0xFFFFFFFC
+#define     V_0287F0_DI_SRC_SEL_DMA                    0
+#define     V_0287F0_DI_SRC_SEL_AUTO_INDEX             2
 #define   S_0287F0_MAJOR_MODE(x)                       (((x) & 0x3) << 2)
 #define   G_0287F0_MAJOR_MODE(x)                       (((x) >> 2) & 0x3)
 #define   C_0287F0_MAJOR_MODE                          0xFFFFFFF3




More information about the mesa-commit mailing list