aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_ring.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2012-05-10 18:33:13 -0400
committerDave Airlie <airlied@redhat.com>2012-05-23 05:47:11 -0400
commit40f5cf996991577ec65d36cd3599cca7ec5d87d3 (patch)
tree903797b4e09b9444450fb35b4101c1fd9b8530b0 /drivers/gpu/drm/radeon/radeon_ring.c
parent1286ff7397737e407cdd8e5cd574318db177ba1f (diff)
drm/radeon: add PRIME support (v2)
This adds prime->fd and fd->prime support to radeon. It passes the sg object to ttm and then populates the gart entries using it. Compile tested only. v2: stub kmap + use new helpers + add reimporting Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Jerome Glisse <jglisse@redhat.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_ring.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_ring.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index a5dee76f4eb..493a7be7530 100644
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -390,8 +390,8 @@ int radeon_ring_init(struct radeon_device *rdev, struct radeon_ring *ring, unsig
390 /* Allocate ring buffer */ 390 /* Allocate ring buffer */
391 if (ring->ring_obj == NULL) { 391 if (ring->ring_obj == NULL) {
392 r = radeon_bo_create(rdev, ring->ring_size, PAGE_SIZE, true, 392 r = radeon_bo_create(rdev, ring->ring_size, PAGE_SIZE, true,
393 RADEON_GEM_DOMAIN_GTT, 393 RADEON_GEM_DOMAIN_GTT,
394 &ring->ring_obj); 394 NULL, &ring->ring_obj);
395 if (r) { 395 if (r) {
396 dev_err(rdev->dev, "(%d) ring create failed\n", r); 396 dev_err(rdev->dev, "(%d) ring create failed\n", r);
397 return r; 397 return r;