staging: xgifb: fix colours on big-endian machines other than powerpc
authorAaro Koskinen <aaro.koskinen@iki.fi>
Sun, 1 Feb 2015 15:01:33 +0000 (17:01 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 7 Feb 2015 09:24:11 +0000 (17:24 +0800)
XGI framebuffer supports big-endian machines, but it's currently
enabled based on __powerpc__ define (which is wrong, as powerpc can
be also little-endian now). Use __BIG_ENDIAN instead. This will fix
wrong colours on such machines.

Tested on parisc with XGI Z7.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/xgifb/XGI_main_26.c

index 74a8db8223fee605d33a8762eb74ba73dfc6cd44..935c714f592a4768d9d3f41ec56b9131f05243f5 100644 (file)
@@ -930,7 +930,7 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
                        + var->hsync_len;
        unsigned int vtotal = var->upper_margin + var->yres + var->lower_margin
                        + var->vsync_len;
-#if defined(__powerpc__)
+#if defined(__BIG_ENDIAN)
        u8 cr_data;
 #endif
        unsigned int drate = 0, hrate = 0;
@@ -1044,7 +1044,7 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
                        xgifb_info->DstColor = 0x0000;
                        xgifb_info->XGI310_AccelDepth = 0x00000000;
                        xgifb_info->video_cmap_len = 256;
-#if defined(__powerpc__)
+#if defined(__BIG_ENDIAN)
                        cr_data = xgifb_reg_get(XGICR, 0x4D);
                        xgifb_reg_set(XGICR, 0x4D, (cr_data & 0xE0));
 #endif
@@ -1052,7 +1052,7 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
                case 16:
                        xgifb_info->DstColor = 0x8000;
                        xgifb_info->XGI310_AccelDepth = 0x00010000;
-#if defined(__powerpc__)
+#if defined(__BIG_ENDIAN)
                        cr_data = xgifb_reg_get(XGICR, 0x4D);
                        xgifb_reg_set(XGICR, 0x4D, ((cr_data & 0xE0) | 0x0B));
 #endif
@@ -1062,7 +1062,7 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
                        xgifb_info->DstColor = 0xC000;
                        xgifb_info->XGI310_AccelDepth = 0x00020000;
                        xgifb_info->video_cmap_len = 16;
-#if defined(__powerpc__)
+#if defined(__BIG_ENDIAN)
                        cr_data = xgifb_reg_get(XGICR, 0x4D);
                        xgifb_reg_set(XGICR, 0x4D, ((cr_data & 0xE0) | 0x15));
 #endif