diff options
author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2014-01-09 05:03:14 -0500 |
---|---|---|
committer | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2014-09-30 08:04:00 -0400 |
commit | b5e9c1a25fcf8a0d664606251a53b5caa6a19d08 (patch) | |
tree | 5cb0d5645e575253779965ecf326b578fa1ce9ca /drivers/gpu/drm/drm_prime.c | |
parent | 15a996bbb6978ae21c497aeadfe20deca6ddd07a (diff) |
drm: Pass dma-buf as argument to gem_prime_import_sg_table
Allows importing dma_reservation_objects from a dma-buf.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Diffstat (limited to 'drivers/gpu/drm/drm_prime.c')
-rw-r--r-- | drivers/gpu/drm/drm_prime.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index 7826de9da276..78ca30808422 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c | |||
@@ -525,7 +525,7 @@ struct drm_gem_object *drm_gem_prime_import(struct drm_device *dev, | |||
525 | goto fail_detach; | 525 | goto fail_detach; |
526 | } | 526 | } |
527 | 527 | ||
528 | obj = dev->driver->gem_prime_import_sg_table(dev, dma_buf->size, sgt); | 528 | obj = dev->driver->gem_prime_import_sg_table(dev, attach, sgt); |
529 | if (IS_ERR(obj)) { | 529 | if (IS_ERR(obj)) { |
530 | ret = PTR_ERR(obj); | 530 | ret = PTR_ERR(obj); |
531 | goto fail_unmap; | 531 | goto fail_unmap; |