diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-10-11 22:07:38 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-10-11 22:07:38 +0200 |
| commit | 69405d3da98b48633b78a49403e4f9cdb7c6a0f5 (patch) | |
| tree | d2826882487ef3add220661cacad6885a3a3d7c3 /drivers/gpu/drm/udl/udl_dmabuf.c | |
| parent | Merge tag 'drm-intel-next-fixes-2016-10-11' of git://anongit.freedesktop.org/... (diff) | |
| parent | drm/crtc: constify drm_crtc_index parameter (diff) | |
| download | linux-69405d3da98b48633b78a49403e4f9cdb7c6a0f5.tar.xz linux-69405d3da98b48633b78a49403e4f9cdb7c6a0f5.zip | |
Merge tag 'topic/drm-misc-2016-10-11' of git://anongit.freedesktop.org/drm-intel into drm-next
Just flushing out my -misc queue. Slightly important are the prime
refcount/unload fixes from Chris.
There's also the reservation stuff from Chris still pending, and Sumits
hasn't landed that yet. Might get another pull for that, but pls don't
hold up the main pull for it ;-)
* tag 'topic/drm-misc-2016-10-11' of git://anongit.freedesktop.org/drm-intel:
drm/crtc: constify drm_crtc_index parameter
drm: use the right function name in documentation
drm: Release resources with a safer function
drm: Fix up kerneldoc for new drm_gem_dmabuf_export()
drm/bridge: Drop drm_connector_unregister and call drm_connector_cleanup directly
drm/fb-helper: fix sphinx markup for DRM_FB_HELPER_DEFAULT_OPS
drm/bridge: Add RGB to VGA bridge support
drm/prime: Take a ref on the drm_dev when exporting a dma_buf
drm/prime: Pass the right module owner through to dma_buf_export()
drm/bridge: Call drm_connector_cleanup directly
drm: simple_kms_helper: Add prepare_fb and cleanup_fb hooks
drm: Release resources with a safer function
Diffstat (limited to 'drivers/gpu/drm/udl/udl_dmabuf.c')
| -rw-r--r-- | drivers/gpu/drm/udl/udl_dmabuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/udl/udl_dmabuf.c b/drivers/gpu/drm/udl/udl_dmabuf.c index e2243edd1ce3..ac90ffdb5912 100644 --- a/drivers/gpu/drm/udl/udl_dmabuf.c +++ b/drivers/gpu/drm/udl/udl_dmabuf.c @@ -209,7 +209,7 @@ struct dma_buf *udl_gem_prime_export(struct drm_device *dev, exp_info.flags = flags; exp_info.priv = obj; - return dma_buf_export(&exp_info); + return drm_gem_dmabuf_export(dev, &exp_info); } static int udl_prime_create(struct drm_device *dev, |