From: "Luiz Fernando N. Capitulino" <lcapitulino@prefeitura.sp.gov.br>
Speaking with frame buffer people, we agree with this patch to fix the
warning:
drivers/video/tridentfb.c:455: warning: `tridentfb_fillrect' defined but not used
drivers/video/tridentfb.c:473: warning: `tridentfb_copyarea' defined but not used
---
25-akpm/drivers/video/Kconfig | 8 ++++++++
25-akpm/drivers/video/tridentfb.c | 13 ++++++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
diff -puN drivers/video/Kconfig~tridentfbc-warning-fix drivers/video/Kconfig
--- 25/drivers/video/Kconfig~tridentfbc-warning-fix Thu Apr 29 15:49:05 2004
+++ 25-akpm/drivers/video/Kconfig Thu Apr 29 15:49:05 2004
@@ -787,6 +787,14 @@ config FB_TRIDENT
To compile this driver as a module, choose M here: the
module will be called tridentfb.
+config FB_TRIDENT_ACCEL
+ bool "Trident Acceleration functions (EXPERIMENTAL)"
+ depends on FB_TRIDENT
+ ---help---
+ This will compile the Trident frame buffer device with
+ acceleration functions.
+
+
config FB_PM3
tristate "Permedia3 support"
depends on FB && PCI && BROKEN
diff -puN drivers/video/tridentfb.c~tridentfbc-warning-fix drivers/video/tridentfb.c
--- 25/drivers/video/tridentfb.c~tridentfbc-warning-fix Thu Apr 29 15:49:05 2004
+++ 25-akpm/drivers/video/tridentfb.c Thu Apr 29 15:49:05 2004
@@ -450,7 +450,7 @@ static struct accel_switch accel_image =
/*
* Accel functions called by the upper layers
*/
-
+#ifdef CONFIG_FB_TRIDENT_ACCEL
static void tridentfb_fillrect(struct fb_info * info, const struct fb_fillrect *fr)
{
int bpp = info->var.bits_per_pixel;
@@ -474,6 +474,11 @@ static void tridentfb_copyarea(struct fb
acc->copy_rect(ca->sx,ca->sy,ca->dx,ca->dy,ca->width,ca->height);
acc->wait_engine();
}
+#else /* !CONFIG_FB_TRIDENT_ACCEL */
+#define tridentfb_fillrect cfb_fillrect
+#define tridentfb_copyarea cfb_copyarea
+#endif /* CONFIG_FB_TRIDENT_ACCEL */
+
/*
* Hardware access functions
@@ -1265,10 +1270,8 @@ static struct fb_ops tridentfb_ops = {
.fb_blank = tridentfb_blank,
.fb_check_var = tridentfb_check_var,
.fb_set_par = tridentfb_set_par,
-// .fb_fillrect = tridentfb_fillrect,
-// .fb_copyarea= tridentfb_copyarea,
- .fb_fillrect = cfb_fillrect,
- .fb_copyarea= cfb_copyarea,
+ .fb_fillrect = tridentfb_fillrect,
+ .fb_copyarea= tridentfb_copyarea,
.fb_imageblit = cfb_imageblit,
.fb_cursor = soft_cursor,
};
_