diff options
author | Antonino A. Daplas <adaplas@gmail.com> | 2005-12-13 01:17:16 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-13 01:31:17 -0500 |
commit | 4743484718e1d710321f24f8ef7d0124a48291b3 (patch) | |
tree | fde7dc00a58aa4a326573018d844143ba07e0138 /drivers/video/console | |
parent | 56f0d64de80733bda54d1cfa7ac0c736ab2de33b (diff) |
[PATCH] fbcon: Add ability to save/restore graphics state
Add hooks to save and restore the graphics state. These hooks are called in
fbcon_blank() when entering/leaving KD_GRAPHICS mode. This is needed by
savagefb at least so it can cooperate with savage_dri and by cyblafb.
State save/restoration can be full or partial.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/console')
-rw-r--r-- | drivers/video/console/fbcon.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index c024ffd0266d..bd4500a8992e 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c | |||
@@ -2191,11 +2191,14 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch) | |||
2191 | ops->graphics = 1; | 2191 | ops->graphics = 1; |
2192 | 2192 | ||
2193 | if (!blank) { | 2193 | if (!blank) { |
2194 | if (info->fbops->fb_save_state) | ||
2195 | info->fbops->fb_save_state(info); | ||
2194 | var.activate = FB_ACTIVATE_NOW | FB_ACTIVATE_FORCE; | 2196 | var.activate = FB_ACTIVATE_NOW | FB_ACTIVATE_FORCE; |
2195 | fb_set_var(info, &var); | 2197 | fb_set_var(info, &var); |
2196 | ops->graphics = 0; | 2198 | ops->graphics = 0; |
2197 | ops->var = info->var; | 2199 | ops->var = info->var; |
2198 | } | 2200 | } else if (info->fbops->fb_restore_state) |
2201 | info->fbops->fb_restore_state(info); | ||
2199 | } | 2202 | } |
2200 | 2203 | ||
2201 | if (!fbcon_is_inactive(vc, info)) { | 2204 | if (!fbcon_is_inactive(vc, info)) { |