Merge tag 'pm+acpi-3.17-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / drm_prime.c

diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c
index 304ca8cacbc44f3cb27829551a4ead61472c5171..99d578bad17eabc26d972fab1c4e475f9ba46096 100644 (file)
--- a/drivers/gpu/drm/drm_prime.c
+++ b/drivers/gpu/drm/drm_prime.c
@@ -336,7 +336,13 @@ static const struct dma_buf_ops drm_gem_prime_dmabuf_ops =  {
 struct dma_buf *drm_gem_prime_export(struct drm_device *dev,
                                     struct drm_gem_object *obj, int flags)
 {
-       return dma_buf_export(obj, &drm_gem_prime_dmabuf_ops, obj->size, flags);
+       struct reservation_object *robj = NULL;
+
+       if (dev->driver->gem_prime_res_obj)
+               robj = dev->driver->gem_prime_res_obj(obj);
+
+       return dma_buf_export(obj, &drm_gem_prime_dmabuf_ops, obj->size,
+                             flags, robj);
 }
 EXPORT_SYMBOL(drm_gem_prime_export);