diff options
author | Dave Airlie <airlied@redhat.com> | 2010-06-01 11:32:06 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-06-01 11:32:06 +1000 |
commit | afa3b60c905f606e8245115474d77787035e02eb (patch) | |
tree | f9ff2222404da700c7bbe651ce63d4e1d6e9456f /include/drm | |
parent | c09a35028567ae2c11d627bf69134b87a3c0efae (diff) | |
parent | fbf81762e385d3d45acad057b654d56972acf58c (diff) | |
download | op-kernel-dev-afa3b60c905f606e8245115474d77787035e02eb.zip op-kernel-dev-afa3b60c905f606e8245115474d77787035e02eb.tar.gz |
Merge branch 'drm-switcheroo-fixes' into drm-testing
* drm-switcheroo-fixes:
drm/kms: disable/enable poll around switcheroo on/off
drm/nouveau: fixup confusion over which handle the DSM is hanging off.
drm/nouveau: attempt to get bios from ACPI v3
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/drm_crtc_helper.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h index dc5873c..1121f77 100644 --- a/include/drm/drm_crtc_helper.h +++ b/include/drm/drm_crtc_helper.h @@ -130,4 +130,7 @@ extern int drm_helper_resume_force_mode(struct drm_device *dev); extern void drm_kms_helper_poll_init(struct drm_device *dev); extern void drm_kms_helper_poll_fini(struct drm_device *dev); extern void drm_helper_hpd_irq_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); #endif |