diff options
| author | Keith Packard <keithp@neko.keithp.com> | 2007-01-15 08:05:32 +1100 |
|---|---|---|
| committer | Keith Packard <keithp@neko.keithp.com> | 2007-01-15 08:05:32 +1100 |
| commit | bfeda3bfc59d309772398f688d29452ba97f3973 (patch) | |
| tree | d1ee5f4430098d64f413b991ee54b35a6a34558d /src/i830_randr.c | |
| parent | da6a00f787e4d13e6b75768c1976f1c44ae5bf72 (diff) | |
Convert I830PipeSetMode to xf86CrtcSetMode. Add rotation structures.
Makes the mode setting logic device independent.
Magic rename hooks allow multiple drivers to provide the
generic code without name conflicts.
Rotation code requires special pixmap creation hook, and uses
Render to perform the actual rotation.
Diffstat (limited to 'src/i830_randr.c')
| -rw-r--r-- | src/i830_randr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/i830_randr.c b/src/i830_randr.c index 533322b2..d6df4190 100644 --- a/src/i830_randr.c +++ b/src/i830_randr.c @@ -541,7 +541,7 @@ xf86RandR12CrtcNotify (RRCrtcPtr randr_crtc) return FALSE; x = crtc->x; y = crtc->y; - rotation = RR_Rotate_0; + rotation = crtc->curRotation; numOutputs = 0; randr_mode = NULL; for (i = 0; i < config->num_output; i++) @@ -638,7 +638,7 @@ xf86RandR12CrtcSet (ScreenPtr pScreen, if (mode) { - if (!i830PipeSetMode (crtc, mode, TRUE)) + if (!xf86CrtcSetMode (crtc, mode, rotation)) { crtc->enabled = save_enabled; for (o = 0; o < config->num_output; o++) @@ -651,7 +651,7 @@ xf86RandR12CrtcSet (ScreenPtr pScreen, } crtc->desiredMode = *mode; } - i830DisableUnusedFunctions (pScrn); + xf86DisableUnusedFunctions (pScrn); i830DumpRegs(pScrn); } |