diff options
| author | David Airlie <airlied@linux.ie> | 2007-02-02 11:45:40 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-02-02 15:34:19 +1100 |
| commit | 47fb9ce657f018177a35b449a4d716dc03be9327 (patch) | |
| tree | b5b4efdb4985ca67eb0c8537d16f1ee2288a68ef | |
| parent | 720730b1b0de632488d3b9818210ec5e9c7f07ae (diff) | |
fixup callers to crtcsetmode fixes my cursors
| -rw-r--r-- | src/radeon_display.c | 19 | ||||
| -rw-r--r-- | src/radeon_driver.c | 5 | ||||
| -rw-r--r-- | src/radeon_randr.c | 2 |
3 files changed, 7 insertions, 19 deletions
diff --git a/src/radeon_display.c b/src/radeon_display.c index 0b13d49..07df70d 100644 --- a/src/radeon_display.c +++ b/src/radeon_display.c @@ -2583,19 +2583,6 @@ RADEONCrtcSetBase(xf86CrtcPtr crtc, int x, int y) } Bool -RADEONCrtcInUse(xf86CrtcPtr crtc) -{ - ScrnInfoPtr pScrn = crtc->scrn; - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); - int i; - - for (i = 0; i < xf86_config->num_output; i++) - if (xf86_config->output[i]->crtc == crtc) - return TRUE; - return FALSE; -} - -Bool RADEONCrtcSetMode(xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation, int x, int y) { @@ -2606,13 +2593,13 @@ RADEONCrtcSetMode(xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation, RADEONInfoPtr info = RADEONPTR(pScrn); int i , ret; DisplayModeRec saved_mode; - int saved_x, saved_y; - Rotation saved_rotation; + int saved_x, saved_y; + Rotation saved_rotation; /* XXX: mode */ adjusted_mode = xf86DuplicateMode(mode); - crtc->enabled = RADEONCrtcInUse (crtc); + crtc->enabled = xf86CrtcInUse (crtc); if (!crtc->enabled) { return TRUE; diff --git a/src/radeon_driver.c b/src/radeon_driver.c index f984b20..2706a0d 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -3644,7 +3644,7 @@ _X_EXPORT Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen, crtc->desiredY = 0; } - if (!RADEONCrtcSetMode (crtc, &crtc->desiredMode, TRUE)) + if (!RADEONCrtcSetMode (crtc, &crtc->desiredMode, crtc->desiredRotation, crtc->desiredX, crtc->desiredY)) return FALSE; } @@ -6338,7 +6338,8 @@ _X_EXPORT Bool RADEONEnterVT(int scrnIndex, int flags) crtc->desiredY = 0; } - if (!RADEONCrtcSetMode (crtc, &crtc->desiredMode, TRUE)) + if (!RADEONCrtcSetMode (crtc, &crtc->desiredMode, crtc->desiredRotation, + crtc->desiredX, crtc->desiredY)) return FALSE; } diff --git a/src/radeon_randr.c b/src/radeon_randr.c index d9683ec..23e4dad 100644 --- a/src/radeon_randr.c +++ b/src/radeon_randr.c @@ -635,7 +635,7 @@ xf86RandR12CrtcSet (ScreenPtr pScreen, radeon_crtc->binding = info->IsSecondary ? 2 : 1; if (mode) { info->IsSwitching = TRUE; - if (!RADEONCrtcSetMode (crtc, mode, TRUE)) + if (!RADEONCrtcSetMode (crtc, mode, rotation, x, y)) { crtc->enabled = save_enabled; for (o = 0; o < config->num_output; o++) |