Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a9c3f78 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Linus Torvalds
Browse files

[PATCH] Console rotation fixes 



Remove bogus usage of test/set_bit() from fbcon rotation code and just
manipulate the bits directly.  This fixes an oops on powerpc among others
and should be faster.  Seems to work fine on the G5 here.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8080f231

drivers/video/console/fbcon_ccw.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static inline void ccw_update_attr(u8 *dst, u8 *src, int attribute, 
		msk <<= (8 - mod);



	if (offset > mod)

		set_bit(FBCON_BIT(7), (void *)&msk1);

		msk1 |= 0x01;



	for (i = 0; i < vc->vc_font.width; i++) {

		for (j = 0; j < width; j++) {

drivers/video/console/fbcon_rotate.h

+3 −10
Original line number Diff line number Diff line
@@ -21,21 +21,13 @@ 
        (s == SCROLL_REDRAW || s == SCROLL_MOVE || !(i)->fix.xpanstep) ? \

        (i)->var.xres : (i)->var.xres_virtual; })



/*

 * The bitmap is always big endian

 */

#if defined(__LITTLE_ENDIAN)

#define FBCON_BIT(b) (7 - (b))

#else

#define FBCON_BIT(b) (b)

#endif



static inline int pattern_test_bit(u32 x, u32 y, u32 pitch, const char *pat)

{

	u32 tmp = (y * pitch) + x, index = tmp / 8,  bit = tmp % 8;



	pat +=index;

	return (test_bit(FBCON_BIT(bit), (void *)pat));

	return (*pat) & (0x80 >> bit);

}



static inline void pattern_set_bit(u32 x, u32 y, u32 pitch, char *pat)
@@ -43,7 +35,8 @@ static inline void pattern_set_bit(u32 x, u32 y, u32 pitch, char *pat) 
	u32 tmp = (y * pitch) + x, index = tmp / 8, bit = tmp % 8;



	pat += index;

	set_bit(FBCON_BIT(bit), (void *)pat);



	(*pat) |= 0x80 >> bit;

}



static inline void rotate_ud(const char *in, char *out, u32 width, u32 height)