diff options
author | Dennis De Winter <dennis.de.winter@gmail.com> | 2007-03-16 21:29:19 -0400 |
---|---|---|
committer | Alex Deucher <alex@botch2.com> | 2007-03-16 21:29:19 -0400 |
commit | 503027d38dab759277c0a67746ac205a1dfa9277 (patch) | |
tree | 2bc0e4b1c17e55c3ef5e8f7814c41b42348d28a3 /src/smi_exa.c | |
parent | fe4114033f2853e2df8d37c490deba26bf0366e8 (diff) |
Fix UTS issues with flash
Also remove safety padding on memory manager calculation
Diffstat (limited to 'src/smi_exa.c')
-rw-r--r-- | src/smi_exa.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/smi_exa.c b/src/smi_exa.c index 2c902be..a7cb25f 100644 --- a/src/smi_exa.c +++ b/src/smi_exa.c @@ -77,8 +77,8 @@ SMI_EXAInit(ScreenPtr pScreen) /* Memory Manager */ pSmi->EXADriverPtr->memoryBase = pSmi->FBBase + pSmi->FBOffset; - pSmi->EXADriverPtr->memorySize = pSmi->FBReserved - 1024; - pSmi->EXADriverPtr->offScreenBase = pSmi->width * pSmi->height * pSmi->Bpp + 1024; + pSmi->EXADriverPtr->memorySize = pSmi->FBReserved; + pSmi->EXADriverPtr->offScreenBase = pSmi->width * pSmi->height * pSmi->Bpp; /* Flags */ pSmi->EXADriverPtr->flags = EXA_TWO_BITBLT_DIRECTIONS; @@ -485,7 +485,7 @@ SMI_UploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, /* calculate pitch in pixel unit */ dst_pitch = exaGetPixmapPitch(pDst) / (pDst->drawable.bitsPerPixel >> 3); - source_pitch = aligned_pitch / (pDst->drawable.bitsPerPixel >> 3); + source_pitch = src_pitch / (pDst->drawable.bitsPerPixel >> 3); /* calculate offset in 8 byte (64 bit) unit */ dst_offset = exaGetPixmapOffset(pDst) >> 3; |