From aaac4fa127fbdcc862eac359156af6c7be553b4b Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Thu, 13 Dec 2012 12:27:28 -0500
Subject: [PATCH] --- yaml --- r: 345599 b: refs/heads/master c:
 278a334cbc96d3da66d56235b8ce84081e9a1892 h: refs/heads/master i:   345597:
 fb282571258b816837bf2ec23fc77be75c0da5b0   345595:
 13abda70c6a4aeaa6559c80e34dab63922a1e198   345591:
 663ae31acbda0aa08e3564a50bfd30a823c217f7   345583:
 534a7c4c42c0d4b9444409086066b3811d502cfa   345567:
 b13bf095aefdd1854267e05508d726411f851da1   345535:
 704a3d0b972979db6aeb4431817e585629b6188b   345471:
 221be98a00de37c0c15d0fd831e869b40daefe59   345343:
 b8d0a94533e8a45f425899b66391367c86b375e7   345087:
 b8c0a9506e5aeb843fb076c5da60f80ba12cf217 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/gpu/drm/radeon/radeon_cs.c | 12 ++++++++++++
 trunk/include/uapi/drm/radeon_drm.h      |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d8e511d017d8..fd7cd8d37b8d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd459e525f4faeefa0bf78e1bcba3e04496b2cb5
+refs/heads/master: 278a334cbc96d3da66d56235b8ce84081e9a1892
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_cs.c b/trunk/drivers/gpu/drm/radeon/radeon_cs.c
index 1b32a5ab972d..396baba0141a 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/trunk/drivers/gpu/drm/radeon/radeon_cs.c
@@ -112,6 +112,18 @@ static int radeon_cs_get_ring(struct radeon_cs_parser *p, u32 ring, s32 priority
 		} else
 			p->ring = RADEON_RING_TYPE_GFX_INDEX;
 		break;
+	case RADEON_CS_RING_DMA:
+		if (p->rdev->family >= CHIP_CAYMAN) {
+			if (p->priority > 0)
+				p->ring = R600_RING_TYPE_DMA_INDEX;
+			else
+				p->ring = CAYMAN_RING_TYPE_DMA1_INDEX;
+		} else if (p->rdev->family >= CHIP_R600) {
+			p->ring = R600_RING_TYPE_DMA_INDEX;
+		} else {
+			return -EINVAL;
+		}
+		break;
 	}
 	return 0;
 }
diff --git a/trunk/include/uapi/drm/radeon_drm.h b/trunk/include/uapi/drm/radeon_drm.h
index 5645a878faec..eeda91774c8a 100644
--- a/trunk/include/uapi/drm/radeon_drm.h
+++ b/trunk/include/uapi/drm/radeon_drm.h
@@ -917,6 +917,7 @@ struct drm_radeon_gem_va {
 /* The second dword of RADEON_CHUNK_ID_FLAGS is a uint32 that sets the ring type */
 #define RADEON_CS_RING_GFX          0
 #define RADEON_CS_RING_COMPUTE      1
+#define RADEON_CS_RING_DMA          2
 /* The third dword of RADEON_CHUNK_ID_FLAGS is a sint32 that sets the priority */
 /* 0 = normal, + = higher priority, - = lower priority */