diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-07-07 09:50:12 +1000 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2014-09-30 13:34:09 +0200 |
| commit | 2c7d8736af209c7e5840c16a9167ad954774ce4c (patch) | |
| tree | 30830782ad4f0c193d142309664fd83da4577568 /hw/display | |
| parent | e657d8ef3c810c4c46d3a61bb76103f77bdb499b (diff) | |
| download | qemu-2c7d8736af209c7e5840c16a9167ad954774ce4c.tar.gz | |
vga: Make fb endian a common state variable
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>
Diffstat (limited to 'hw/display')
| -rw-r--r-- | hw/display/vga.c | 32 | ||||
| -rw-r--r-- | hw/display/vga_int.h | 1 |
2 files changed, 20 insertions, 13 deletions
diff --git a/hw/display/vga.c b/hw/display/vga.c index 9f60f88610..49a4b8bb8f 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -1461,16 +1461,11 @@ static void vga_draw_graphic(VGACommonState *s, int full_update) int disp_width, multi_scan, multi_run; uint8_t *d; uint32_t v, addr1, addr; - vga_draw_line_func *vga_draw_line; -#if defined(TARGET_WORDS_BIGENDIAN) - static const bool big_endian_fb = true; -#else - static const bool big_endian_fb = false; -#endif -#if defined(HOST_WORDS_BIGENDIAN) - static const bool byteswap = !big_endian_fb; + vga_draw_line_func *vga_draw_line = NULL; +#ifdef HOST_WORDS_BIGENDIAN + bool byteswap = !s->big_endian_fb; #else - static const bool byteswap = big_endian_fb; + bool byteswap = s->big_endian_fb; #endif full_update |= update_basic_params(s); @@ -1573,19 +1568,19 @@ static void vga_draw_graphic(VGACommonState *s, int full_update) bits = 8; break; 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; break; 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; break; 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; break; 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; 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; 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); } diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h index 9073370a84..28d67cf236 100644 --- a/hw/display/vga_int.h +++ b/hw/display/vga_int.h @@ -157,6 +157,7 @@ typedef struct VGACommonState { const GraphicHwOps *hw_ops; bool full_update_text; bool full_update_gfx; + bool big_endian_fb; /* hardware mouse cursor support */ uint32_t invalidated_y_table[VGA_MAX_HEIGHT / 32]; void (*cursor_invalidate)(struct VGACommonState *s); |