diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-10-02 03:47:29 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-10-02 03:47:29 +0300 |
| commit | ec403b89e3152f93199b7b1813148bcdf6829311 (patch) | |
| tree | 65c9140f32b844f9dd4f13aa62920c7b8f70103d /include | |
| parent | 62886a367b59d7740f9db89fd418ab3e450ab7c7 (diff) | |
| parent | b94be972538f4523f09243af7c726158f0bfae33 (diff) | |
| download | linux-ec403b89e3152f93199b7b1813148bcdf6829311.tar.xz | |
Merge tag 'drm-intel-fixes-2015-10-01' of git://anongit.freedesktop.org/drm-intel into drm-fixes
a few i915 fixes for v4.3.
* tag 'drm-intel-fixes-2015-10-01' of git://anongit.freedesktop.org/drm-intel:
drm/i915: Call non-locking version of drm_kms_helper_poll_enable(), v2
drm: Add a non-locking version of drm_kms_helper_poll_enable(), v2
drm/i915: Consider HW CSB write pointer before resetting the sw read pointer
drm/i915/skl: Don't call intel_prepare_ddi when encoder list isn't yet initialized.
Diffstat (limited to 'include')
| -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 2a747a91fded..3febb4b9fce9 100644 --- a/include/drm/drm_crtc_helper.h +++ b/include/drm/drm_crtc_helper.h @@ -240,5 +240,6 @@ extern void drm_kms_helper_hotplug_event(struct drm_device *dev); extern void drm_kms_helper_poll_disable(struct drm_device *dev); extern void drm_kms_helper_poll_enable(struct drm_device *dev); +extern void drm_kms_helper_poll_enable_locked(struct drm_device *dev); #endif |