Commit a6f6d247 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190507-pull-request' into staging 



vga: bugfixes for qxl, cirrus, ati.
vga: add "-vga help" support.
vga: move i2c-ddc to display.

# gpg: Signature made Tue 07 May 2019 09:19: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/vga-20190507-pull-request:
  i2c-ddc: move it to hw/display
  ati-vga: Fix check for blt outside vram
  qxl: avoid unaligned pointer reads/writes
  vl: add -vga help support
  vl: constify VGAInterfaceInfo
  hw/display/cirrus_vga: Remove unused include
  hw/display/cirrus_vga: Update the documentation URL
  qxl: check release info object

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d6de7fed 6306cae2

hw/display/Kconfig

+5 −0
Original line number Diff line number Diff line 
config DDC

    bool

    depends on I2C

    select EDID



config EDID

    bool

hw/display/Makefile.objs

+1 −0
Original line number Diff line number Diff line 
common-obj-$(CONFIG_DDC) += i2c-ddc.o

common-obj-$(CONFIG_EDID) += edid-generate.o edid-region.o



common-obj-$(CONFIG_FW_CFG_DMA) += ramfb.o

hw/display/ati_2d.c

+6 −6
Original line number Diff line number Diff line
@@ -79,10 +79,10 @@ void ati_2d_blt(ATIVGAState *s) 
                s->regs.dst_width, s->regs.dst_height);

        end = s->vga.vram_ptr + s->vga.vram_size;

        if (src_bits >= end || dst_bits >= end ||

            src_bits + (s->regs.src_y + s->regs.dst_height) * src_stride +

            s->regs.src_x >= end ||

            dst_bits + (s->regs.dst_y + s->regs.dst_height) * dst_stride +

            s->regs.dst_x >= end) {

            src_bits + s->regs.src_x + (s->regs.src_y + s->regs.dst_height) *

            src_stride * sizeof(uint32_t) >= end ||

            dst_bits + s->regs.dst_x + (s->regs.dst_y + s->regs.dst_height) *

            dst_stride * sizeof(uint32_t) >= end) {

            qemu_log_mask(LOG_UNIMP, "blt outside vram not implemented\n");

            return;

        }
@@ -140,8 +140,8 @@ void ati_2d_blt(ATIVGAState *s) 
                filler);

        end = s->vga.vram_ptr + s->vga.vram_size;

        if (dst_bits >= end ||

            dst_bits + (s->regs.dst_y + s->regs.dst_height) * dst_stride +

            s->regs.dst_x >= end) {

            dst_bits + s->regs.dst_x + (s->regs.dst_y + s->regs.dst_height) *

            dst_stride * sizeof(uint32_t) >= end) {

            qemu_log_mask(LOG_UNIMP, "blt outside vram not implemented\n");

            return;

        }

hw/display/cirrus_vga.c

+7 −3
Original line number Diff line number Diff line
@@ -23,8 +23,13 @@ 
 * THE SOFTWARE.

 */

/*

 * Reference: Finn Thogersons' VGADOC4b

 *   available at http://home.worldonline.dk/~finth/

 * Reference: Finn Thogersons' VGADOC4b:

 *

 *  http://web.archive.org/web/20021019054927/http://home.worldonline.dk/finth/

 *

 * VGADOC4b.ZIP content available at:

 *

 *  https://pdos.csail.mit.edu/6.828/2005/readings/hardware/vgadoc

 */

#include "qemu/osdep.h"

#include "qemu/units.h"
@@ -33,7 +38,6 @@ 
#include "hw/hw.h"

#include "hw/pci/pci.h"

#include "ui/pixel_ops.h"

#include "hw/loader.h"

#include "cirrus_vga_internal.h"



/*

hw/i2c/i2c-ddc.c→hw/display/i2c-ddc.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include "qemu-common.h"

#include "qemu/log.h"

#include "hw/i2c/i2c.h"

#include "hw/i2c/i2c-ddc.h"

#include "hw/display/i2c-ddc.h"



#ifndef DEBUG_I2CDDC

#define DEBUG_I2CDDC 0