Commit 59926de9 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



vga: add ramfb, print virglrenderer version

# gpg: Signature made Mon 18 Jun 2018 10:57:38 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/vga-20180618-pull-request:
  Add ramfb MAINTAINERS entry
  hw/display: add standalone ramfb device
  hw/display: add ramfb, a simple boot framebuffer living in guest ram
  configure: print virglrenderer version

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents be33f56c 58d632c7

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -1331,6 +1331,12 @@ F: hw/display/bochs-display.c 
F: include/hw/display/vga.h

F: include/hw/display/bochs-vbe.h



ramfb

M: Gerd Hoffmann <kraxel@redhat.com>

S: Maintained

F: hw/display/ramfb*.c

F: include/hw/display/ramfb.h



virtio-gpu

M: Gerd Hoffmann <kraxel@redhat.com>

S: Maintained

configure

+2 −1
Original line number Diff line number Diff line
@@ -4599,6 +4599,7 @@ int main(void) { virgl_renderer_poll(); return 0; } 
EOF

  virgl_cflags=$($pkg_config --cflags virglrenderer 2>/dev/null)

  virgl_libs=$($pkg_config --libs virglrenderer 2>/dev/null)

  virgl_version=$($pkg_config --modversion virglrenderer 2>/dev/null)

  if $pkg_config virglrenderer >/dev/null 2>&1 && \

     compile_prog "$virgl_cflags" "$virgl_libs" ; then

    virglrenderer="yes"
@@ -5827,7 +5828,7 @@ echo "nettle $nettle $(echo_version $nettle $nettle_version)" 
echo "nettle kdf        $nettle_kdf"

echo "libtasn1          $tasn1"

echo "curses support    $curses"

echo "virgl support     $virglrenderer"

echo "virgl support     $virglrenderer $(echo_version $virglrenderer $virgl_version)"

echo "curl support      $curl"

echo "mingw32 support   $mingw32"

echo "Audio drivers     $audio_drv_list"

hw/arm/sysbus-fdt.c

+7 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "hw/vfio/vfio-platform.h"

#include "hw/vfio/vfio-calxeda-xgmac.h"

#include "hw/vfio/vfio-amd-xgbe.h"

#include "hw/display/ramfb.h"

#include "hw/arm/fdt.h"



/*
@@ -406,12 +407,18 @@ static int add_amd_xgbe_fdt_node(SysBusDevice *sbdev, void *opaque) 


#endif /* CONFIG_LINUX */



static int no_fdt_node(SysBusDevice *sbdev, void *opaque)

{

    return 0;

}



/* list of supported dynamic sysbus devices */

static const NodeCreationPair add_fdt_node_functions[] = {

#ifdef CONFIG_LINUX

    {TYPE_VFIO_CALXEDA_XGMAC, add_calxeda_midway_xgmac_fdt_node},

    {TYPE_VFIO_AMD_XGBE, add_amd_xgbe_fdt_node},

#endif

    {TYPE_RAMFB_DEVICE, no_fdt_node},

    {"", NULL}, /* last element */

};

hw/arm/virt.c

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "hw/arm/virt.h"

#include "hw/vfio/vfio-calxeda-xgmac.h"

#include "hw/vfio/vfio-amd-xgbe.h"

#include "hw/display/ramfb.h"

#include "hw/devices.h"

#include "net/net.h"

#include "sysemu/device_tree.h"
@@ -1659,6 +1660,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) 
    mc->max_cpus = 255;

    machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_CALXEDA_XGMAC);

    machine_class_allow_dynamic_sysbus_dev(mc, TYPE_VFIO_AMD_XGBE);

    machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE);

    mc->block_default_type = IF_VIRTIO;

    mc->no_cdrom = 1;

    mc->pci_allow_0_address = true;

hw/display/Makefile.objs

+3 −0
Original line number Diff line number Diff line 
common-obj-y += ramfb.o

common-obj-y += ramfb-standalone.o



common-obj-$(CONFIG_ADS7846) += ads7846.o

common-obj-$(CONFIG_VGA_CIRRUS) += cirrus_vga.o

common-obj-$(CONFIG_G364FB) += g364fb.o