diff options
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_cs.c | 12 | ||||
-rw-r--r-- | include/uapi/drm/radeon_drm.h | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c index 1b32a5ab972d..396baba0141a 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/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 | |||
112 | } else | 112 | } else |
113 | p->ring = RADEON_RING_TYPE_GFX_INDEX; | 113 | p->ring = RADEON_RING_TYPE_GFX_INDEX; |
114 | break; | 114 | break; |
115 | case RADEON_CS_RING_DMA: | ||
116 | if (p->rdev->family >= CHIP_CAYMAN) { | ||
117 | if (p->priority > 0) | ||
118 | p->ring = R600_RING_TYPE_DMA_INDEX; | ||
119 | else | ||
120 | p->ring = CAYMAN_RING_TYPE_DMA1_INDEX; | ||
121 | } else if (p->rdev->family >= CHIP_R600) { | ||
122 | p->ring = R600_RING_TYPE_DMA_INDEX; | ||
123 | } else { | ||
124 | return -EINVAL; | ||
125 | } | ||
126 | break; | ||
115 | } | 127 | } |
116 | return 0; | 128 | return 0; |
117 | } | 129 | } |
diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h index 5645a878faec..eeda91774c8a 100644 --- a/include/uapi/drm/radeon_drm.h +++ b/include/uapi/drm/radeon_drm.h | |||
@@ -917,6 +917,7 @@ struct drm_radeon_gem_va { | |||
917 | /* The second dword of RADEON_CHUNK_ID_FLAGS is a uint32 that sets the ring type */ | 917 | /* The second dword of RADEON_CHUNK_ID_FLAGS is a uint32 that sets the ring type */ |
918 | #define RADEON_CS_RING_GFX 0 | 918 | #define RADEON_CS_RING_GFX 0 |
919 | #define RADEON_CS_RING_COMPUTE 1 | 919 | #define RADEON_CS_RING_COMPUTE 1 |
920 | #define RADEON_CS_RING_DMA 2 | ||
920 | /* The third dword of RADEON_CHUNK_ID_FLAGS is a sint32 that sets the priority */ | 921 | /* The third dword of RADEON_CHUNK_ID_FLAGS is a sint32 that sets the priority */ |
921 | /* 0 = normal, + = higher priority, - = lower priority */ | 922 | /* 0 = normal, + = higher priority, - = lower priority */ |
922 | 923 | ||