aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/i810/i810.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/i810/i810.h')
-rw-r--r--drivers/video/i810/i810.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/video/i810/i810.h b/drivers/video/i810/i810.h
index fe3b75794756..d48949ceaacc 100644
--- a/drivers/video/i810/i810.h
+++ b/drivers/video/i810/i810.h
@@ -16,6 +16,9 @@
16#include <linux/list.h> 16#include <linux/list.h>
17#include <linux/agp_backend.h> 17#include <linux/agp_backend.h>
18#include <linux/fb.h> 18#include <linux/fb.h>
19#include <linux/i2c.h>
20#include <linux/i2c-id.h>
21#include <linux/i2c-algo-bit.h>
19#include <video/vga.h> 22#include <video/vga.h>
20 23
21/* Fence */ 24/* Fence */
@@ -201,7 +204,6 @@
201#define HAS_ACCELERATION 2 204#define HAS_ACCELERATION 2
202#define ALWAYS_SYNC 4 205#define ALWAYS_SYNC 4
203#define LOCKUP 8 206#define LOCKUP 8
204#define USE_HWCUR 16
205 207
206struct gtt_data { 208struct gtt_data {
207 struct agp_memory *i810_fb_memory; 209 struct agp_memory *i810_fb_memory;
@@ -241,6 +243,14 @@ struct state_registers {
241 u8 cr39, cr41, cr70, sr01, msr; 243 u8 cr39, cr41, cr70, sr01, msr;
242}; 244};
243 245
246struct i810fb_par;
247
248struct i810fb_i2c_chan {
249 struct i810fb_par *par;
250 struct i2c_adapter adapter;
251 struct i2c_algo_bit_data algo;
252};
253
244struct i810fb_par { 254struct i810fb_par {
245 struct mode_registers regs; 255 struct mode_registers regs;
246 struct state_registers hw_state; 256 struct state_registers hw_state;
@@ -252,10 +262,12 @@ struct i810fb_par {
252 struct heap_data iring; 262 struct heap_data iring;
253 struct heap_data cursor_heap; 263 struct heap_data cursor_heap;
254 struct vgastate state; 264 struct vgastate state;
265 struct i810fb_i2c_chan chan[2];
255 atomic_t use_count; 266 atomic_t use_count;
256 u32 pseudo_palette[17]; 267 u32 pseudo_palette[17];
257 unsigned long mmio_start_phys; 268 unsigned long mmio_start_phys;
258 u8 __iomem *mmio_start_virtual; 269 u8 __iomem *mmio_start_virtual;
270 u8 *edid;
259 u32 pitch; 271 u32 pitch;
260 u32 pixconf; 272 u32 pixconf;
261 u32 watermark; 273 u32 watermark;