david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vga: Make fb endian a common state variable

Browse Source 
And initialize it based on target endian

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Benjamin Herrenschmidt 2014-07-07 09:50:12 +10:00 committed by Gerd Hoffmann
parent e657d8ef3c
commit 2c7d8736af
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hw/display/vga.c
View File

@ -1461,16 +1461,11 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
int disp_width, multi_scan, multi_run; int disp_width, multi_scan, multi_run;
uint8_t *d; uint8_t *d;
uint32_t v, addr1, addr; uint32_t v, addr1, addr;
vga_draw_line_func *vga_draw_line; vga_draw_line_func *vga_draw_line = NULL;
#if defined(TARGET_WORDS_BIGENDIAN) #ifdef HOST_WORDS_BIGENDIAN
static const bool big_endian_fb = true; bool byteswap = !s->big_endian_fb;
#else #else
static const bool big_endian_fb = false; bool byteswap = s->big_endian_fb;
#endif
#if defined(HOST_WORDS_BIGENDIAN)
static const bool byteswap = !big_endian_fb;
#else
static const bool byteswap = big_endian_fb;
#endif #endif
full_update |= update_basic_params(s); full_update |= update_basic_params(s);
@ -1573,19 +1568,19 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
bits = 8; bits = 8;
break; break;
case 15: case 15:
v = big_endian_fb ? VGA_DRAW_LINE15_BE : VGA_DRAW_LINE15_LE; v = s->big_endian_fb ? VGA_DRAW_LINE15_BE : VGA_DRAW_LINE15_LE;
bits = 16; bits = 16;
break; break;
case 16: case 16:
v = big_endian_fb ? VGA_DRAW_LINE16_BE : VGA_DRAW_LINE16_LE; v = s->big_endian_fb ? VGA_DRAW_LINE16_BE : VGA_DRAW_LINE16_LE;
bits = 16; bits = 16;
break; break;
case 24: case 24:
v = big_endian_fb ? VGA_DRAW_LINE24_BE : VGA_DRAW_LINE24_LE; v = s->big_endian_fb ? VGA_DRAW_LINE24_BE : VGA_DRAW_LINE24_LE;
bits = 24; bits = 24;
break; break;
case 32: case 32:
v = big_endian_fb ? VGA_DRAW_LINE32_BE : VGA_DRAW_LINE32_LE; v = s->big_endian_fb ? VGA_DRAW_LINE32_BE : VGA_DRAW_LINE32_LE;
bits = 32; bits = 32;
break; break;
} }
@ -2129,6 +2124,17 @@ void vga_common_init(VGACommonState *s, Object *obj, bool global_vmstate)
s->update_retrace_info = vga_precise_update_retrace_info; s->update_retrace_info = vga_precise_update_retrace_info;
break; break;
} }
/*
* Set default fb endian based on target, should probably be turned
* into a device attribute set by the machine/platform to remove
* all target endian dependencies from this file.
*/
#ifdef TARGET_WORDS_BIGENDIAN
s->big_endian_fb = true;
#else
s->big_endian_fb = false;
#endif
vga_dirty_log_start(s); vga_dirty_log_start(s);
} }

1
hw/display/vga_int.h
View File

@ -157,6 +157,7 @@ typedef struct VGACommonState {
const GraphicHwOps *hw_ops; const GraphicHwOps *hw_ops;
bool full_update_text; bool full_update_text;
bool full_update_gfx; bool full_update_gfx;
bool big_endian_fb;
/* hardware mouse cursor support */ /* hardware mouse cursor support */
uint32_t invalidated_y_table[VGA_MAX_HEIGHT / 32]; uint32_t invalidated_y_table[VGA_MAX_HEIGHT / 32];
void (*cursor_invalidate)(struct VGACommonState *s); void (*cursor_invalidate)(struct VGACommonState *s);