Merge branch 'randr-1.2'

Conflicts:

	configure.ac
	man/Makefile.am
	man/nv.man
	src/g80_display.h
	src/g80_output.c
	src/nv_driver.c

1 files changed, 29 insertions, 0 deletions

diff --git a/src/g80_output.h b/src/g80_output.h
new file mode 100644
index 0000000..0b666f5
--- /dev/null
+++ b/src/g80_output.h
@@ -0,0 +1,29 @@
+typedef struct G80OutputPrivRec {
+    ORType type;
+    ORNum or;
+
+    xf86OutputPtr partner;
+    I2CBusPtr i2c;
+
+    xf86OutputStatus cached_status;
+
+    void (*set_pclk)(xf86OutputPtr, int pclk);
+} G80OutputPrivRec, *G80OutputPrivPtr;
+
+void G80OutputSetPClk(xf86OutputPtr, int pclk);
+int G80OutputModeValid(xf86OutputPtr, DisplayModePtr);
+Bool G80OutputModeFixup(xf86OutputPtr, DisplayModePtr mode, DisplayModePtr adjusted_mode);
+void G80OutputPrepare(xf86OutputPtr);
+void G80OutputCommit(xf86OutputPtr);
+void G80OutputPartnersDetect(xf86OutputPtr dac, xf86OutputPtr sor, I2CBusPtr i2c);
+void G80OutputResetCachedStatus(ScrnInfoPtr);
+DisplayModePtr G80OutputGetDDCModes(xf86OutputPtr);
+void G80OutputDestroy(xf86OutputPtr);
+Bool G80CreateOutputs(ScrnInfoPtr);
+
+/* g80_dac.c */
+xf86OutputPtr G80CreateDac(ScrnInfoPtr, ORNum);
+Bool G80DacLoadDetect(xf86OutputPtr);
+
+/* g80_sor.c */
+xf86OutputPtr G80CreateSor(ScrnInfoPtr, ORNum);