For a long time now the UI layer has guaranteed that the console
surface is always 32 bits per pixel, but some older display device
models still have the code to handle other depths.  This patchset
cleans up that dead code for the pl110 and pxa2xx_lcd devices.  For
the pxa2xx_lcd we can remove the template header entirely; the pl110
still uses it to handle the wide variety of guest pixel formats that
it has to support, but we can at least simplify it from a
doubly-nested set of inclusions to a single layer.

thanks
-- PMM

Peter Maydell (9):
  hw/display/pl110: Remove dead code for non-32-bpp surfaces
  hw/display/pl110: Pull included-once parts of template header into
    pl110.c
  hw/display/pl110: Remove use of BITS from pl110_template.h
  hw/display/pxa2xx_lcd: Remove dead code for non-32-bpp surfaces
  hw/display/pxa2xx_lcd: Remove dest_width state field
  hw/display/pxa2xx: Remove use of BITS in pxa2xx_template.h
  hw/display/pxa2xx: Apply brace-related coding style fixes to template
    header
  hw/display/pxa2xx: Apply whitespace-only coding style fixes to
    template header
  hw/display/pxa2xx: Inline template header

 hw/display/pl110_template.h  | 120 +-------
 hw/display/pxa2xx_template.h | 447 ------------------------------
 hw/display/pl110.c           | 123 ++++++---
 hw/display/pxa2xx_lcd.c      | 520 ++++++++++++++++++++++++++++++-----
 4 files changed, 542 insertions(+), 668 deletions(-)
 delete mode 100644 hw/display/pxa2xx_template.h

-- 
2.20.1

Ping for review?

thanks
-- PMM

On Thu, 11 Feb 2021 at 14:15, Peter Maydell <peter.maydell@linaro.org> wrote:
>
> For a long time now the UI layer has guaranteed that the console
> surface is always 32 bits per pixel, but some older display device
> models still have the code to handle other depths.  This patchset
> cleans up that dead code for the pl110 and pxa2xx_lcd devices.  For
> the pxa2xx_lcd we can remove the template header entirely; the pl110
> still uses it to handle the wide variety of guest pixel formats that
> it has to support, but we can at least simplify it from a
> doubly-nested set of inclusions to a single layer.
>
> thanks
> -- PMM
>
> Peter Maydell (9):
>   hw/display/pl110: Remove dead code for non-32-bpp surfaces
>   hw/display/pl110: Pull included-once parts of template header into
>     pl110.c
>   hw/display/pl110: Remove use of BITS from pl110_template.h
>   hw/display/pxa2xx_lcd: Remove dead code for non-32-bpp surfaces
>   hw/display/pxa2xx_lcd: Remove dest_width state field
>   hw/display/pxa2xx: Remove use of BITS in pxa2xx_template.h
>   hw/display/pxa2xx: Apply brace-related coding style fixes to template
>     header
>   hw/display/pxa2xx: Apply whitespace-only coding style fixes to
>     template header
>   hw/display/pxa2xx: Inline template header
>
>  hw/display/pl110_template.h  | 120 +-------
>  hw/display/pxa2xx_template.h | 447 ------------------------------
>  hw/display/pl110.c           | 123 ++++++---
>  hw/display/pxa2xx_lcd.c      | 520 ++++++++++++++++++++++++++++++-----
>  4 files changed, 542 insertions(+), 668 deletions(-)
>  delete mode 100644 hw/display/pxa2xx_template.h

On Fri, Mar 05, 2021 at 02:48:11PM +0000, Peter Maydell wrote:
> Ping for review?

Looks all sane from ui point of view.

Acked-by: Gerd Hoffmann <kraxel@redhat.com>

I suspect we still have some code duplication here due to each display
device having its own set of line render functions.  We should be able
to share them at least for common formats.  hw/display/framebuffer.c
looks like a good place for shared helpers.

take care,
  Gerd