[PATCH] Fix vesafb display panning regression

["Antonino A. Daplas" <adaplas@gmail.com>]

Fix vesafb hang when scroll mode is REDRAW.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
---

Jesper Juhl wrote:
> On 12/11/05, Andrew Morton <akpm@osdl.org> wrote:
>> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.15-rc5/2.6.15-rc5-mm2/
>>
> When booting this kernel with  vga=791 like I normally do, the kernel
> hangs on boot. Booting with vga=normal works just fine.
> I don't have very much info since as soon as the videomode is switched
> I get a small rectangle of messed up colours in the top left corner of
> the screen (the rest is just black) and then it hangs - even the
> keyboard is dead, I have to powercycle the machine.
> Nothing makes it to the logs and I don't have a second machine atm to
> get logs via serial console or netconsole.
> I've got the vesafb driver build in, none of the other fb drivers.
> 

Sorry about that.  This particular hunk was missing in the 
vesafb_trim_pan_display.patch

Tony

 drivers/video/vesafb.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index e6e56b8..8982e54 100644
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -417,6 +417,9 @@ static int __init vesafb_probe(struct pl
 	info->flags = FBINFO_FLAG_DEFAULT |
 		(ypan) ? FBINFO_HWACCEL_YPAN : 0;
 
+	if (!ypan)
+		info->fbops->fb_pan_display = NULL;
+
 	if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
 		err = -ENOMEM;
 		goto err;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/