diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-08-14 02:14:23 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-08-14 02:14:23 +0200 |
| commit | e1474e7bdf6b16db41cc12b8e7b3fefd8668f3cf (patch) | |
| tree | 6b6c5a2d79c36e7e06993d608b4ffd3c3222afd4 /drivers/gpu/drm/sti/sti_crtc.h | |
| parent | Merge tag 'topic/drm-misc-2015-08-13' of git://anongit.freedesktop.org/drm-in... (diff) | |
| parent | drm/sti: atomic crtc/plane update (diff) | |
| download | linux-e1474e7bdf6b16db41cc12b8e7b3fefd8668f3cf.tar.xz linux-e1474e7bdf6b16db41cc12b8e7b3fefd8668f3cf.zip | |
Merge branch 'drm-sti-next-atomic-2015-08-11' of http://git.linaro.org/people/benjamin.gaignard/kernel into drm-next
This serie of patches fix minor bugs around how driver sub-components are
bind and planes z-ordering.
The main part is about atomic support: using more atomic helpers allow us
to simplify the code (~300 lines removed) and to ahve a better match between
drm concepts (planes and crtc) and hardware split.
[airlied: fixed up conflict in atomic code]
* 'drm-sti-next-atomic-2015-08-11' of http://git.linaro.org/people/benjamin.gaignard/kernel:
drm/sti: atomic crtc/plane update
drm/sti: rename files and functions
drm/sti: code clean up
drm/sti: fix dynamic z-ordering
drm: sti: fix sub-components bind
Diffstat (limited to 'drivers/gpu/drm/sti/sti_crtc.h')
| -rw-r--r-- | drivers/gpu/drm/sti/sti_crtc.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/drivers/gpu/drm/sti/sti_crtc.h b/drivers/gpu/drm/sti/sti_crtc.h new file mode 100644 index 000000000000..51963e6ddbe7 --- /dev/null +++ b/drivers/gpu/drm/sti/sti_crtc.h @@ -0,0 +1,22 @@ +/* + * Copyright (C) STMicroelectronics SA 2014 + * Author: Benjamin Gaignard <benjamin.gaignard@st.com> for STMicroelectronics. + * License terms: GNU General Public License (GPL), version 2 + */ + +#ifndef _STI_CRTC_H_ +#define _STI_CRTC_H_ + +#include <drm/drmP.h> + +struct sti_mixer; + +int sti_crtc_init(struct drm_device *drm_dev, struct sti_mixer *mixer, + struct drm_plane *primary, struct drm_plane *cursor); +int sti_crtc_enable_vblank(struct drm_device *dev, int crtc); +void sti_crtc_disable_vblank(struct drm_device *dev, int crtc); +int sti_crtc_vblank_cb(struct notifier_block *nb, + unsigned long event, void *data); +bool sti_crtc_is_main(struct drm_crtc *drm_crtc); + +#endif |