From 67ecc9119eafa8a270afc0f3558094f6befa8147 Mon Sep 17 00:00:00 2001 From: "Antonino A. Daplas" Date: Mon, 26 Jun 2006 00:26:32 -0700 Subject: [PATCH] --- yaml --- r: 30287 b: refs/heads/master c: 7914cb27eebed4868bac01a28f550ea966fb422e h: refs/heads/master i: 30285: f483131fcdad23bf2fe9ccefde0a3c2b44858dd1 30283: cbff93cb5a2269295c19290d5bb387902e7d0a45 30279: 3046d795e96d3f5fc67a034575b23a36c43c666c 30271: 9144775590c99a54ee9fdda2e4ac2c835a52d5c6 v: v3 --- [refs] | 2 +- trunk/drivers/video/aty/atyfb_base.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c6087af5699e..41f4cc02cc8b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58221097a8d8aa2151a70cbf749977998bb3d815 +refs/heads/master: 7914cb27eebed4868bac01a28f550ea966fb422e diff --git a/trunk/drivers/video/aty/atyfb_base.c b/trunk/drivers/video/aty/atyfb_base.c index c5185f7cf4ba..54ebc5a808ef 100644 --- a/trunk/drivers/video/aty/atyfb_base.c +++ b/trunk/drivers/video/aty/atyfb_base.c @@ -1281,6 +1281,14 @@ static int atyfb_set_par(struct fb_info *info) par->accel_flags = var->accel_flags; /* hack */ + if (var->accel_flags) { + info->fbops->fb_sync = atyfb_sync; + info->flags &= ~FBINFO_HWACCEL_DISABLED; + } else { + info->fbops->fb_sync = NULL; + info->flags |= FBINFO_HWACCEL_DISABLED; + } + if (par->blitter_may_be_busy) wait_for_idle(par); @@ -2604,7 +2612,11 @@ static int __init aty_init(struct fb_info *info, const char *name) info->fbops = &atyfb_ops; info->pseudo_palette = pseudo_palette; - info->flags = FBINFO_FLAG_DEFAULT; + info->flags = FBINFO_DEFAULT | + FBINFO_HWACCEL_IMAGEBLIT | + FBINFO_HWACCEL_FILLRECT | + FBINFO_HWACCEL_COPYAREA | + FBINFO_HWACCEL_YPAN; #ifdef CONFIG_PMAC_BACKLIGHT if (M64_HAS(G3_PB_1_1) && machine_is_compatible("PowerBook1,1")) {