diff options
author | Dave Airlie <airlied@linux.ie> | 2008-05-07 02:37:18 +1000 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2008-05-07 02:37:18 +1000 |
commit | c3532268875fd24e6519bea2fb1b814d612bbdb4 (patch) | |
tree | 4ab097690d10e6ae61284be3fa07f916390c3213 | |
parent | ffc437f3606ab8ceba1ff152e4bb08988a58b54c (diff) |
radeon: fix zaphod EXA with texture video
-rw-r--r-- | src/radeon_exa.c | 2 | ||||
-rw-r--r-- | src/radeon_textured_video.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/radeon_exa.c b/src/radeon_exa.c index 9e5fc5b3..fa6ac0d9 100644 --- a/src/radeon_exa.c +++ b/src/radeon_exa.c @@ -402,7 +402,7 @@ Bool RADEONSetupMemEXA (ScreenPtr pScreen) else screen_size = pScrn->virtualY * byteStride; - info->exa->memoryBase = info->FB + pScrn->fbOffset; + info->exa->memoryBase = info->FB; info->exa->memorySize = info->FbMapSize - info->FbSecureSize; info->exa->offScreenBase = screen_size; diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c index 0a6598d7..5d153e74 100644 --- a/src/radeon_textured_video.c +++ b/src/radeon_textured_video.c @@ -226,7 +226,7 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn, left = (x1 >> 16) & ~1; npixels = ((((x2 + 0xffff) >> 16) + 1) & ~1) - left; - pPriv->src_offset = pPriv->video_offset + info->fbLocation; + pPriv->src_offset = pPriv->video_offset + info->fbLocation + pScrn->fbOffset; pPriv->src_addr = (CARD8 *)(info->FB + pPriv->video_offset + (top * dstPitch)); pPriv->src_pitch = dstPitch; pPriv->size = size; |