diff options
author | Dave Airlie <airlied@redhat.com> | 2017-02-16 13:27:55 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-02-16 13:27:55 +1000 |
commit | b7bc0daa889e65db202f3222f5b69b5c80d4070f (patch) | |
tree | 733f6ebe15dc5d53441e6fe21e464ba39b3e6b31 /drivers/gpu/drm/drm_crtc_internal.h | |
parent | 1e9d996645401f1a5bd6473e229a4d41575fc478 (diff) | |
parent | 1592364de3912dad264262f4bcc61552984c9523 (diff) |
Merge tag 'drm-misc-next-fixes-2017-02-15' of git://anongit.freedesktop.org/git/drm-misc into drm-next
Fixes for the v4.11 merge window.
* tag 'drm-misc-next-fixes-2017-02-15' of git://anongit.freedesktop.org/git/drm-misc:
drm: Resurrect atomic rmfb code, v3
uapi: add missing install of dma-buf.h
Diffstat (limited to 'drivers/gpu/drm/drm_crtc_internal.h')
-rw-r--r-- | drivers/gpu/drm/drm_crtc_internal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h index 955c5690bf64..e0678f8a51cf 100644 --- a/drivers/gpu/drm/drm_crtc_internal.h +++ b/drivers/gpu/drm/drm_crtc_internal.h @@ -183,6 +183,7 @@ int drm_atomic_get_property(struct drm_mode_object *obj, struct drm_property *property, uint64_t *val); int drm_mode_atomic_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); +int drm_atomic_remove_fb(struct drm_framebuffer *fb); /* drm_plane.c */ |