summaryrefslogtreecommitdiffstats
path: root/include/drm
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2016-05-17 07:06:14 +1000
committerDave Airlie <airlied@redhat.com>2016-05-17 07:06:14 +1000
commit99ee87295017e36abb6925e6139ca303cb55aee7 (patch)
tree259fb5d2fd348147fd17378fdbf98761c32116e5 /include/drm
parent76e9cab5403809fa1fa6f698d2f7c1b7dd224022 (diff)
parent9ecb549867d7f642f0379f574f0e52870009a8bf (diff)
downloadop-kernel-dev-99ee87295017e36abb6925e6139ca303cb55aee7.zip
op-kernel-dev-99ee87295017e36abb6925e6139ca303cb55aee7.tar.gz
Merge tag 'topic/drm-misc-2016-05-13' of git://anongit.freedesktop.org/drm-intel into drm-next
I kinda hoped that I could still sneak in Noralf's drm_simple_display_pipe, since there's intereset by others now (for tilcdc at least). But it wasn't ready by a hair. Oh well. Otherwise random stuff plus prep patches from Noralf. * tag 'topic/drm-misc-2016-05-13' of git://anongit.freedesktop.org/drm-intel: drm/atomic: Add drm_atomic_helper_best_encoder() drm/atomic: Don't skip drm_bridge_*() calls if !drm_encoder_helper_funcs drm/fb-cma-helper: Hook up to DocBook and fix some docs drm/fb-helper: Remove mention of CONFIG_FB_DEFERRED_IO in docs drm/sti: include linux/seq_file.h where needed drm/tegra: Use lockless gem BO free callback drm/exynos: Use lockless gem BO free callback drm: Make drm_encoder_helper_funcs optional
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/drm_atomic_helper.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h
index 0364287..ccca709 100644
--- a/include/drm/drm_atomic_helper.h
+++ b/include/drm/drm_atomic_helper.h
@@ -110,6 +110,8 @@ int drm_atomic_helper_page_flip(struct drm_crtc *crtc,
uint32_t flags);
int drm_atomic_helper_connector_dpms(struct drm_connector *connector,
int mode);
+struct drm_encoder *
+drm_atomic_helper_best_encoder(struct drm_connector *connector);
/* default implementations for state handling */
void drm_atomic_helper_crtc_reset(struct drm_crtc *crtc);
OpenPOWER on IntegriCloud