diff options
author | Dave Airlie <airlied@redhat.com> | 2016-03-24 08:41:59 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2016-03-24 08:41:59 +1000 |
commit | 17efca93c8728445522dedafc033b3384a26a39d (patch) | |
tree | 44c3b4a4e24a202077f4746fb240c850d86f8853 /drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | |
parent | 568d7c764ae01f3706085ac8f0d8a8ac7e826bd7 (diff) | |
parent | b47bcb93bbf201e9c5af698945755efeb60c0bc8 (diff) | |
download | blackbird-obmc-linux-17efca93c8728445522dedafc033b3384a26a39d.tar.gz blackbird-obmc-linux-17efca93c8728445522dedafc033b3384a26a39d.zip |
Merge tag 'topic/drm-misc-2016-03-22' of git://anongit.freedesktop.org/drm-intel into drm-next
Bunch of small fixupes all over. Plus a dma-buf patch that Sumit asked me
to cherry-pick since that's the only one he had in his tree.
There's a sparse issue outstanding in the color mgr stuff, but Lionel is
still working on something that actually appeases sparse.
* tag 'topic/drm-misc-2016-03-22' of git://anongit.freedesktop.org/drm-intel:
dma-buf/fence: fix fence_is_later v2
dma-buf: Update docs for SYNC ioctl
drm: remove excess description
dma-buf, drm, ion: Propagate error code from dma_buf_start_cpu_access()
drm/atmel-hlcdc: use helper to get crtc state
drm/atomic: use helper to get crtc state
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c')
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c index 3cf8aab23a39..af267c35d813 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c +++ b/drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c @@ -97,11 +97,12 @@ static int omap_gem_dmabuf_begin_cpu_access(struct dma_buf *buffer, return omap_gem_get_pages(obj, &pages, true); } -static void omap_gem_dmabuf_end_cpu_access(struct dma_buf *buffer, - enum dma_data_direction dir) +static int omap_gem_dmabuf_end_cpu_access(struct dma_buf *buffer, + enum dma_data_direction dir) { struct drm_gem_object *obj = buffer->priv; omap_gem_put_pages(obj); + return 0; } |