[Qemu-commits] [qemu/qemu] 323279: ppc: fix default VGA display for Mac machines

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 3232794bcb77940dd7167abb8cc72897883523f6
      
https://github.com/qemu/qemu/commit/3232794bcb77940dd7167abb8cc72897883523f6
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-07-07 (Sat, 07 Jul 2018)

  Changed paths:
    M hw/ppc/mac_newworld.c
    M hw/ppc/mac_oldworld.c

  Log Message:
  -----------
  ppc: fix default VGA display for Mac machines

Commit 29f9cef39e "ppc: Include vga cirrus card into the compiling process"
changed the default display adapter for all PPC machines to cirrus. 
Unfortunately
it missed setting the default display type to stdvga for both Mac machines
causing the display to fail to initialise under OpenBIOS.

Update the MachineClass for both Old World and New World Macs so that the
default std(vga) display adapter is the default if no options are specified
which fixes the display for the Mac machines.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 9e3a83a15b4d94e7738464e92b6c5cb335961ce7
      
https://github.com/qemu/qemu/commit/9e3a83a15b4d94e7738464e92b6c5cb335961ce7
  Author: Cédric Le Goater <address@hidden>
  Date:   2018-07-07 (Sat, 07 Jul 2018)

  Changed paths:
    M hw/ppc/spapr_vio.c

  Log Message:
  -----------
  spapr/vio: quiet down the "irq" property accessors

commit efe2add7cb7f ("spapr/vio: deprecate the "irq" property")
introduced get/set accessors for the "irq" property to warn of its
usage, but the warning in the get pollutes the monitor 'info qtree'.

Signed-off-by: Cédric Le Goater <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 4a1f253adb45ac6019971193d5077c4d5d55886a
      
https://github.com/qemu/qemu/commit/4a1f253adb45ac6019971193d5077c4d5d55886a
  Author: BALATON Zoltan <address@hidden>
  Date:   2018-07-07 (Sat, 07 Jul 2018)

  Changed paths:
    M default-configs/ppc-softmmu.mak
    M default-configs/ppcemb-softmmu.mak
    M default-configs/sh4-softmmu.mak
    M default-configs/sh4eb-softmmu.mak
    M hw/display/sm501.c

  Log Message:
  -----------
  sm501: Implement i2c part for reading monitor EDID

Emulate the i2c part of SM501 which is used to access the EDID info
from a monitor.

The vmstate structure is changed and its version is increased but
SM501 is only used on SH and PPC sam460ex machines that don't support
cross-version migration.

Signed-off-by: BALATON Zoltan <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: d27335592a187de0ba77894b522025827907038c
      
https://github.com/qemu/qemu/commit/d27335592a187de0ba77894b522025827907038c
  Author: Sebastian Bauer <address@hidden>
  Date:   2018-07-07 (Sat, 07 Jul 2018)

  Changed paths:
    M hw/display/sm501.c

  Log Message:
  -----------
  sm501: Perform a full update after palette change

Changing the palette of a color index has as an immediate effect on
all pixels with the corresponding index on real hardware. Performing a
full update after a palette change is a simple way to emulate this
effect.

Signed-off-by: Sebastian Bauer <address@hidden>
Signed-off-by: BALATON Zoltan <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 54b2a4339ccae45d4264c2437978abd04ff82bca
      
https://github.com/qemu/qemu/commit/54b2a4339ccae45d4264c2437978abd04ff82bca
  Author: Sebastian Bauer <address@hidden>
  Date:   2018-07-07 (Sat, 07 Jul 2018)

  Changed paths:
    M hw/display/sm501.c

  Log Message:
  -----------
  sm501: Use values from the pitch register for 2D operations

Before, crt_h_total was used for src_width and dst_width. This is a
property of the current display setting and not relevant for the 2D
operation that also can be done off-screen. The pitch register's purpose
is to describe line pitch relevant of the 2D operation.

Signed-off-by: Sebastian Bauer <address@hidden>
Signed-off-by: BALATON Zoltan <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: debc7e7dad1e70c03d585d96625da0038eba375c
      
https://github.com/qemu/qemu/commit/debc7e7dad1e70c03d585d96625da0038eba375c
  Author: Sebastian Bauer <address@hidden>
  Date:   2018-07-07 (Sat, 07 Jul 2018)

  Changed paths:
    M hw/display/sm501.c

  Log Message:
  -----------
  sm501: Implement negated destination raster operation mode

Add support for the negated destination operation mode. This is used e.g.
by AmigaOS for the INVERSEVID drawing mode. With this change, the cursor
in the shell and non-immediate window adjustment are working now.

Signed-off-by: BALATON Zoltan <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 06cb926aaa51970fc009245bb5e15700c19a56f8
      
https://github.com/qemu/qemu/commit/06cb926aaa51970fc009245bb5e15700c19a56f8
  Author: Sebastian Bauer <address@hidden>
  Date:   2018-07-07 (Sat, 07 Jul 2018)

  Changed paths:
    M hw/display/sm501.c

  Log Message:
  -----------
  sm501: Log unimplemented raster operation modes

The sm501 currently implements only a very limited set of raster operation
modes. After this change, unknown raster operation modes are logged so
these can be easily spotted.

Signed-off-by: BALATON Zoltan <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 33159dd7ce2ccd14ab31062d80632297e04e46cf
      
https://github.com/qemu/qemu/commit/33159dd7ce2ccd14ab31062d80632297e04e46cf
  Author: BALATON Zoltan <address@hidden>
  Date:   2018-07-07 (Sat, 07 Jul 2018)

  Changed paths:
    M hw/display/sm501.c

  Log Message:
  -----------
  sm501: Fix support for non-zero frame buffer start address

Display updates and drawing hardware cursor did not work when frame
buffer address was non-zero. Fix this by taking the frame buffer
address into account in these cases. This fixes screen dragging on
AmigaOS. Based on patch by Sebastian Bauer.

Signed-off-by: Sebastian Bauer <address@hidden>
Signed-off-by: BALATON Zoltan <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: eb76243c9da613d0abc27eb38a0d47b82f7ca00b
      
https://github.com/qemu/qemu/commit/eb76243c9da613d0abc27eb38a0d47b82f7ca00b
  Author: BALATON Zoltan <address@hidden>
  Date:   2018-07-07 (Sat, 07 Jul 2018)

  Changed paths:
    M hw/display/sm501.c

  Log Message:
  -----------
  sm501: Set updated region dirty after 2D operation

Set the changed memory region dirty after performed a 2D operation to
ensure that the screen is updated properly.

Signed-off-by: BALATON Zoltan <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 7aeb1e5100c026f2f232e570cd4d56942785f462
      
https://github.com/qemu/qemu/commit/7aeb1e5100c026f2f232e570cd4d56942785f462
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2018-07-07 (Sat, 07 Jul 2018)

  Changed paths:
    M hw/ppc/ppc440_uc.c

  Log Message:
  -----------
  ppc440_uc: Fix a copy/paste error

Missed in 3c409c1927e, hopefully reported by Coverity.

Fixes: Coverity CID 1393788 (Copy-paste error)
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: BALATON Zoltan <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 4fff72185b38cc9ad3162c1794428141f20366a3
      
https://github.com/qemu/qemu/commit/4fff72185b38cc9ad3162c1794428141f20366a3
  Author: Laurent Vivier <address@hidden>
  Date:   2018-07-07 (Sat, 07 Jul 2018)

  Changed paths:
    M target/ppc/int_helper.c

  Log Message:
  -----------
  target/ppc: fix build on ppc64 host

When I try to build a ppc64 target on a ppc64 host (gcc 8.1.1), I have:

.../target/ppc/int_helper.c: In function 'helper_vinsertb':
.../target/ppc/int_helper.c:1954:32: error: array subscript 
18446744073709551608 is above array bounds of 'uint8_t[16]' {aka 'unsigned 
char[16]'} [-Werror=array-bounds]
   memmove(&r->u8[index], &b->u8[8 - sizeof(r->element)],              \
                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.../target/ppc/int_helper.c:1965:1: note: in expansion of macro 'VINSERT'

If we compare with the macro for ppc64le, we can see
sizeof(r->element[0]) should be used instead of sizeof(r->element).

And VINSERT uses only u8, u16, u32 and u64, so the maximum value
of sizeof(r->element[0]) is 8

Suggested-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 4cb25fbb433581a0f80a8564bd2bcf574b1d84a7
      
https://github.com/qemu/qemu/commit/4cb25fbb433581a0f80a8564bd2bcf574b1d84a7
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2018-07-07 (Sat, 07 Jul 2018)

  Changed paths:
    M hw/ppc/prep.c

  Log Message:
  -----------
  ppc: fix default VGA display for PReP machines

Commit 29f9cef "ppc: Include vga cirrus card into the compiling process"
changed the default display adapter for all PPC machines to cirrus. 
Unfortunately
it missed setting the default display type to stdvga for both PReP machines
causing the display to fail to initialise under OpenHackWare.

Update the MachineClass for both prep and 40p machines so that the default
std(vga) display adapter is the default if no options are specified
which fixes the display for the PReP machines.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: 9ba58cb47fbc9a5141a4b3e66924f9431ea81da0
      
https://github.com/qemu/qemu/commit/9ba58cb47fbc9a5141a4b3e66924f9431ea81da0
  Author: BALATON Zoltan <address@hidden>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M pc-bios/u-boot-sam460-20100605.bin
    M roms/u-boot-sam460ex

  Log Message:
  -----------
  sam460ex: Update u-boot-sam460ex firmware

Update the submodule and u-boot-sam460-20100605.bin to include
following fixes from Sebastian Bauer:
- Fix build with newer gcc
- Decrease unnecessary delay which fixes slow booting from CD

Signed-off-by: BALATON Zoltan <address@hidden>
Signed-off-by: David Gibson <address@hidden>


  Commit: ad633de6f5a08ad8e9b74e2372863101239c2cc3
      
https://github.com/qemu/qemu/commit/ad633de6f5a08ad8e9b74e2372863101239c2cc3
  Author: David Gibson <address@hidden>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M hw/ppc/sam460ex.c

  Log Message:
  -----------
  sam460ex: Check for errors from libfdt functions

In a couple of places sam460ex_load_device_tree() calls "raw" libfdt
functions which can fail, but doesn't check for error codes.  At best,
if these fail the guest will be silently started in a non-standard state,
or it could fail entirely.

Fix this by using the _FDT() helper macro which aborts on a libfdt failure.

Signed-off-by: David Gibson <address@hidden>


  Commit: e753f33136f6230d30aa324220be112ccddbffba
      
https://github.com/qemu/qemu/commit/e753f33136f6230d30aa324220be112ccddbffba
  Author: David Gibson <address@hidden>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M hw/ppc/sam460ex.c

  Log Message:
  -----------
  sam460ex: Don't check for errors from qemu_fdt_*()

The qemu_fdt_*() helper functions already exit with a message instead of
returning errors, so we don't need to check for errors in the caller.

Signed-off-by: David Gibson <address@hidden>


  Commit: 51b0d834c414f494410cc94e56886b6584ae3c54
      
https://github.com/qemu/qemu/commit/51b0d834c414f494410cc94e56886b6584ae3c54
  Author: David Gibson <address@hidden>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M hw/ppc/sam460ex.c

  Log Message:
  -----------
  sam460ex: Make sam460ex_load_device_tree() handle all errors internally

sam460ex_load_device_tree() handles nearly all possible errors by simply
exiting (within helper functions and macros).  It handles two early error
cases by returning an error.

There's no particular point to this, so make it handle those directly as
well, removing the need for the caller to handle a failure.  As a bonus it
gives us more specific error messages.

Signed-off-by: David Gibson <address@hidden>


  Commit: a98ff0ec2ba3538dd766b349518ee18d03942ed8
      
https://github.com/qemu/qemu/commit/a98ff0ec2ba3538dd766b349518ee18d03942ed8
  Author: Peter Maydell <address@hidden>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M default-configs/ppc-softmmu.mak
    M default-configs/ppcemb-softmmu.mak
    M default-configs/sh4-softmmu.mak
    M default-configs/sh4eb-softmmu.mak
    M hw/display/sm501.c
    M hw/ppc/mac_newworld.c
    M hw/ppc/mac_oldworld.c
    M hw/ppc/ppc440_uc.c
    M hw/ppc/prep.c
    M hw/ppc/sam460ex.c
    M hw/ppc/spapr_vio.c
    M pc-bios/u-boot-sam460-20100605.bin
    M roms/u-boot-sam460ex
    M target/ppc/int_helper.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-3.0-20180709' into 
staging

ppc patch queue 2018-07-09

Here's a final pull request before tomorrow's hard freeze.

There are a number of fixes and improvements to the sm501 display
driver (not strictly ppc related, but used only on ppc and SH).
There's also a handful of unrelated fixes.

Whether all the sm501 changes are bugfixes is somewhat debatable, but
Peter has indicated he's ok with merging those for 3.0.

# gpg: Signature made Mon 09 Jul 2018 08:42:15 BST
# gpg:                using RSA key 6C38CACA20D9B392
# gpg: Good signature from "David Gibson <address@hidden>"
# gpg:                 aka "David Gibson (Red Hat) <address@hidden>"
# gpg:                 aka "David Gibson (ozlabs.org) <address@hidden>"
# gpg:                 aka "David Gibson (kernel.org) <address@hidden>"
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/ppc-for-3.0-20180709:
  sam460ex: Make sam460ex_load_device_tree() handle all errors internally
  sam460ex: Don't check for errors from qemu_fdt_*()
  sam460ex: Check for errors from libfdt functions
  sam460ex: Update u-boot-sam460ex firmware
  ppc: fix default VGA display for PReP machines
  target/ppc: fix build on ppc64 host
  ppc440_uc: Fix a copy/paste error
  sm501: Set updated region dirty after 2D operation
  sm501: Fix support for non-zero frame buffer start address
  sm501: Log unimplemented raster operation modes
  sm501: Implement negated destination raster operation mode
  sm501: Use values from the pitch register for 2D operations
  sm501: Perform a full update after palette change
  sm501: Implement i2c part for reading monitor EDID
  spapr/vio: quiet down the "irq" property accessors
  ppc: fix default VGA display for Mac machines

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/ab3257c281c1...a98ff0ec2ba3
      **NOTE:** This service been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.