diff options
| author | Keith Packard <keithp@neko.keithp.com> | 2007-07-13 10:58:06 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@neko.keithp.com> | 2007-07-13 13:39:36 -0700 |
| commit | 00f4587025a3879626623135b0a153fcdb906719 (patch) | |
| tree | e7fd6319f676a077e3b95912a98968d4b62b3707 /src/i830_display.h | |
| parent | 6f18300aed1340348c6d395f326061b5315be643 (diff) | |
Ensure pipe/output active before doing load detection.
If the pipe or output have been set to DPMSOff, then load detection will not
work correctly. Also, share the load detection configuration code between
crt and tv outputs.
Diffstat (limited to 'src/i830_display.h')
| -rw-r--r-- | src/i830_display.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i830_display.h b/src/i830_display.h index 07dfe93a..1eeb7f15 100644 --- a/src/i830_display.h +++ b/src/i830_display.h @@ -32,8 +32,8 @@ void i830PipeSetBase(xf86CrtcPtr crtc, int x, int y); void i830WaitForVblank(ScrnInfoPtr pScrn); void i830DescribeOutputConfiguration(ScrnInfoPtr pScrn); -xf86CrtcPtr i830GetLoadDetectPipe(xf86OutputPtr output); -void i830ReleaseLoadDetectPipe(xf86OutputPtr output); +xf86CrtcPtr i830GetLoadDetectPipe(xf86OutputPtr output, DisplayModePtr mode, int *dpms_mode); +void i830ReleaseLoadDetectPipe(xf86OutputPtr output, int dpms_mode); void i830_crtc_init(ScrnInfoPtr pScrn, int pipe); void i830_crtc_load_lut(xf86CrtcPtr crtc); DisplayModePtr i830_crtc_mode_get(ScrnInfoPtr pScrn, xf86CrtcPtr crtc); |