Fix framebuffer console upside-down ywrap scrolling

PATCH In review Knut Petersen 2 participants 2 messages Dec 20, 2005

Subsystems (2)

Framebuffer layer Console

lore

Share & tools

lore

Knut Petersen

author

2005-12-20 07:17 UTC #0 lore raw

PATCH 1/1 Fix framebuffer console upside-down ywrap scrolling

Whenever ywrap scrolling is selected together with 180 degree
screen rotation, 2.6.15-rc6 and earlier versions are broken. fb_pan_display() expects non-negative yoffsets, but ud_update_start() calls it with yoffsets down to -(yres - font height).
This patch transforms yoffset to the correct range 0 ... vyres-1.

Some obviously unneeded parentheses are removed, too.

Verified with cyblafb, should be applied before 2.6.15-final because it does fix the framebuffer rotation code introduced early in the 2.6.15 release cycle.

Signed-off-by Knut Petersen <[email protected]>

drivers/video/console/fbcon_ud.c +0 -0

diff -uprN -X linux/Documentation/dontdiff -x '*.bak' -x '*.ctx' linuxorig/drivers/video/console/fbcon_ud.c linux/drivers/video/console/fbcon_ud.c
@@ -420,13 +420,15 @@ static void ud_cursor(struct vc_data *vc

int ud_update_start(struct fb_info *info)

{
	struct fbcon_ops *ops = info->fbcon_par;
-	u32 xoffset, yoffset;
+	int xoffset, yoffset;
	u32 vyres = GETVYRES(ops->p->scrollmode, info);
	u32 vxres = GETVXRES(ops->p->scrollmode, info);
	int err;

- xoffset = (vxres - info->var.xres) - ops->var.xoffset;
- yoffset = (vyres - info->var.yres) - ops->var.yoffset;
+ xoffset = vxres - info->var.xres - ops->var.xoffset;
+ yoffset = vyres - info->var.yres - ops->var.yoffset;
+ if (yoffset < 0)

+		yoffset += vyres;
	ops->var.xoffset = xoffset;
	ops->var.yoffset = yoffset;
	err = fb_pan_display(info, &ops->var);

-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click

Antonino A. Daplas

Acked-by Antonino Daplas on v1 1/1

2005-12-20 07:57 UTC #1 lore raw

Quoted 6 lines · Knut Petersen

Whenever ywrap scrolling is selected together with 180 degree screen rotation, 2.6.15-rc6 and earlier versions are broken. fb_pan_display() expects non-negative yoffsets, but ud_update_start() calls it with yoffsets down to -(yres - font height). This patch transforms yoffset to the correct range 0 ... vyres-1.

Quoted 7 lines

Some obviously unneeded parentheses are removed, too.
Verified with cyblafb, should be applied before 2.6.15-final because it does fix the framebuffer rotation code introduced early in the 2.6.15 release cycle.
Signed-off-by Knut Petersen <[email protected]>

Acked-by Antonino Daplas <[email protected]>