diff options
| author | Antonino Daplas <adaplas@hotpop.com> | 2004-11-10 21:46:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-11-10 21:46:17 -0800 |
| commit | 56a2ff06828032bc6f3e66e7e860e2cadfb82918 (patch) | |
| tree | 057ca5fba3e0ba1499aed0bf5c8e833e412ce297 | |
| parent | 8ffb28e47ddb4099663a01e0fbfa19da894e9e7d (diff) | |
[PATCH] fbdev: Use soft_cursor in i810fb
The hardware cursor implementation in i810fb broke sometime during 2.6.
Until this is fixed, temporarily use soft_cursor().
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/video/i810/i810.h | 1 | ||||
| -rw-r--r-- | drivers/video/i810/i810_main.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/i810/i810.h b/drivers/video/i810/i810.h index f59af3335ccf..fe3b75794756 100644 --- a/drivers/video/i810/i810.h +++ b/drivers/video/i810/i810.h @@ -201,6 +201,7 @@ #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 e2de10c03107..176ca7a67e83 100644 --- a/drivers/video/i810/i810_main.c +++ b/drivers/video/i810/i810_main.c @@ -1403,7 +1403,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 (!info->var.accel_flags || par->dev_flags & LOCKUP) + if (!(par->dev_flags & USE_HWCUR) || !info->var.accel_flags || + par->dev_flags & LOCKUP) return soft_cursor(info, cursor); if (cursor->image.width > 64 || cursor->image.height > 64) |