git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
video
/
i810
/
i810.h
diff --git
a/drivers/video/i810/i810.h
b/drivers/video/i810/i810.h
index
fe3b757
..
579195c
100644
(file)
--- 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/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 */
#include <video/vga.h>
/* Fence */
@@
-201,7
+204,6
@@
#define HAS_ACCELERATION 2
#define ALWAYS_SYNC 4
#define LOCKUP 8
#define HAS_ACCELERATION 2
#define ALWAYS_SYNC 4
#define LOCKUP 8
-#define USE_HWCUR 16
struct gtt_data {
struct agp_memory *i810_fb_memory;
struct gtt_data {
struct agp_memory *i810_fb_memory;
@@
-241,6
+243,15
@@
struct state_registers {
u8 cr39, cr41, cr70, sr01, msr;
};
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;
+ unsigned long ddc_base;
+};
+
struct i810fb_par {
struct mode_registers regs;
struct state_registers hw_state;
struct i810fb_par {
struct mode_registers regs;
struct state_registers hw_state;
@@
-252,10
+263,12
@@
struct i810fb_par {
struct heap_data iring;
struct heap_data cursor_heap;
struct vgastate state;
struct heap_data iring;
struct heap_data cursor_heap;
struct vgastate state;
+ struct i810fb_i2c_chan chan[3];
atomic_t use_count;
u32 pseudo_palette[17];
unsigned long mmio_start_phys;
u8 __iomem *mmio_start_virtual;
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;
u32 pitch;
u32 pixconf;
u32 watermark;
@@
-267,6
+280,7
@@
struct i810fb_par {
u32 blit_bpp;
u32 ovract;
u32 cur_state;
u32 blit_bpp;
u32 ovract;
u32 cur_state;
+ u32 ddc_num;
int mtrr_reg;
u16 bltcntl;
u8 interlace;
int mtrr_reg;
u16 bltcntl;
u8 interlace;