Commit 0089bf1f authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Greg Kroah-Hartman

Staging: xgifb: Remove all the references to XGIfb_accel

xgifb framebuffer driver has an option to use an accelerator engine that never
get used (XGIfb_accel is always 0).

An earlier patchset remove the code that depends on the accelerator being
activated. This patch removes all the references to XGIfb_accel.
Signed-off-by: default avatarJavier Martinez Canillas <martinez.javier@gmail.com>
Acked-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c73d0d55
...@@ -478,7 +478,6 @@ int fbcon_XGI_sync(struct fb_info *info); ...@@ -478,7 +478,6 @@ int fbcon_XGI_sync(struct fb_info *info);
extern struct video_info xgi_video_info; extern struct video_info xgi_video_info;
extern int XGIfb_accel;
void fbcon_XGI_fillrect(struct fb_info *info, const struct fb_fillrect *rect); void fbcon_XGI_fillrect(struct fb_info *info, const struct fb_fillrect *rect);
void fbcon_XGI_copyarea(struct fb_info *info, const struct fb_copyarea *area); void fbcon_XGI_copyarea(struct fb_info *info, const struct fb_copyarea *area);
......
...@@ -43,8 +43,6 @@ ...@@ -43,8 +43,6 @@
#include "XGI_main.h" #include "XGI_main.h"
#include "vb_util.h" #include "vb_util.h"
int XGIfb_accel = 0;
#define Index_CR_GPIO_Reg1 0x48 #define Index_CR_GPIO_Reg1 0x48
#define Index_CR_GPIO_Reg2 0x49 #define Index_CR_GPIO_Reg2 0x49
#define Index_CR_GPIO_Reg3 0x4a #define Index_CR_GPIO_Reg3 0x4a
...@@ -1190,10 +1188,6 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive, ...@@ -1190,10 +1188,6 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
xgi_video_info.video_linelength = info->var.xres_virtual xgi_video_info.video_linelength = info->var.xres_virtual
* (xgi_video_info.video_bpp >> 3); * (xgi_video_info.video_bpp >> 3);
xgi_video_info.accel = 0; xgi_video_info.accel = 0;
if (XGIfb_accel) {
xgi_video_info.accel = (var->accel_flags
& FB_ACCELF_TEXT) ? -1 : 0;
}
switch (xgi_video_info.video_bpp) { switch (xgi_video_info.video_bpp) {
case 8: case 8:
xgi_video_info.DstColor = 0x0000; xgi_video_info.DstColor = 0x0000;
...@@ -2856,8 +2850,6 @@ XGIINITSTATIC int __init XGIfb_setup(char *options) ...@@ -2856,8 +2850,6 @@ XGIINITSTATIC int __init XGIfb_setup(char *options)
printk(KERN_INFO "XGIfb: Illegal pdc parameter\n"); printk(KERN_INFO "XGIfb: Illegal pdc parameter\n");
XGIfb_pdc = 0; XGIfb_pdc = 0;
} }
} else if (!strncmp(this_opt, "noaccel", 7)) {
XGIfb_accel = 0;
} else if (!strncmp(this_opt, "noypan", 6)) { } else if (!strncmp(this_opt, "noypan", 6)) {
XGIfb_ypan = 0; XGIfb_ypan = 0;
} else if (!strncmp(this_opt, "userom:", 7)) { } else if (!strncmp(this_opt, "userom:", 7)) {
...@@ -2872,11 +2864,9 @@ XGIINITSTATIC int __init XGIfb_setup(char *options) ...@@ -2872,11 +2864,9 @@ XGIINITSTATIC int __init XGIfb_setup(char *options)
/* TW: Acceleration only with MMIO mode */ /* TW: Acceleration only with MMIO mode */
if ((XGIfb_queuemode != -1) && (XGIfb_queuemode != MMIO_CMD)) { if ((XGIfb_queuemode != -1) && (XGIfb_queuemode != MMIO_CMD)) {
XGIfb_ypan = 0; XGIfb_ypan = 0;
XGIfb_accel = 0;
} }
/* TW: Panning only with acceleration */ /* TW: Panning only with acceleration */
if (XGIfb_accel == 0) XGIfb_ypan = 0;
XGIfb_ypan = 0;
} }
printk("\nxgifb: outa xgifb_setup 3450"); printk("\nxgifb: outa xgifb_setup 3450");
...@@ -3370,11 +3360,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, ...@@ -3370,11 +3360,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
} }
xgi_video_info.accel = 0; xgi_video_info.accel = 0;
if (XGIfb_accel) {
xgi_video_info.accel = -1;
default_var.accel_flags |= FB_ACCELF_TEXT;
XGIfb_initaccel();
}
fb_info->flags = FBINFO_FLAG_DEFAULT; fb_info->flags = FBINFO_FLAG_DEFAULT;
fb_info->var = default_var; fb_info->var = default_var;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment