Fwd: [PATCH 2.5.59] fix for fbcon.c

[Alexander Kern <alex.kern@gmx.de>]

[-- Attachment #1: Type: text/plain, Size: 1317 bytes --]



----------  Weitergeleitete Nachricht  ----------

Subject: [PATCH 2.5.59] fix for fbcon.c
Date: Sun, 19 Jan 2003 19:36:12 +0100
From: Alexander Kern <alex.kern@gmx.de>
To: fb-devel@lists.sourceforge.net

Hello,

hier is a fix needed by 1400x1050 resolution. fbcon_resize() without fis set
resolution to 1400x1040 and confusing LCD vertical stretching.

Regards
Alex

PS: I have retest both kernel versions, here is a result.

COMPAQ ARMADA E500, ATI (Mach64) Rage 3D Mobility P/M
15" with native 1400x1050 pixel

                        2.4.21-pre3                              2.5.59
640x400        perfect(LOGO)                        perfect
640x480        perfect(LOGO)                        perfect
800x600        perfect                                      perfect
1024x768      h. overlapping(LOGO)          h. overlapping
1152x864      h. overlapping                        h. overlapping
1280x1024    h. overlapping                        h. overlapping
1400x1050    perfect                                   perfect (with this
 fix)

LOGO by 640x4?0 means strange blue pixels as mirror of pinguin
LOGO by 1024x768 means shift to top, pinguin head is unvisible
h. overlapping means mostly stretching issue.

-------------------------------------------------------


[-- Attachment #2: fbcon.diff --]
[-- Type: text/x-diff, Size: 997 bytes --]

--- linux-2.5.orig/drivers/video/console/fbcon.c	2003-01-17 16:13:53.000000000 +0100
+++ linux/drivers/video/console/fbcon.c	2003-01-19 19:17:23.000000000 +0100
@@ -1876,17 +1876,23 @@
 	struct display *p = &fb_display[vc->vc_num];
 	struct fb_info *info = p->fb_info;
 	struct fb_var_screeninfo var = info->var;
-	int err;
+	int err; int x_diff, y_diff;
 
 	var.xres = width * vc->vc_font.width;
 	var.yres = height * vc->vc_font.height;
 	var.activate = FB_ACTIVATE_NOW;
-
+	x_diff = info->var.xres - var.xres;
+	y_diff = info->var.yres - var.yres;
+	if(x_diff < 0 || x_diff > vc->vc_font.width ||
+	  (y_diff < 0 || y_diff > vc->vc_font.height)) {
+		DPRINTK("resize now %ix%i\n", var.xres, var.yres);
 	err = fb_set_var(&var, info);
 	return  (err || var.xres != info->var.xres ||
-		 var.yres != info->var.yres) ?
-		-EINVAL : 0;
-	  
+			var.yres != info->var.yres) ? -EINVAL : 0;
+	} else {
+		DPRINTK("prevent resize\n");
+		return 0;
+	}
 }
 
 static int fbcon_switch(struct vc_data *vc)