diff options
author | Maarten Lankhorst <m.b.lankhorst@gmail.com> | 2013-06-27 07:38:18 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-06-27 21:55:11 -0400 |
commit | 280cf211867539a7b6912d3a3573ef692ae66b61 (patch) | |
tree | 9380d0da6dbcfc0457d456979acec81879dd3142 /drivers/gpu | |
parent | 5b0207bb59b26a8cb5b53f13c99c67eb0d2a7abb (diff) |
drm/radeon: implement unpin function, v2
Changes since v1:
- Fixup compiler warning in unpin function.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_drv.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_prime.c | 18 |
2 files changed, 15 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 00cc52e601fe..e5419b350170 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c | |||
@@ -128,6 +128,7 @@ struct drm_gem_object *radeon_gem_prime_import_sg_table(struct drm_device *dev, | |||
128 | size_t size, | 128 | size_t size, |
129 | struct sg_table *sg); | 129 | struct sg_table *sg); |
130 | int radeon_gem_prime_pin(struct drm_gem_object *obj); | 130 | int radeon_gem_prime_pin(struct drm_gem_object *obj); |
131 | void radeon_gem_prime_unpin(struct drm_gem_object *obj); | ||
131 | void *radeon_gem_prime_vmap(struct drm_gem_object *obj); | 132 | void *radeon_gem_prime_vmap(struct drm_gem_object *obj); |
132 | void radeon_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr); | 133 | void radeon_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr); |
133 | extern long radeon_kms_compat_ioctl(struct file *filp, unsigned int cmd, | 134 | extern long radeon_kms_compat_ioctl(struct file *filp, unsigned int cmd, |
@@ -427,6 +428,7 @@ static struct drm_driver kms_driver = { | |||
427 | .gem_prime_export = drm_gem_prime_export, | 428 | .gem_prime_export = drm_gem_prime_export, |
428 | .gem_prime_import = drm_gem_prime_import, | 429 | .gem_prime_import = drm_gem_prime_import, |
429 | .gem_prime_pin = radeon_gem_prime_pin, | 430 | .gem_prime_pin = radeon_gem_prime_pin, |
431 | .gem_prime_unpin = radeon_gem_prime_unpin, | ||
430 | .gem_prime_get_sg_table = radeon_gem_prime_get_sg_table, | 432 | .gem_prime_get_sg_table = radeon_gem_prime_get_sg_table, |
431 | .gem_prime_import_sg_table = radeon_gem_prime_import_sg_table, | 433 | .gem_prime_import_sg_table = radeon_gem_prime_import_sg_table, |
432 | .gem_prime_vmap = radeon_gem_prime_vmap, | 434 | .gem_prime_vmap = radeon_gem_prime_vmap, |
diff --git a/drivers/gpu/drm/radeon/radeon_prime.c b/drivers/gpu/drm/radeon/radeon_prime.c index 4940af7e75e6..65b9eabd5a2f 100644 --- a/drivers/gpu/drm/radeon/radeon_prime.c +++ b/drivers/gpu/drm/radeon/radeon_prime.c | |||
@@ -88,11 +88,19 @@ int radeon_gem_prime_pin(struct drm_gem_object *obj) | |||
88 | 88 | ||
89 | /* pin buffer into GTT */ | 89 | /* pin buffer into GTT */ |
90 | ret = radeon_bo_pin(bo, RADEON_GEM_DOMAIN_GTT, NULL); | 90 | ret = radeon_bo_pin(bo, RADEON_GEM_DOMAIN_GTT, NULL); |
91 | if (ret) { | ||
92 | radeon_bo_unreserve(bo); | ||
93 | return ret; | ||
94 | } | ||
95 | radeon_bo_unreserve(bo); | 91 | radeon_bo_unreserve(bo); |
92 | return ret; | ||
93 | } | ||
94 | |||
95 | void radeon_gem_prime_unpin(struct drm_gem_object *obj) | ||
96 | { | ||
97 | struct radeon_bo *bo = gem_to_radeon_bo(obj); | ||
98 | int ret = 0; | ||
96 | 99 | ||
97 | return 0; | 100 | ret = radeon_bo_reserve(bo, false); |
101 | if (unlikely(ret != 0)) | ||
102 | return; | ||
103 | |||
104 | radeon_bo_unpin(bo); | ||
105 | radeon_bo_unreserve(bo); | ||
98 | } | 106 | } |