summaryrefslogtreecommitdiff
path: root/src/radeon_driver.c
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-10-01 18:22:14 +0200
committerMichel Dänzer <michel@tungstengraphics.com>2006-10-01 18:22:14 +0200
commit145c716de6d42778e447581578f3e4db13c9a653 (patch)
tree91810510d32157a2e1d44cb3a4add62aba64e87e /src/radeon_driver.c
parentd43ad88fa3913437f6987ab5ab46a38f0cb555a8 (diff)
Fix radeon vs fbdev pitch calculation.
Fetch the correct displayWidth from fbdevhw after setting the mode.
Diffstat (limited to 'src/radeon_driver.c')
-rw-r--r--src/radeon_driver.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index bb1e070c..6182eb02 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -2866,7 +2866,8 @@ static Bool RADEONPreInitModes(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10)
if (modesFound < 1 && info->FBDev) {
fbdevHWUseBuildinMode(pScrn);
- pScrn->displayWidth = pScrn->virtualX; /* FIXME: might be wrong */
+ pScrn->displayWidth = fbdevHWGetLineLength(pScrn)
+ / info->CurrentLayout.pixel_bytes;
modesFound = 1;
}
@@ -4593,6 +4594,8 @@ _X_EXPORT Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
unsigned char *RADEONMMIO = info->MMIO;
if (!fbdevHWModeInit(pScrn, pScrn->currentMode)) return FALSE;
+ pScrn->displayWidth = fbdevHWGetLineLength(pScrn)
+ / info->CurrentLayout.pixel_bytes;
RADEONSaveMemMapRegisters(pScrn, &info->ModeReg);
info->fbLocation = (info->ModeReg.mc_fb_location & 0xffff) << 16;
info->ModeReg.surface_cntl = INREG(RADEON_SURFACE_CNTL);
@@ -7230,6 +7233,8 @@ _X_EXPORT Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
RADEONSaveFBDevRegisters(pScrn, &info->ModeReg);
ret = fbdevHWSwitchMode(scrnIndex, mode, flags);
+ pScrn->displayWidth = fbdevHWGetLineLength(pScrn)
+ / info->CurrentLayout.pixel_bytes;
RADEONRestoreFBDevRegisters(pScrn, &info->ModeReg);
} else {