From eb178a8ed9a461521087f560bfa214ae3de66bba Mon Sep 17 00:00:00 2001 From: matthieu Date: Sun, 13 May 2012 20:14:34 +0000 Subject: [PATCH] fix small xf86-video-i740 1.3.3 merge glitch --- driver/xf86-video-i740/README | 41 +++++++++++++++++------------------ 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/driver/xf86-video-i740/README b/driver/xf86-video-i740/README index 5a14bffb6..1d1dd9d10 100644 --- a/driver/xf86-video-i740/README +++ b/driver/xf86-video-i740/README @@ -150,61 +150,60 @@ EndSection - or let xorgconfig do this for you. However, if you have problems with auto-detection, you can specify: - +o VideoRam - in kilobytes + o VideoRam - in kilobytes - +o DacSpeed - in MHz + o DacSpeed - in MHz - +o MemBase - physical address of the linear framebuffer + o MemBase - physical address of the linear framebuffer - +o IOBase - physical address of the memory mapped IO registers + o IOBase - physical address of the memory mapped IO registers - 6. Driver Options + 6. Driver Options - +o "NoAccel" - Turn off hardware acceleration + o "NoAccel" - Turn off hardware acceleration - +o "SWCursor" - Request a software cursor (hardware is default) + o "SWCursor" - Request a software cursor (hardware is default) - +o "SDRAM" - Force the use of SDRAM timings + o "SDRAM" - Force the use of SDRAM timings - +o "SGRAM" - Force the use of SGRAM timings + o "SGRAM" - Force the use of SGRAM timings - +o "SlowRam" - Force the use of slower ram timings + o "SlowRam" - Force the use of slower ram timings - +o "Dac6Bit" - Force the use of a 6 Bit Dac (8 Bit is the default) + o "Dac6Bit" - Force the use of a 6 Bit Dac (8 Bit is the default) - +o "UsePIO - Force the use of programmed IO (Memory mapped is the + o "UsePIO - Force the use of programmed IO (Memory mapped is the default) Note: the i740 X server should automatically detect whether your card - has SGRAM or SDRAM. Use the "sgram" and "sdram" options if it is + has SGRAM or SDRAM. Use the "sgram" and "sdram" options if it is incorrectly detected. - 7. Known Limitations + 7. Known Limitations - +o Certain drawing operations are very slow when using 24 bit pixel + o Certain drawing operations are very slow when using 24 bit pixel depth mode. - 8. Author + 8. Author - +o Original version by Kevin E Martin + o Original version by Kevin E Martin + - +o Daryll Strauss + o Daryll Strauss - The X11R6.8 version of this driver originally came from XFree86 4.4 - rc2. + The Xorg version of this driver originally came from XFree86 4.4 rc2. The XFree86 version of this driver was donated to The XFree86 Project by: