Commit ba4cb9e1 authored by James Simmons's avatar James Simmons

A bunch of fixes needed.

parent 4242aca8
...@@ -2625,7 +2625,7 @@ static int atyfbcon_switch(int con, struct fb_info *fb) ...@@ -2625,7 +2625,7 @@ static int atyfbcon_switch(int con, struct fb_info *fb)
#ifdef CONFIG_FB_ATY_CT #ifdef CONFIG_FB_ATY_CT
/* Erase HW Cursor */ /* Erase HW Cursor */
if (info->cursor) if (info->cursor && (fb->currcon >= 0))
atyfb_cursor(&fb_display[fb->currcon], CM_ERASE, atyfb_cursor(&fb_display[fb->currcon], CM_ERASE,
info->cursor->pos.x, info->cursor->pos.y); info->cursor->pos.x, info->cursor->pos.y);
#endif /* CONFIG_FB_ATY_CT */ #endif /* CONFIG_FB_ATY_CT */
......
/* /*
* FBcon low-level driver for 32 bpp packed pixel (cfb32) * FBcon low-level driver that is a wrapper for the accel engine.
*/ */
#ifndef _VIDEO_FBCON_ACCEL_H #ifndef _VIDEO_FBCON_ACCEL_H
......
...@@ -579,7 +579,6 @@ static void sisfb_set_disp (int con, struct fb_var_screeninfo *var) ...@@ -579,7 +579,6 @@ static void sisfb_set_disp (int con, struct fb_var_screeninfo *var)
sisfb_get_fix (&fix, con, 0); sisfb_get_fix (&fix, con, 0);
display->screen_base = ivideo.video_vbase;
display->visual = fix.visual; display->visual = fix.visual;
display->type = fix.type; display->type = fix.type;
display->type_aux = fix.type_aux; display->type_aux = fix.type_aux;
...@@ -2769,6 +2768,7 @@ sishw_ext.usExternalChip = 0; ...@@ -2769,6 +2768,7 @@ sishw_ext.usExternalChip = 0;
fb_info.changevar = NULL; fb_info.changevar = NULL;
fb_info.node = NODEV; fb_info.node = NODEV;
fb_info.fbops = &sisfb_ops; fb_info.fbops = &sisfb_ops;
fb_info.screen_base = ivideo.video_vbase;
fb_info.disp = &disp; fb_info.disp = &disp;
fb_info.currcon = -1; fb_info.currcon = -1;
fb_info.switch_con = &sisfb_switch; fb_info.switch_con = &sisfb_switch;
......
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