diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2019-01-23 01:51:36 +0300 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2019-01-23 01:51:36 +0300 |
| commit | f42fb2317ffcbd005eeb22b1e49020821a11e23a (patch) | |
| tree | d89ccd0c9086c492a32da7ce4c2486c99ed3e805 /include/drm/drm_crtc_helper.h | |
| parent | 25f9cebd7a52ddf15405d74fb5fd4c374f301983 (diff) | |
| parent | f164a94c2c87752caeb1a3cbe068c440e7f7921f (diff) | |
| download | linux-f42fb2317ffcbd005eeb22b1e49020821a11e23a.tar.xz | |
Merge drm/drm-next into drm-intel-next-queued
We need avi infoframe stuff who got merged via drm-misc
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'include/drm/drm_crtc_helper.h')
| -rw-r--r-- | include/drm/drm_crtc_helper.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h index d65f034843ce..0ee9a96b70da 100644 --- a/include/drm/drm_crtc_helper.h +++ b/include/drm/drm_crtc_helper.h @@ -56,6 +56,7 @@ bool drm_helper_encoder_in_use(struct drm_encoder *encoder); int drm_helper_connector_dpms(struct drm_connector *connector, int mode); void drm_helper_resume_force_mode(struct drm_device *dev); +int drm_helper_force_disable_all(struct drm_device *dev); /* drm_probe_helper.c */ int drm_helper_probe_single_connector_modes(struct drm_connector |