diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-01-28 09:34:27 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-01-28 09:34:27 +1000 |
| commit | 21773f16f2cb3c056051c679da542f0b494252e2 (patch) | |
| tree | 362e701c962f8a78978775ff3e4093b490ee0cd1 /include/drm/drm_atomic_helper.h | |
| parent | 2f5b4ef15c60bc5292a3f006c018acb3da53737b (diff) | |
| parent | 9469244d869623e8b54d9f3d4d00737e377af273 (diff) | |
Merge tag 'topic/atomic-core-2015-01-27' of git://anongit.freedesktop.org/drm-intel into drm-next
* tag 'topic/atomic-core-2015-01-27' of git://anongit.freedesktop.org/drm-intel:
drm/atomic: Fix potential use of state after free
drm/atomic-helper: debug output for modesets
drm/atomic-helpers: Saner encoder/crtc callbacks
drm/atomic-helpers: Recover full cursor plane behaviour
drm/atomic-helper: add connector->dpms() implementation
drm/atomic: Add drm_crtc_state->active
drm: Add standardized boolean props
drm/plane-helper: Fix transitional helper kerneldocs
drm/plane-helper: Skip prepare_fb/cleanup_fb when newfb==oldfb
Conflicts:
include/drm/drm_crtc_helper.h
Diffstat (limited to 'include/drm/drm_atomic_helper.h')
| -rw-r--r-- | include/drm/drm_atomic_helper.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h index a0ea4ded3cb5..8039d54a7441 100644 --- a/include/drm/drm_atomic_helper.h +++ b/include/drm/drm_atomic_helper.h @@ -82,6 +82,8 @@ int drm_atomic_helper_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb, struct drm_pending_vblank_event *event, uint32_t flags); +void drm_atomic_helper_connector_dpms(struct drm_connector *connector, + int mode); /* default implementations for state handling */ void drm_atomic_helper_crtc_reset(struct drm_crtc *crtc); |