Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

1 files changed, 79 insertions, 0 deletions

diff --git a/drivers/video/riva/rivafb.h b/drivers/video/riva/rivafb.h
new file mode 100644
index 000000000000..440ff445689b
--- /dev/null
+++ b/drivers/video/riva/rivafb.h
@@ -0,0 +1,79 @@
+#ifndef __RIVAFB_H
+#define __RIVAFB_H
+
+#include <linux/config.h>
+#include <linux/fb.h>
+#include <video/vga.h>
+#include <linux/i2c.h>
+#include <linux/i2c-id.h>
+#include <linux/i2c-algo-bit.h>
+
+#include "riva_hw.h"
+
+/* GGI compatibility macros */
+#define NUM_SEQ_REGS            0x05
+#define NUM_CRT_REGS            0x41
+#define NUM_GRC_REGS            0x09
+#define NUM_ATC_REGS            0x15
+
+/* I2C */
+#define DDC_SCL_READ_MASK       (1 << 2)
+#define DDC_SCL_WRITE_MASK      (1 << 5)
+#define DDC_SDA_READ_MASK       (1 << 3)
+#define DDC_SDA_WRITE_MASK      (1 << 4)
+
+/* holds the state of the VGA core and extended Riva hw state from riva_hw.c.
+ * From KGI originally. */
+struct riva_regs {
+        u8 attr[NUM_ATC_REGS];
+        u8 crtc[NUM_CRT_REGS];
+        u8 gra[NUM_GRC_REGS];
+        u8 seq[NUM_SEQ_REGS];
+        u8 misc_output;
+        RIVA_HW_STATE ext;
+};
+
+struct riva_par;
+
+struct riva_i2c_chan {
+        struct riva_par *par;
+        unsigned long   ddc_base;
+        struct i2c_adapter adapter;
+        struct i2c_algo_bit_data algo;
+};
+
+struct riva_par {
+        RIVA_HW_INST riva;      /* interface to riva_hw.c */
+        u32 pseudo_palette[16]; /* default palette */
+        u32 palette[16];        /* for Riva128 */
+        u8 __iomem *ctrl_base;  /* virtual control register base addr */
+        unsigned dclk_max;      /* max DCLK */
+
+        struct riva_regs initial_state; /* initial startup video mode */
+        struct riva_regs current_state;
+#ifdef CONFIG_X86
+        struct vgastate state;
+#endif
+        atomic_t ref_count;
+        unsigned char *EDID;
+        unsigned int Chipset;
+        int forceCRTC;
+        Bool SecondCRTC;
+        int FlatPanel;
+        struct pci_dev *pdev;
+        int bus;
+        int cursor_reset;
+#ifdef CONFIG_MTRR
+        struct { int vram; int vram_valid; } mtrr;
+#endif
+        struct riva_i2c_chan chan[3];
+};
+
+void riva_common_setup(struct riva_par *);
+unsigned long riva_get_memlen(struct riva_par *);
+unsigned long riva_get_maxdclk(struct riva_par *);
+void riva_delete_i2c_busses(struct riva_par *par);
+void riva_create_i2c_busses(struct riva_par *par);
+int riva_probe_i2c_connector(struct riva_par *par, int conn, u8 **out_edid);
+
+#endif /* __RIVAFB_H */