Re: cg14 frambuffer bug in 2.2.19 (and probably 2.4.x as well)

[Alex Buell]

On Sat, 28 Jul 2001, Anton Blanchard wrote:

> Im compiling my kernels on 2.95.3 at the moment. I found one bug that
> turned out to be my fault (in include/asm-sparc/bitops.h), but there
> are sure to be more I havent caught yet.

Hmm, just seen davem's list of CVS commits, have run an update just now,
and will try again using 2.95.3.

Here's a patch to apply on top of the fix applied to 2.4.7 today, to fix
the ugliness of the if {} else {} statement and save a few bytes.

PS: If we need to discuss this any further, let's move this back to
sparclinux mailing list, shall we?

--- linux/drivers/video/cgfourteenfb.c.orig     Fri Jul 27 17:41:15 2001
+++ linux/drivers/video/cgfourteenfb.c  Fri Jul 27 17:46:15 2001
@@ -236,19 +236,17 @@
        struct cg_cursor *c = &fb->cursor;
        struct cg14_cursor *cur = fb->s.cg14.cursor;
        unsigned long flags;
+       u8 tmp;

        spin_lock_irqsave(&fb->lock, flags);
-       if (c->enable) {
-               u8 tmp = sbus_readb(&cur->ccr);
+       tmp = sbus_readb(&cur->ccr);

+       if (c->enable)
                tmp |= CG14_CCR_ENABLE;
-               sbus_writeb(tmp, &cur->ccr);
-       } else {
-               u8 tmp = sbus_readb(&cur->ccr);
-
+       else
                tmp &= ~CG14_CCR_ENABLE;
-               sbus_writeb(tmp, &cur->ccr);
-       }
+
+       sbus_writeb(tmp, &cur->ccr);
        sbus_writew(((c->cpos.fbx - c->chot.fbx) & 0xfff), &cur->cursx);
        sbus_writew(((c->cpos.fby - c->chot.fby) & 0xfff), &cur->cursy);
        spin_unlock_irqrestore(&fb->lock, flags);

-- 
Hey, they *are* out to get you, but it's nothing personal.

http://www.tahallah.demon.co.uk