[Qemu-devel] [PATCH] sun4m: add display width and height to the firmware configuration

[Qemu-devel] [PATCH] sun4m: add display width and height to the firmware configuration

[Mark Cave-Ayland]

Currently the graphics resolution for TCX is fixed at 1024x768, however
other framebuffers are capable of supporting additional resolutions.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
 hw/sparc/sun4m.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 0e86ca7..5b7868e 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -66,6 +66,8 @@
 #define PROM_FILENAME        "openbios-sparc32"
 #define CFG_ADDR             0xd00000510ULL
 #define FW_CFG_SUN4M_DEPTH   (FW_CFG_ARCH_LOCAL + 0x00)
+#define FW_CFG_SUN4M_WIDTH   (FW_CFG_ARCH_LOCAL + 0x01)
+#define FW_CFG_SUN4M_HEIGHT  (FW_CFG_ARCH_LOCAL + 0x02)
 
 #define MAX_CPUS 16
 #define MAX_PILS 16
@@ -991,6 +993,8 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size,
     fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size);
     fw_cfg_add_i16(fw_cfg, FW_CFG_MACHINE_ID, hwdef->machine_id);
     fw_cfg_add_i16(fw_cfg, FW_CFG_SUN4M_DEPTH, graphic_depth);
+    fw_cfg_add_i16(fw_cfg, FW_CFG_SUN4M_WIDTH, graphic_width);
+    fw_cfg_add_i16(fw_cfg, FW_CFG_SUN4M_HEIGHT, graphic_height);
     fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, KERNEL_LOAD_ADDR);
     fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size);
     if (kernel_cmdline) {
-- 
1.7.10.4

Re: [Qemu-devel] [PATCH] sun4m: add display width and height to the firmware configuration

[Andreas Färber]

Am 15.06.2013 15:55, schrieb Mark Cave-Ayland:
> Currently the graphics resolution for TCX is fixed at 1024x768, however
> other framebuffers are capable of supporting additional resolutions.
> 
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

Looks fine,

Reviewed-by: Andreas Färber <afaerber@suse.de>

Does this require corresponding OpenBIOS patches or was that already
prepared? (only see your cleanups and bug fixes there)

Cheers,
Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PATCH] sun4m: add display width and height to the firmware configuration

[Mark Cave-Ayland]

On 15/06/13 15:54, Andreas Färber wrote:

> Looks fine,
>
> Reviewed-by: Andreas Färber<afaerber@suse.de>
>
> Does this require corresponding OpenBIOS patches or was that already
> prepared? (only see your cleanups and bug fixes there)

Yes, I rolled up some code for this in the corresponding OpenBIOS 
patchset but forgot to mention it in the commit message - see patch 11/20.

Incidentally I also forgot to mention in that same commit message that I 
had to tweak switch-arch to enable CONFIG_QEMU in the SPARC32 build too.

Given the size of the patchset, I'll see if any comments come in over 
the next few days and if nothing surfaces I'll simply tweak the message 
before commit.


ATB,

Mark.

Re: [Qemu-devel] [PATCH] sun4m: add display width and height to the firmware configuration

[Mark Cave-Ayland]

On 15/06/13 14:55, Mark Cave-Ayland wrote:

> Currently the graphics resolution for TCX is fixed at 1024x768, however
> other framebuffers are capable of supporting additional resolutions.
>
> Signed-off-by: Mark Cave-Ayland<mark.cave-ayland@ilande.co.uk>
> ---
>   hw/sparc/sun4m.c |    4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
> index 0e86ca7..5b7868e 100644
> --- a/hw/sparc/sun4m.c
> +++ b/hw/sparc/sun4m.c
> @@ -66,6 +66,8 @@
>   #define PROM_FILENAME        "openbios-sparc32"
>   #define CFG_ADDR             0xd00000510ULL
>   #define FW_CFG_SUN4M_DEPTH   (FW_CFG_ARCH_LOCAL + 0x00)
> +#define FW_CFG_SUN4M_WIDTH   (FW_CFG_ARCH_LOCAL + 0x01)
> +#define FW_CFG_SUN4M_HEIGHT  (FW_CFG_ARCH_LOCAL + 0x02)
>
>   #define MAX_CPUS 16
>   #define MAX_PILS 16
> @@ -991,6 +993,8 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size,
>       fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size);
>       fw_cfg_add_i16(fw_cfg, FW_CFG_MACHINE_ID, hwdef->machine_id);
>       fw_cfg_add_i16(fw_cfg, FW_CFG_SUN4M_DEPTH, graphic_depth);
> +    fw_cfg_add_i16(fw_cfg, FW_CFG_SUN4M_WIDTH, graphic_width);
> +    fw_cfg_add_i16(fw_cfg, FW_CFG_SUN4M_HEIGHT, graphic_height);
>       fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, KERNEL_LOAD_ADDR);
>       fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size);
>       if (kernel_cmdline) {

Ping?


ATB,

Mark.

Re: [Qemu-devel] [PATCH] sun4m: add display width and height to the firmware configuration

[Anthony Liguori]

Applied.  Thanks.

Regards,

Anthony Liguori