summaryrefslogtreecommitdiff
path: root/src/radeon_driver.c
diff options
context:
space:
mode:
authorAlex Deucher <alex@samba.(none)>2007-12-12 22:37:44 -0500
committerAlex Deucher <alex@samba.(none)>2007-12-12 22:37:44 -0500
commitf5ac34983411e4c4f41ab1817dce582830f398fd (patch)
tree4d2c47513ae6893ff7ea928704718356eb3824cd /src/radeon_driver.c
parentf2b2e0804183b52d9d3f56ad85b3552ece76c544 (diff)
parent6ccf5b33d27218ae1c45ab93c122438ed536d8ba (diff)
Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati into atombios-support
merge and fix conflicts
Diffstat (limited to 'src/radeon_driver.c')
-rw-r--r--src/radeon_driver.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 0baf2ef..2c5e64f 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -3846,10 +3846,6 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
if (!info->useEXA) {
int width, height;
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Using hardware cursor (scanline %u)\n",
- (unsigned)(info->cursor_offset / pScrn->displayWidth
- / info->CurrentLayout.pixel_bytes));
if (xf86QueryLargestOffscreenArea(pScreen, &width, &height,
0, 0, 0)) {
xf86DrvMsg(scrnIndex, X_INFO,
@@ -3864,7 +3860,6 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
xf86DrvMsg(scrnIndex, X_INFO, "Using software cursor\n");
}
} else {
- info->cursor_offset = 0;
xf86DrvMsg(scrnIndex, X_INFO, "Using software cursor\n");
}