diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-03-24 01:41:59 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-03-24 01:41:59 +0300 |
| commit | 17efca93c8728445522dedafc033b3384a26a39d (patch) | |
| tree | 44c3b4a4e24a202077f4746fb240c850d86f8853 /drivers/gpu/drm/udl/udl_fb.c | |
| parent | 568d7c764ae01f3706085ac8f0d8a8ac7e826bd7 (diff) | |
| parent | b47bcb93bbf201e9c5af698945755efeb60c0bc8 (diff) | |
| download | linux-17efca93c8728445522dedafc033b3384a26a39d.tar.xz | |
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/udl/udl_fb.c')
| -rw-r--r-- | drivers/gpu/drm/udl/udl_fb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c index c427499133d6..33239a2b264a 100644 --- a/drivers/gpu/drm/udl/udl_fb.c +++ b/drivers/gpu/drm/udl/udl_fb.c @@ -423,8 +423,8 @@ static int udl_user_framebuffer_dirty(struct drm_framebuffer *fb, } if (ufb->obj->base.import_attach) { - dma_buf_end_cpu_access(ufb->obj->base.import_attach->dmabuf, - DMA_FROM_DEVICE); + ret = dma_buf_end_cpu_access(ufb->obj->base.import_attach->dmabuf, + DMA_FROM_DEVICE); } unlock: |