summaryrefslogtreecommitdiff
path: root/src/radeon_mergedfb.c
diff options
context:
space:
mode:
authorMichel Daenzer <michel@daenzer.net>2005-11-08 13:35:23 +0000
committerMichel Daenzer <michel@daenzer.net>2005-11-08 13:35:23 +0000
commit345180131a7b2752773dc2a3ee1221ad1e05c815 (patch)
treea1c5f3a917b40cbcb2f1fc1460db45b32d9f5f04 /src/radeon_mergedfb.c
parent23911421ffa7bdd2e191a72c41bf1f26c92c1a67 (diff)
bugzilla #4916 (https://bugs.freedesktop.org/show_bug.cgi?id=4916) Fix
segfault with MergedFB and EXA enabled and HW cursor temporarily disabled.
Diffstat (limited to 'src/radeon_mergedfb.c')
-rw-r--r--src/radeon_mergedfb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/radeon_mergedfb.c b/src/radeon_mergedfb.c
index ba0b343..2cccea6 100644
--- a/src/radeon_mergedfb.c
+++ b/src/radeon_mergedfb.c
@@ -1963,7 +1963,7 @@ RADEONSetCursorPositionMerged(ScrnInfoPtr pScrn, int x, int y)
| (yorigin ? 0 : y1)));
#ifdef USE_EXA
if (info->useEXA)
- OUTREG(RADEON_CUR_OFFSET, info->cursorArea->offset + yorigin * stride);
+ OUTREG(RADEON_CUR_OFFSET, info->cursor_offset + yorigin * stride);
#endif /* USE_EXA */
#ifdef USE_XAA
if (!info->useEXA)
@@ -1978,7 +1978,7 @@ RADEONSetCursorPositionMerged(ScrnInfoPtr pScrn, int x, int y)
| (yorigin ? 0 : y2)));
#ifdef USE_EXA
if (info->useEXA)
- OUTREG(RADEON_CUR2_OFFSET, info->cursorArea->offset + yorigin * stride);
+ OUTREG(RADEON_CUR2_OFFSET, info->cursor_offset + yorigin * stride);
#endif /* USE_EXA */
#ifdef USE_XAA
if (!info->useEXA)