diff options
| author | Keith Packard <keithp@neko.keithp.com> | 2006-11-30 14:09:31 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@neko.keithp.com> | 2006-11-30 14:09:31 -0800 |
| commit | ff64bc7397cafbec94e388e1625b3a1999f1aca7 (patch) | |
| tree | fdd9d519c382e39dd02be9fad341f31e668a047f /src/i830_display.h | |
| parent | b94b7c4bcfdb7ba59ed818f72309b5060a2ab7ee (diff) | |
| parent | 16e01b117bb7ae90b150dd4f25a887dd895cf473 (diff) | |
Merge branch 'restructure-outputs' into modesetting.
Outputs and Crtcs now have a driver-independent representation which should
permit generic code to control RandR 1.2 and startup configuration.
Diffstat (limited to 'src/i830_display.h')
| -rw-r--r-- | src/i830_display.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/i830_display.h b/src/i830_display.h index 266d0b28..c80c3f72 100644 --- a/src/i830_display.h +++ b/src/i830_display.h @@ -29,17 +29,18 @@ /* i830_display.c */ DisplayModePtr -i830PipeFindClosestMode(ScrnInfoPtr pScrn, int pipe, DisplayModePtr pMode); -Bool i830PipeSetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode, int pipe, +i830PipeFindClosestMode(xf86CrtcPtr crtc, DisplayModePtr pMode); +Bool i830PipeSetMode(xf86CrtcPtr crtc, DisplayModePtr pMode, Bool plane_enable); void i830DisableUnusedFunctions(ScrnInfoPtr pScrn); Bool i830SetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode); -void i830PipeSetBase(ScrnInfoPtr pScrn, int pipe, int x, int y); +void i830PipeSetBase(xf86CrtcPtr crtc, int x, int y); void i830WaitForVblank(ScrnInfoPtr pScrn); void i830DescribeOutputConfiguration(ScrnInfoPtr pScrn); -int i830GetLoadDetectPipe(ScrnInfoPtr pScrn, I830OutputPtr output); -void i830ReleaseLoadDetectPipe(ScrnInfoPtr pScrn, I830OutputPtr output); -Bool i830PipeInUse(ScrnInfoPtr pScrn, int pipe); + +xf86CrtcPtr i830GetLoadDetectPipe(xf86OutputPtr output); +void i830ReleaseLoadDetectPipe(xf86OutputPtr output); +Bool i830PipeInUse(xf86CrtcPtr crtc); /** @{ */ @@ -51,4 +52,3 @@ DisplayModePtr i830_xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, #define xf86CVTMode i830_xf86CVTMode #endif /* XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,1,99,2) */ /** @} */ - |