aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/aty/atyfb_base.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/aty/atyfb_base.c')
-rw-r--r--drivers/video/aty/atyfb_base.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index c5185f7cf4b..54ebc5a808e 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -1281,6 +1281,14 @@ static int atyfb_set_par(struct fb_info *info)
1281 1281
1282 par->accel_flags = var->accel_flags; /* hack */ 1282 par->accel_flags = var->accel_flags; /* hack */
1283 1283
1284 if (var->accel_flags) {
1285 info->fbops->fb_sync = atyfb_sync;
1286 info->flags &= ~FBINFO_HWACCEL_DISABLED;
1287 } else {
1288 info->fbops->fb_sync = NULL;
1289 info->flags |= FBINFO_HWACCEL_DISABLED;
1290 }
1291
1284 if (par->blitter_may_be_busy) 1292 if (par->blitter_may_be_busy)
1285 wait_for_idle(par); 1293 wait_for_idle(par);
1286 1294
@@ -2604,7 +2612,11 @@ static int __init aty_init(struct fb_info *info, const char *name)
2604 2612
2605 info->fbops = &atyfb_ops; 2613 info->fbops = &atyfb_ops;
2606 info->pseudo_palette = pseudo_palette; 2614 info->pseudo_palette = pseudo_palette;
2607 info->flags = FBINFO_FLAG_DEFAULT; 2615 info->flags = FBINFO_DEFAULT |
2616 FBINFO_HWACCEL_IMAGEBLIT |
2617 FBINFO_HWACCEL_FILLRECT |
2618 FBINFO_HWACCEL_COPYAREA |
2619 FBINFO_HWACCEL_YPAN;
2608 2620
2609#ifdef CONFIG_PMAC_BACKLIGHT 2621#ifdef CONFIG_PMAC_BACKLIGHT
2610 if (M64_HAS(G3_PB_1_1) && machine_is_compatible("PowerBook1,1")) { 2622 if (M64_HAS(G3_PB_1_1) && machine_is_compatible("PowerBook1,1")) {