aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/i810
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/i810')
-rw-r--r--drivers/video/i810/i810.h1
-rw-r--r--drivers/video/i810/i810_main.c6
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/video/i810/i810.h b/drivers/video/i810/i810.h
index fe3b75794756..f59af3335ccf 100644
--- a/drivers/video/i810/i810.h
+++ b/drivers/video/i810/i810.h
@@ -201,7 +201,6 @@
201#define HAS_ACCELERATION 2 201#define HAS_ACCELERATION 2
202#define ALWAYS_SYNC 4 202#define ALWAYS_SYNC 4
203#define LOCKUP 8 203#define LOCKUP 8
204#define USE_HWCUR 16
205 204
206struct gtt_data { 205struct gtt_data {
207 struct agp_memory *i810_fb_memory; 206 struct agp_memory *i810_fb_memory;
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index 6db183462b92..d07b1f203fc4 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -1375,7 +1375,6 @@ static int i810fb_set_par(struct fb_info *info)
1375 decode_var(&info->var, par); 1375 decode_var(&info->var, par);
1376 i810_load_regs(par); 1376 i810_load_regs(par);
1377 i810_init_cursor(par); 1377 i810_init_cursor(par);
1378
1379 encode_fix(&info->fix, info); 1378 encode_fix(&info->fix, info);
1380 1379
1381 if (info->var.accel_flags && !(par->dev_flags & LOCKUP)) { 1380 if (info->var.accel_flags && !(par->dev_flags & LOCKUP)) {
@@ -1418,9 +1417,8 @@ static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor)
1418 struct i810fb_par *par = (struct i810fb_par *)info->par; 1417 struct i810fb_par *par = (struct i810fb_par *)info->par;
1419 u8 __iomem *mmio = par->mmio_start_virtual; 1418 u8 __iomem *mmio = par->mmio_start_virtual;
1420 1419
1421 if (!(par->dev_flags & USE_HWCUR) || !info->var.accel_flags || 1420 if (!par->dev_flags & LOCKUP)
1422 par->dev_flags & LOCKUP) 1421 return -ENXIO;
1423 return soft_cursor(info, cursor);
1424 1422
1425 if (cursor->image.width > 64 || cursor->image.height > 64) 1423 if (cursor->image.width > 64 || cursor->image.height > 64)
1426 return -ENXIO; 1424 return -ENXIO;