lkml.org 
[lkml]   [2005]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 06/16] Fix matroxfb on big-endian hardware
    There was too much/too few byteswapping done by driver and hardware in
    matroxfb on big endian hardware. Change fixes mirrored/split/corrupted
    letters seen on screen when using accelerated matroxfb mode.

    Patch was tested on Mips (by Peter) and x86-64 (by Petr).

    Signed-off-by: Peter 'p2' De Schrijver <p2@mind.be>
    Signed-off-by: Petr Vandrovec <vandrove@vc.cvut.cz>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/video/matrox/matroxfb_accel.c | 14 +++++++++++---
    drivers/video/matrox/matroxfb_base.h | 4 ++--
    2 files changed, 13 insertions(+), 5 deletions(-)

    --- linux-2.6.11.10.orig/drivers/video/matrox/matroxfb_accel.c 2005-05-16 10:50:40.000000000 -0700
    +++ linux-2.6.11.10/drivers/video/matrox/matroxfb_accel.c 2005-05-20 09:36:29.666663808 -0700
    @@ -438,13 +438,21 @@
    } else if (step == 1) {
    /* Special case for 1..8bit widths */
    while (height--) {
    - mga_writel(mmio, 0, *chardata);
    +#if defined(__BIG_ENDIAN)
    + fb_writel((*chardata) << 24, mmio.vaddr);
    +#else
    + fb_writel(*chardata, mmio.vaddr);
    +#endif
    chardata++;
    }
    } else if (step == 2) {
    /* Special case for 9..15bit widths */
    while (height--) {
    - mga_writel(mmio, 0, *(u_int16_t*)chardata);
    +#if defined(__BIG_ENDIAN)
    + fb_writel((*(u_int16_t*)chardata) << 16, mmio.vaddr);
    +#else
    + fb_writel(*(u_int16_t*)chardata, mmio.vaddr);
    +#endif
    chardata += 2;
    }
    } else {
    @@ -454,7 +462,7 @@

    for (i = 0; i < step; i += 4) {
    /* Hope that there are at least three readable bytes beyond the end of bitmap */
    - mga_writel(mmio, 0, get_unaligned((u_int32_t*)(chardata + i)));
    + fb_writel(get_unaligned((u_int32_t*)(chardata + i)),mmio.vaddr);
    }
    chardata += step;
    }
    --- linux-2.6.11.10.orig/drivers/video/matrox/matroxfb_base.h 2005-05-16 10:50:40.000000000 -0700
    +++ linux-2.6.11.10/drivers/video/matrox/matroxfb_base.h 2005-05-20 09:36:29.680661680 -0700
    @@ -170,14 +170,14 @@

    if ((unsigned long)src & 3) {
    while (len >= 4) {
    - writel(get_unaligned((u32 *)src), addr);
    + fb_writel(get_unaligned((u32 *)src), addr);
    addr++;
    len -= 4;
    src += 4;
    }
    } else {
    while (len >= 4) {
    - writel(*(u32 *)src, addr);
    + fb_writel(*(u32 *)src, addr);
    addr++;
    len -= 4;
    src += 4;
    -
    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/
    \
     
     \ /
      Last update: 2005-05-24 01:38    [W:0.027 / U:0.300 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site