diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-10 05:14:47 +0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-10 05:14:47 +0400 |
| commit | d344c5e0856ad03278d8700b503762dbc8b86e12 (patch) | |
| tree | a6d893a643470a3c2580a58f3228a55fa1fd1d82 /drivers/video/i810/i810.h | |
| parent | 010988e888a0abbe7118635c1b33d049caae6b29 (diff) | |
| parent | 87fc767b832ef5a681a0ff9d203c3289bc3be2bf (diff) | |
| download | linux-d344c5e0856ad03278d8700b503762dbc8b86e12.tar.xz | |
Manual merge with Linus
Diffstat (limited to 'drivers/video/i810/i810.h')
| -rw-r--r-- | drivers/video/i810/i810.h | 14 |
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 @@ #include <linux/list.h> #include <linux/agp_backend.h> #include <linux/fb.h> +#include <linux/i2c.h> +#include <linux/i2c-id.h> +#include <linux/i2c-algo-bit.h> #include <video/vga.h> /* Fence */ @@ -201,7 +204,6 @@ #define HAS_ACCELERATION 2 #define ALWAYS_SYNC 4 #define LOCKUP 8 -#define USE_HWCUR 16 struct gtt_data { struct agp_memory *i810_fb_memory; @@ -241,6 +243,14 @@ struct state_registers { u8 cr39, cr41, cr70, sr01, msr; }; +struct i810fb_par; + +struct i810fb_i2c_chan { + struct i810fb_par *par; + struct i2c_adapter adapter; + struct i2c_algo_bit_data algo; +}; + struct i810fb_par { struct mode_registers regs; struct state_registers hw_state; @@ -252,10 +262,12 @@ struct i810fb_par { struct heap_data iring; struct heap_data cursor_heap; struct vgastate state; + struct i810fb_i2c_chan chan[2]; atomic_t use_count; u32 pseudo_palette[17]; unsigned long mmio_start_phys; u8 __iomem *mmio_start_virtual; + u8 *edid; u32 pitch; u32 pixconf; u32 watermark; |