diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-03-30 11:44:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-03-30 11:44:14 +1000 |
| commit | c2b1c8b706a6c7c1fd0af80091958473133d54e7 (patch) | |
| tree | 8931e99377ebb1f5911e95815e47e8bc7d657856 | |
| parent | c5edea3d8c9254d3a21e390b8309e39e4c9635db (diff) | |
atombios: fixup the width/height to use the mode values not the scrn ones
this fixes it properly, legacy appears to be okay.
| -rw-r--r-- | src/atombios_crtc.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/atombios_crtc.c b/src/atombios_crtc.c index e021bf97..229ca75e 100644 --- a/src/atombios_crtc.c +++ b/src/atombios_crtc.c @@ -450,13 +450,8 @@ atombios_crtc_mode_set(xf86CrtcPtr crtc, OUTREG(AVIVO_D1GRPH_SURFACE_OFFSET_Y + radeon_crtc->crtc_offset, 0); OUTREG(AVIVO_D1GRPH_X_START + radeon_crtc->crtc_offset, 0); OUTREG(AVIVO_D1GRPH_Y_START + radeon_crtc->crtc_offset, 0); - if ((crtc->rotation == RR_Rotate_90) || (crtc->rotation == RR_Rotate_270)) { - OUTREG(AVIVO_D1GRPH_X_END + radeon_crtc->crtc_offset, crtc->scrn->virtualY); - OUTREG(AVIVO_D1GRPH_Y_END + radeon_crtc->crtc_offset, crtc->scrn->virtualX); - } else { - OUTREG(AVIVO_D1GRPH_X_END + radeon_crtc->crtc_offset, crtc->scrn->virtualX); - OUTREG(AVIVO_D1GRPH_Y_END + radeon_crtc->crtc_offset, crtc->scrn->virtualY); - } + OUTREG(AVIVO_D1GRPH_X_END + radeon_crtc->crtc_offset, mode->HDisplay); + OUTREG(AVIVO_D1GRPH_Y_END + radeon_crtc->crtc_offset, mode->VDisplay); OUTREG(AVIVO_D1GRPH_PITCH + radeon_crtc->crtc_offset, crtc->scrn->displayWidth); OUTREG(AVIVO_D1GRPH_ENABLE + radeon_crtc->crtc_offset, 1); @@ -467,19 +462,14 @@ atombios_crtc_mode_set(xf86CrtcPtr crtc, /* lock the mode regs */ OUTREG(AVIVO_D1SCL_UPDATE + radeon_crtc->crtc_offset, AVIVO_D1SCL_UPDATE_LOCK); - if ((crtc->rotation == RR_Rotate_90) || (crtc->rotation == RR_Rotate_270)) - OUTREG(AVIVO_D1MODE_DESKTOP_HEIGHT + radeon_crtc->crtc_offset, - crtc->scrn->virtualX); - else - OUTREG(AVIVO_D1MODE_DESKTOP_HEIGHT + radeon_crtc->crtc_offset, - crtc->scrn->virtualY); + OUTREG(AVIVO_D1MODE_DESKTOP_HEIGHT + radeon_crtc->crtc_offset, + mode->VDisplay); OUTREG(AVIVO_D1MODE_VIEWPORT_START + radeon_crtc->crtc_offset, (x << 16) | y); OUTREG(AVIVO_D1MODE_VIEWPORT_SIZE + radeon_crtc->crtc_offset, (mode->HDisplay << 16) | mode->VDisplay); /* unlock the mode regs */ OUTREG(AVIVO_D1SCL_UPDATE + radeon_crtc->crtc_offset, 0); - ErrorF("scrn virtual X %d Y %d pitch %d\n", crtc->scrn->virtualX, crtc->scrn->virtualY, crtc->scrn->displayWidth); } atombios_crtc_set_pll(crtc, adjusted_mode); |