From 95aad497d9f1cc96b6913e61c95fca116af69b93 Mon Sep 17 00:00:00 2001 From: Helge Deller Date: Thu, 3 Sep 2020 07:09:31 +0200 Subject: [PATCH] hw/display/artist: Verify artist screen resolution Artist hardware is limited to 2048 x 2048 pixels. STI ROMs allow at minimum 640 x 480 pixels. Qemu users can adjust the screen size on the command line with: -global artist.width=800 -global artist.height=600 but we need to ensure that the screen size stays inside the given boundaries, otherwise print an error message and adjust. Signed-off-by: Helge Deller Reviewed-by: Richard Henderson --- hw/display/artist.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/hw/display/artist.c b/hw/display/artist.c index 71982559c6e..ff1532fdc14 100644 --- a/hw/display/artist.c +++ b/hw/display/artist.c @@ -1374,6 +1374,18 @@ static void artist_realizefn(DeviceState *dev, Error **errp) struct vram_buffer *buf; hwaddr offset = 0; + if (s->width > 2048 || s->height > 2048) { + error_report("artist: screen size can not exceed 2048 x 2048 pixel."); + s->width = MIN(s->width, 2048); + s->height = MIN(s->height, 2048); + } + + if (s->width < 640 || s->height < 480) { + error_report("artist: minimum screen size is 640 x 480 pixel."); + s->width = MAX(s->width, 640); + s->height = MAX(s->height, 480); + } + memory_region_init(&s->mem_as_root, OBJECT(dev), "artist", ~0ull); address_space_init(&s->as, &s->mem_as_root, "artist"); -- 2.39.5