mirror of
https://github.com/X11Libre/xf86-video-nv.git
synced 2026-03-24 01:24:21 +00:00
Import most of XFree86 4.4RC3. This import excludes files which have the
new license. If we want to, later we can import 4.4RC3 again and pick
up the files that have the new license, but for now the vendor branch
is "pure."
This commit is contained in:
@@ -37,7 +37,7 @@
|
||||
|* *|
|
||||
\***************************************************************************/
|
||||
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c,v 1.39 2003/11/07 23:56:28 mvojkovi Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c,v 1.40 2004/02/07 22:56:05 mvojkovi Exp $ */
|
||||
|
||||
#include "nv_include.h"
|
||||
|
||||
@@ -292,7 +292,7 @@ static void nv10GetConfig (NVPtr pNv)
|
||||
}
|
||||
#endif
|
||||
|
||||
if((pNv->Chipset && 0xffff) == 0x01a0) {
|
||||
if((pNv->Chipset & 0xffff) == 0x01a0) {
|
||||
int amt = pciReadLong(pciTag(0, 0, 1), 0x7C);
|
||||
pNv->RamAmountKBytes = (((amt >> 6) & 31) + 1) * 1024;
|
||||
} else if((pNv->Chipset & 0xffff) == 0x01f0) {
|
||||
|
||||
Reference in New Issue
Block a user