Merge branch 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux into drm...

[karo-tx-linux.git] / drivers / gpu / drm / radeon / radeon_prime.c

diff --git a/drivers/gpu/drm/radeon/radeon_prime.c b/drivers/gpu/drm/radeon/radeon_prime.c
index bb18bc74b7d7d0a64bd6b596030b18ce48b92d92..d5414d42e44bf743fa289557af93bc5f02702b97 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_prime.c
+++ b/drivers/gpu/drm/radeon/radeon_prime.c
@@ -104,6 +104,14 @@ void radeon_gem_prime_unpin(struct drm_gem_object *obj)
        radeon_bo_unreserve(bo);
 }
 
+
+struct reservation_object *radeon_gem_prime_res_obj(struct drm_gem_object *obj)
+{
+       struct radeon_bo *bo = gem_to_radeon_bo(obj);
+
+       return bo->tbo.resv;
+}
+
 struct dma_buf *radeon_gem_prime_export(struct drm_device *dev,
                                        struct drm_gem_object *gobj,
                                        int flags)