Commit 084f67c9 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/ati-20190919-pull-request' into staging 



vga: fix cursor code in ati-vga.

# gpg: Signature made Thu 19 Sep 2019 10:10:32 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/ati-20190919-pull-request:
  ati: use vga_read_byte in ati_cursor_define
  vga: move access helpers to separate include file

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 590c0ac9 aab0e2a6

hw/display/ati.c

+10 −9
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "qemu/osdep.h"

#include "ati_int.h"

#include "ati_regs.h"

#include "vga-access.h"

#include "hw/qdev-properties.h"

#include "vga_regs.h"

#include "qemu/log.h"
@@ -135,19 +136,19 @@ static void ati_vga_switch_mode(ATIVGAState *s) 
static void ati_cursor_define(ATIVGAState *s)

{

    uint8_t data[1024];

    uint8_t *src;

    uint32_t srcoff;

    int i, j, idx = 0;



    if ((s->regs.cur_offset & BIT(31)) || s->cursor_guest_mode) {

        return; /* Do not update cursor if locked or rendered by guest */

    }

    /* FIXME handle cur_hv_offs correctly */

    src = s->vga.vram_ptr + s->regs.cur_offset -

    srcoff = s->regs.cur_offset -

        (s->regs.cur_hv_offs >> 16) - (s->regs.cur_hv_offs & 0xffff) * 16;

    for (i = 0; i < 64; i++) {

        for (j = 0; j < 8; j++, idx++) {

            data[idx] = src[i * 16 + j];

            data[512 + idx] = src[i * 16 + j + 8];

            data[idx] = vga_read_byte(&s->vga, srcoff + i * 16 + j);

            data[512 + idx] = vga_read_byte(&s->vga, srcoff + i * 16 + j + 8);

        }

    }

    if (!s->cursor) {
@@ -189,7 +190,7 @@ static void ati_cursor_invalidate(VGACommonState *vga) 
static void ati_cursor_draw_line(VGACommonState *vga, uint8_t *d, int scr_y)

{

    ATIVGAState *s = container_of(vga, ATIVGAState, vga);

    uint8_t *src;

    uint32_t srcoff;

    uint32_t *dp = (uint32_t *)d;

    int i, j, h;
@@ -199,13 +200,13 @@ static void ati_cursor_draw_line(VGACommonState *vga, uint8_t *d, int scr_y) 
        return;

    }

    /* FIXME handle cur_hv_offs correctly */

    src = s->vga.vram_ptr + s->cursor_offset + (scr_y - vga->hw_cursor_y) * 16;

    srcoff = s->cursor_offset + (scr_y - vga->hw_cursor_y) * 16;

    dp = &dp[vga->hw_cursor_x];

    h = ((s->regs.crtc_h_total_disp >> 16) + 1) * 8;

    for (i = 0; i < 8; i++) {

        uint32_t color;

        uint8_t abits = src[i];

        uint8_t xbits = src[i + 8];

        uint8_t abits = vga_read_byte(vga, srcoff + i);

        uint8_t xbits = vga_read_byte(vga, srcoff + i + 8);

        for (j = 0; j < 8; j++, abits <<= 1, xbits <<= 1) {

            if (abits & BIT(7)) {

                if (xbits & BIT(7)) {

hw/display/vga-access.h

0 → 100644
+49 −0
Original line number Diff line number Diff line 
/*

 * QEMU VGA Emulator templates

 *

 * Copyright (c) 2003 Fabrice Bellard

 *

 * Permission is hereby granted, free of charge, to any person obtaining a copy

 * of this software and associated documentation files (the "Software"), to deal

 * in the Software without restriction, including without limitation the rights

 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

 * copies of the Software, and to permit persons to whom the Software is

 * furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

 * THE SOFTWARE.

 */



static inline uint8_t vga_read_byte(VGACommonState *vga, uint32_t addr)

{

    return vga->vram_ptr[addr & vga->vbe_size_mask];

}



static inline uint16_t vga_read_word_le(VGACommonState *vga, uint32_t addr)

{

    uint32_t offset = addr & vga->vbe_size_mask & ~1;

    uint16_t *ptr = (uint16_t *)(vga->vram_ptr + offset);

    return lduw_le_p(ptr);

}



static inline uint16_t vga_read_word_be(VGACommonState *vga, uint32_t addr)

{

    uint32_t offset = addr & vga->vbe_size_mask & ~1;

    uint16_t *ptr = (uint16_t *)(vga->vram_ptr + offset);

    return lduw_be_p(ptr);

}



static inline uint32_t vga_read_dword_le(VGACommonState *vga, uint32_t addr)

{

    uint32_t offset = addr & vga->vbe_size_mask & ~3;

    uint32_t *ptr = (uint32_t *)(vga->vram_ptr + offset);

    return ldl_le_p(ptr);

}

hw/display/vga-helpers.h

+0 −26
Original line number Diff line number Diff line
@@ -95,32 +95,6 @@ static void vga_draw_glyph9(uint8_t *d, int linesize, 
    } while (--h);

}



static inline uint8_t vga_read_byte(VGACommonState *vga, uint32_t addr)

{

    return vga->vram_ptr[addr & vga->vbe_size_mask];

}



static inline uint16_t vga_read_word_le(VGACommonState *vga, uint32_t addr)

{

    uint32_t offset = addr & vga->vbe_size_mask & ~1;

    uint16_t *ptr = (uint16_t *)(vga->vram_ptr + offset);

    return lduw_le_p(ptr);

}



static inline uint16_t vga_read_word_be(VGACommonState *vga, uint32_t addr)

{

    uint32_t offset = addr & vga->vbe_size_mask & ~1;

    uint16_t *ptr = (uint16_t *)(vga->vram_ptr + offset);

    return lduw_be_p(ptr);

}



static inline uint32_t vga_read_dword_le(VGACommonState *vga, uint32_t addr)

{

    uint32_t offset = addr & vga->vbe_size_mask & ~3;

    uint32_t *ptr = (uint32_t *)(vga->vram_ptr + offset);

    return ldl_le_p(ptr);

}



/*

 * 4 color mode

 */

hw/display/vga.c

+1 −0
Original line number Diff line number Diff line
@@ -1009,6 +1009,7 @@ void vga_mem_writeb(VGACommonState *s, hwaddr addr, uint32_t val) 
typedef void vga_draw_line_func(VGACommonState *s1, uint8_t *d,

                                uint32_t srcaddr, int width);



#include "vga-access.h"

#include "vga-helpers.h"



/* return true if the palette was modified */