diff options
author | James Simmons <jsimmons@infradead.org> | 2005-09-09 16:04:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 16:57:59 -0400 |
commit | 4c7ffe0b9f7f40bd818fe3af51342f64c483908e (patch) | |
tree | 2827dd7904f46cbaff935e221563cd017707f10f /drivers/video/i810/i810_main.c | |
parent | d2d58384fc5d4c0fe2d8e34bc2d15a90a9bb372a (diff) |
[PATCH] fbdev: prevent drivers that have hardware cursors from calling software cursor code
This patch removes drivers that have hardware cursors from calling the
software cursor code. Also if the driver sets a no hardware cursor flag
then the driver reports a error it someone attempts to use the cursor.
Signed-off-by: James Simmons <jsimmons@infradead.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/i810/i810_main.c')
-rw-r--r-- | drivers/video/i810/i810_main.c | 6 |
1 files changed, 2 insertions, 4 deletions
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; |