aboutsummaryrefslogtreecommitdiffstats
path: root/include/drm/drm_crtc.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2014-03-03 16:51:41 -0500
committerDave Airlie <airlied@redhat.com>2014-03-03 16:51:41 -0500
commit4d33f3aa1cc7869c5ea4d57f3715b37bdcf515db (patch)
treec729ca22b60ba7fb7d3ce13c1f1d37f312a588f9 /include/drm/drm_crtc.h
parent4d538b79197901fecc42e746d515d07fd1089b62 (diff)
parent4c0e552882114d1edb588242d45035246ab078a0 (diff)
Merge tag 'drm-intel-next-2014-02-14' of ssh://git.freedesktop.org/git/drm-intel into drm-next
- Fix the execbuf rebind performance regression due to topic/ppgtt (Chris). - Fix up the connector cleanup ordering for sdvod i2c and dp aux devices (Imre). - Try to preserve the firmware modeset config on driver load. And a bit of prep work for smooth takeover of the fb contents (Jesse). - Prep cleanup for larger gtt address spaces on bdw (Ben). - Improve our vblank_wait code to make hsw modesets faster (Paulo). - Display debugfs file (Jesse). - DRRS prep work from Vandana Kannan. - pipestat interrupt handler to fix a few races around vblank/pageflip handling on byt (Imre). - Improve display fuse handling for display-less SKUs (Damien). - Drop locks while stalling for the gpu when serving pagefaults to improve interactivity (Chris). - And as usual piles of other improvements and small fixes all over. * tag 'drm-intel-next-2014-02-14' of ssh://git.freedesktop.org/git/drm-intel: (65 commits) drm/i915: fix NULL deref in the load detect code drm/i915: Only bind each object rather than for every execbuffer drm/i915: Directly return the vma from bind_to_vm drm/i915: Simplify i915_gem_object_ggtt_unpin drm/i915: Allow blocking in the PDE alloc when running low on gtt space drm/i915: Don't allocate context pages as mappable drm/i915: Handle set_cache_level errors in the status page setup drm/i915: Don't pin the status page as mappable drm/i915: Don't set PIN_MAPPABLE for legacy ringbuffers drm/i915: Handle set_cache_level errors in the pipe control scratch setup drm/i915: split PIN_GLOBAL out from PIN_MAPPABLE drm/i915: Consolidate binding parameters into flags drm/i915: sdvo: add i2c sysfs symlink to the connector's directory drm/i915: sdvo: fix error path in sdvo_connector_init drm/i915: dp: fix order of dp aux i2c device cleanup drm/i915: add unregister callback to connector drm/i915: don't reference null pointer at i915_sink_crc drm/i915/lvds: Remove dead code from failing case drm/i915: don't preserve inherited configs with nothing on v2 drm/i915/bdw: Split up PPGTT cleanup ...
Diffstat (limited to 'include/drm/drm_crtc.h')
-rw-r--r--include/drm/drm_crtc.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 8f3dee097579..f7646548660d 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -994,6 +994,7 @@ extern void drm_encoder_cleanup(struct drm_encoder *encoder);
994 994
995extern const char *drm_get_connector_name(const struct drm_connector *connector); 995extern const char *drm_get_connector_name(const struct drm_connector *connector);
996extern const char *drm_get_connector_status_name(enum drm_connector_status status); 996extern const char *drm_get_connector_status_name(enum drm_connector_status status);
997extern const char *drm_get_subpixel_order_name(enum subpixel_order order);
997extern const char *drm_get_dpms_name(int val); 998extern const char *drm_get_dpms_name(int val);
998extern const char *drm_get_dvi_i_subconnector_name(int val); 999extern const char *drm_get_dvi_i_subconnector_name(int val);
999extern const char *drm_get_dvi_i_select_name(int val); 1000extern const char *drm_get_dvi_i_select_name(int val);