diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-05-31 21:32:06 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-05-31 21:32:06 -0400 |
| commit | afa3b60c905f606e8245115474d77787035e02eb (patch) | |
| tree | f9ff2222404da700c7bbe651ce63d4e1d6e9456f /include/drm | |
| parent | c09a35028567ae2c11d627bf69134b87a3c0efae (diff) | |
| parent | fbf81762e385d3d45acad057b654d56972acf58c (diff) | |
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 dc5873c21e45..1121f7799c6f 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); | |||
| 130 | extern void drm_kms_helper_poll_init(struct drm_device *dev); | 130 | extern void drm_kms_helper_poll_init(struct drm_device *dev); |
| 131 | extern void drm_kms_helper_poll_fini(struct drm_device *dev); | 131 | extern void drm_kms_helper_poll_fini(struct drm_device *dev); |
| 132 | extern void drm_helper_hpd_irq_event(struct drm_device *dev); | 132 | extern void drm_helper_hpd_irq_event(struct drm_device *dev); |
| 133 | |||
| 134 | extern void drm_kms_helper_poll_disable(struct drm_device *dev); | ||
| 135 | extern void drm_kms_helper_poll_enable(struct drm_device *dev); | ||
| 133 | #endif | 136 | #endif |