Module Name: xsrc
Committed By: mrg
Date: Mon Aug 9 16:18:45 UTC 2010
Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src: g80_dac.c g80_sor.c
Removed Files:
xsrc/external/mit/xf86-video-nv/dist/compat: Makefile.am Makefile.in
README
xsrc/external/mit/xf86-video-nv/dist/compat/modes: xf86Crtc.c
xf86Crtc.h xf86Cursors.c xf86DiDGA.c xf86EdidModes.c xf86Modes.c
xf86Modes.h xf86RandR12.c xf86RandR12.h xf86Rename.h xf86Rotate.c
xf86cvt.c xf86gtf.c
xsrc/external/mit/xf86-video-nv/dist/compat/parser: xf86Optrec.h
xf86Parser.h
xsrc/external/mit/xf86-video-nv/dist/src: local_xf86Rename.h
Log Message:
merge xf86-video-nv 2.1.18
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-video-nv/dist/compat/Makefile.am \
xsrc/external/mit/xf86-video-nv/dist/compat/README
cvs rdiff -u -r1.1.1.3 -r0 \
xsrc/external/mit/xf86-video-nv/dist/compat/Makefile.in
cvs rdiff -u -r1.1.1.4 -r0 \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Crtc.c \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Crtc.h \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Cursors.c \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86EdidModes.c \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Modes.c \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Modes.h \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86RandR12.c \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Rotate.c
cvs rdiff -u -r1.1.1.3 -r0 \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86DiDGA.c \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86RandR12.h \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86gtf.c
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86Rename.h \
xsrc/external/mit/xf86-video-nv/dist/compat/modes/xf86cvt.c
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xf86-video-nv/dist/compat/parser/xf86Optrec.h
cvs rdiff -u -r1.1.1.4 -r0 \
xsrc/external/mit/xf86-video-nv/dist/compat/parser/xf86Parser.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c \
xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-video-nv/dist/src/local_xf86Rename.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c:1.3 xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c:1.4
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c:1.3 Sat May 22 10:12:55 2010
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_dac.c Mon Aug 9 16:18:45 2010
@@ -173,7 +173,7 @@
{
G80OutputDestroy(output);
- xfree(output->driver_private);
+ free(output->driver_private);
output->driver_private = NULL;
}
Index: xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c:1.3 xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c:1.4
--- xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c:1.3 Sat May 22 10:12:55 2010
+++ xsrc/external/mit/xf86-video-nv/dist/src/g80_sor.c Mon Aug 9 16:18:45 2010
@@ -169,7 +169,7 @@
xf86DeleteMode(&pPriv->nativeMode, pPriv->nativeMode);
- xfree(output->driver_private);
+ free(output->driver_private);
output->driver_private = NULL;
}
@@ -265,7 +265,6 @@
return xf86DuplicateMode(pPriv->nativeMode);
}
-#ifdef RANDR_12_INTERFACE
#define MAKE_ATOM(a) MakeAtom((a), sizeof(a) - 1, TRUE);
struct property {
@@ -407,7 +406,6 @@
return TRUE;
}
-#endif // RANDR_12_INTERFACE
static const xf86OutputFuncsRec G80SorTMDSOutputFuncs = {
.dpms = G80SorDPMSSet,
@@ -420,10 +418,8 @@
.mode_set = G80SorModeSet,
.detect = G80SorDetect,
.get_modes = G80OutputGetDDCModes,
-#ifdef RANDR_12_INTERFACE
.create_resources = G80SorCreateResources,
.set_property = G80SorSetProperty,
-#endif
.destroy = G80SorDestroy,
};
@@ -438,10 +434,8 @@
.mode_set = G80SorModeSet,
.detect = G80SorLVDSDetect,
.get_modes = G80SorGetLVDSModes,
-#ifdef RANDR_12_INTERFACE
.create_resources = G80SorCreateResources,
.set_property = G80SorSetProperty,
-#endif
.destroy = G80SorDestroy,
};
@@ -505,7 +499,7 @@
if(!pPriv->nativeMode) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"Failed to find LVDS native mode\n");
- xfree(pPriv);
+ free(pPriv);
return NULL;
}
