diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2012-05-10 18:33:13 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-05-23 05:47:11 -0400 |
commit | 40f5cf996991577ec65d36cd3599cca7ec5d87d3 (patch) | |
tree | 903797b4e09b9444450fb35b4101c1fd9b8530b0 /drivers/gpu/drm/radeon/r600.c | |
parent | 1286ff7397737e407cdd8e5cd574318db177ba1f (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/r600.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index ab5d6f2a06c2..f388a1d73b63 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c | |||
@@ -1231,7 +1231,7 @@ int r600_vram_scratch_init(struct radeon_device *rdev) | |||
1231 | if (rdev->vram_scratch.robj == NULL) { | 1231 | if (rdev->vram_scratch.robj == NULL) { |
1232 | r = radeon_bo_create(rdev, RADEON_GPU_PAGE_SIZE, | 1232 | r = radeon_bo_create(rdev, RADEON_GPU_PAGE_SIZE, |
1233 | PAGE_SIZE, true, RADEON_GEM_DOMAIN_VRAM, | 1233 | PAGE_SIZE, true, RADEON_GEM_DOMAIN_VRAM, |
1234 | &rdev->vram_scratch.robj); | 1234 | NULL, &rdev->vram_scratch.robj); |
1235 | if (r) { | 1235 | if (r) { |
1236 | return r; | 1236 | return r; |
1237 | } | 1237 | } |
@@ -2769,7 +2769,7 @@ int r600_ih_ring_alloc(struct radeon_device *rdev) | |||
2769 | r = radeon_bo_create(rdev, rdev->ih.ring_size, | 2769 | r = radeon_bo_create(rdev, rdev->ih.ring_size, |
2770 | PAGE_SIZE, true, | 2770 | PAGE_SIZE, true, |
2771 | RADEON_GEM_DOMAIN_GTT, | 2771 | RADEON_GEM_DOMAIN_GTT, |
2772 | &rdev->ih.ring_obj); | 2772 | NULL, &rdev->ih.ring_obj); |
2773 | if (r) { | 2773 | if (r) { |
2774 | DRM_ERROR("radeon: failed to create ih ring buffer (%d).\n", r); | 2774 | DRM_ERROR("radeon: failed to create ih ring buffer (%d).\n", r); |
2775 | return r; | 2775 | return r; |