diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:35:39 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:35:39 +0000 |
| commit | a13885d1155c944863c8c17f054105edde568330 (patch) | |
| tree | 6f68b81fb35c2b5481d71f46e99344e8cf53cefa /src/riva_driver.c | |
| parent | 9858a68808c586335b77c4afdd4d8526a71272ae (diff) | |
merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214XORG-RELEASE-1-BASEXEVIE-MERGEXINERAMA_2
Diffstat (limited to 'src/riva_driver.c')
| -rw-r--r-- | src/riva_driver.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/riva_driver.c b/src/riva_driver.c index 1b4ca07..0b8a06e 100644 --- a/src/riva_driver.c +++ b/src/riva_driver.c @@ -23,7 +23,7 @@ /* Hacked together from mga driver and 3.3.4 NVIDIA driver by Jarno Paananen <jpaana@s2.org> */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_driver.c,v 1.5 2003/11/03 05:11:26 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_driver.c,v 1.6 2004/01/10 22:31:53 mvojkovi Exp $ */ #include "riva_include.h" @@ -1334,6 +1334,9 @@ RivaScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) case 16: refreshArea = RivaRefreshArea16; break; case 32: refreshArea = RivaRefreshArea32; break; } + xf86DisableRandR(); + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Driver rotation enabled, RandR disabled\n"); } ShadowFBInit(pScreen, refreshArea); |