Commit e62cabb5 authored Jan 23, 2014 by Mikulas Patocka Committed by Tomi Valkeinen Feb 11, 2014

tgafb: avoid restriction on modes with line length not a multiple of 64



In tgafb there is a restriction that prevents the user from setting a
videomode with line length not a multiple of 64 bytes (for example,
800x600 is not allowed).

The reason for this restriction it that functions copyarea_line_8bpp and
copyarea_line_32bpp can not handle a line length that is not a multiple
of 64 bytes.

This patch removes this restriction on mode setting and makes sure that
the functions copyarea_line_8bpp and copyarea_line_32bpp are called only
if line length is a multiple of 64 bytes. If we set a mode 800x600,
the functions copyarea_line_8bpp and copyarea_line_32bpp are not used,
generic functions for copying are used instead and it works just fine.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

parent 6b0df682

drivers/video/tgafb.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -192,8 +192,8 @@ tgafb_check_var(struct fb_var_screeninfo var, struct fb_info info)
		return -EINVAL;

		/* Some of the acceleration routines assume the line width is
		a multiple of 64 bytes. */
		if (var->xres * (par->tga_type == TGA_TYPE_8PLANE ? 1 : 4) % 64)
		a multiple of 8 bytes. */
		if (var->xres * (par->tga_type == TGA_TYPE_8PLANE ? 1 : 4) % 8)
		return -EINVAL;

		return 0;
		@@ -1280,7 +1280,7 @@ tgafb_copyarea(struct fb_info info, const struct fb_copyarea area)
		bpp = info->var.bits_per_pixel;

		/* Detect copies of the entire line. */
		if (width * (bpp >> 3) == line_length) {
		if (!(line_length & 63) && width * (bpp >> 3) == line_length) {
		if (bpp == 8)
		copyarea_line_8bpp(info, dy, sy, height, width);
		else