diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-03-23 23:41:59 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-03-23 23:41:59 +0100 |
| commit | 17efca93c8728445522dedafc033b3384a26a39d (patch) | |
| tree | 44c3b4a4e24a202077f4746fb240c850d86f8853 /drivers/gpu/drm/drm_atomic.c | |
| parent | drm/amdgpu: release_pages requires linux/pagemap.h (diff) | |
| parent | dma-buf/fence: fix fence_is_later v2 (diff) | |
| download | linux-17efca93c8728445522dedafc033b3384a26a39d.tar.xz 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/drm_atomic.c')
| -rw-r--r-- | drivers/gpu/drm/drm_atomic.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index a2596eb803fc..8ee1db866e80 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -380,7 +380,6 @@ EXPORT_SYMBOL(drm_atomic_set_mode_prop_for_crtc); * drm_atomic_replace_property_blob - replace a blob property * @blob: a pointer to the member blob to be replaced * @new_blob: the new blob to replace with - * @expected_size: the expected size of the new blob * @replaced: whether the blob has been replaced * * RETURNS: |