diff options
| author | James Simmons | 2005-09-09 13:04:31 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2005-09-09 13:57:59 -0700 |
| commit | 4c7ffe0b9f7f40bd818fe3af51342f64c483908e (patch) | |
| tree | 2827dd7904f46cbaff935e221563cd017707f10f /drivers/video/i810 | |
| 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')
| -rw-r--r-- | drivers/video/i810/i810.h | 1 | ||||
| -rw-r--r-- | drivers/video/i810/i810_main.c | 6 |
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 @@ #define HAS_ACCELERATION 2 #define ALWAYS_SYNC 4 #define LOCKUP 8 -#define USE_HWCUR 16 struct gtt_data { 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) decode_var(&info->var, par); i810_load_regs(par); i810_init_cursor(par); - encode_fix(&info->fix, info); 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) struct i810fb_par *par = (struct i810fb_par *)info->par; u8 __iomem *mmio = par->mmio_start_virtual; - if (!(par->dev_flags & USE_HWCUR) || !info->var.accel_flags || - par->dev_flags & LOCKUP) - return soft_cursor(info, cursor); + if (!par->dev_flags & LOCKUP) + return -ENXIO; if (cursor->image.width > 64 || cursor->image.height > 64) return -ENXIO; |