Commit 3edea483 authored Aug 15, 2005 by Antonino A. Daplas Committed by Linus Torvalds Aug 15, 2005

[PATCH] intelfb/fbdev: Save info->flags in a local variable



Reported by: Pavel Kysilka (Bugzilla Bug 5059)

The intelfb driver does not keep resolution set with fbset after
switching to anot console and back.

Steps to reproduce:

  initial options: tty1,tty2 - 1024x768-60
  1) tty1 - fbset after booting (1024x768-60)
  2) tty1 - fbset 800x600-100
  tty1: 800x600-100
  3) swith to tty2, swith to tty1
  tty1: 1024x768-60 (the same resolution as default from kernel booting)

This bug is caused by intelfb unintentionally destroying info->flags in
set_par(). Therefore the flag, FBINFO_MISC_USEREVENT used to notify
fbcon of a mode change was cleared causing the above problem. This bug
though is not intelfb specific, as other drivers may also be affected.

The fix is to save info->flags in a local variable before calling any
of the driver hooks.  A more definitive fix (for post 2.6.13) is to
separate info->flags into one that is set by the driver and another that
is set by core fbdev/fbcon.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 6bd49341

drivers/video/fbmem.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -628,7 +628,7 @@ fb_pan_display(struct fb_info info, struct fb_var_screeninfo var)
		int
		fb_set_var(struct fb_info info, struct fb_var_screeninfo var)
		{
		int err;
		int err, flags = info->flags;

		if (var->activate & FB_ACTIVATE_INV_MODE) {
		struct fb_videomode mode1, mode2;
		@@ -682,7 +682,7 @@ fb_set_var(struct fb_info info, struct fb_var_screeninfo var)
		!list_empty(&info->modelist))
		err = fb_add_videomode(&mode, &info->modelist);

		if (!err && info->flags & FBINFO_MISC_USEREVENT) {
		if (!err && (flags & FBINFO_MISC_USEREVENT)) {
		struct fb_event event;

		info->flags &= ~FBINFO_MISC_USEREVENT;

Admin message