diff mbox series

[v2] mips_fulong2e: Add on-board graphics chip

Message ID 20190218121322.DAB0474569F@zero.eik.bme.hu
State New
Headers show
Series [v2] mips_fulong2e: Add on-board graphics chip | expand

Commit Message

BALATON Zoltan Feb. 18, 2019, 12:09 p.m. UTC
Add (partial) emulation of the on-board GPU of the machine. This
allows the PMON2000 firmware to run and should also work with Linux
console but probably not with X yet.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Based-on: 20190218030257.624A7745694@zero.eik.bme.hu
---
 hw/mips/mips_fulong2e.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Philippe Mathieu-Daudé Feb. 18, 2019, 9:50 p.m. UTC | #1
On 2/18/19 1:09 PM, BALATON Zoltan wrote:
> Add (partial) emulation of the on-board GPU of the machine. This
> allows the PMON2000 firmware to run and should also work with Linux
> console but probably not with X yet.
> 
> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Mojibake :S

---

> Based-on: 20190218030257.624A7745694@zero.eik.bme.hu

The 'based-on' tag goes below the '---' separator to avoid to keep it
indefinitely in the git history.

> ---
>  hw/mips/mips_fulong2e.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
> index eec6fd02c8..68bd030fc1 100644
> --- a/hw/mips/mips_fulong2e.c
> +++ b/hw/mips/mips_fulong2e.c
> @@ -287,6 +287,7 @@ static void mips_fulong2e_init(MachineState *machine)
>      I2CBus *smbus;
>      MIPSCPU *cpu;
>      CPUMIPSState *env;
> +    DeviceState *dev;
>  
>      /* init CPUs */
>      cpu = MIPS_CPU(cpu_create(machine->cpu_type));
> @@ -347,6 +348,11 @@ static void mips_fulong2e_init(MachineState *machine)
>      vt82c686b_southbridge_init(pci_bus, FULONG2E_VIA_SLOT, env->irq[5],
>                                 &smbus, &isa_bus);
>  
> +    /* GPU */
> +    dev = DEVICE(pci_create(pci_bus, -1, "ati-vga"));
> +    qdev_prop_set_uint16(dev, "device_id", 0x5159);
> +    qdev_init_nofail(dev);
> +
>      /* Populate SPD eeprom data */
>      spd_data = spd_data_generate(DDR, ram_size, &err);
>      if (err) {
>
Aleksandar Markovic Feb. 22, 2019, 3:09 p.m. UTC | #2
> From: BALATON Zoltan <balaton@eik.bme.hu>
> Subject: [PATCH v2] mips_fulong2e: Add on-board graphics chip
> 
> Add (partial) emulation of the on-board GPU of the machine. This
> allows the PMON2000 firmware to run and should also work with Linux
> console but probably not with X yet.
> 
> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Based-on: 20190218030257.624A7745694@zero.eik.bme.hu
> ---
> hw/mips/mips_fulong2e.c | 6 ++++++
> 1 file changed, 6 insertions(+)
> 

Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>

Zoltan, perhaps you ought to create a mini series consisting of the patch

https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg02471.html

and this patch.

I would like to apply this patch independently to MIPS queue, but I can't,
because of interdependencies og the two patches.

I would feel comfortable with both patches going through graphics pull
request.

Thanks again for all efforts!

Aleksandar
BALATON Zoltan Feb. 22, 2019, 3:26 p.m. UTC | #3
On Fri, 22 Feb 2019, Aleksandar Markovic wrote:
>> From: BALATON Zoltan <balaton@eik.bme.hu>
>> Subject: [PATCH v2] mips_fulong2e: Add on-board graphics chip
>>
>> Add (partial) emulation of the on-board GPU of the machine. This
>> allows the PMON2000 firmware to run and should also work with Linux
>> console but probably not with X yet.
>>
>> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
>> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> Based-on: 20190218030257.624A7745694@zero.eik.bme.hu
>> ---
>> hw/mips/mips_fulong2e.c | 6 ++++++
>> 1 file changed, 6 insertions(+)
>>
>
> Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
>
> Zoltan, perhaps you ought to create a mini series consisting of the patch
>
> https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg02471.html
>
> and this patch.
>
> I would like to apply this patch independently to MIPS queue, but I can't,
> because of interdependencies og the two patches.
>
> I would feel comfortable with both patches going through graphics pull
> request.

OK, I'll resubmit this together with the next version of the prerequisite 
ATI patch cc-ing Gerd so he can take them together. Thanks for review. 
(The ATI VGA patch is still under review so maybe we will have a few more 
versions before it will be merged.)

Regards,
BALATON Zoltan
diff mbox series

Patch

diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index eec6fd02c8..68bd030fc1 100644
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -287,6 +287,7 @@  static void mips_fulong2e_init(MachineState *machine)
     I2CBus *smbus;
     MIPSCPU *cpu;
     CPUMIPSState *env;
+    DeviceState *dev;
 
     /* init CPUs */
     cpu = MIPS_CPU(cpu_create(machine->cpu_type));
@@ -347,6 +348,11 @@  static void mips_fulong2e_init(MachineState *machine)
     vt82c686b_southbridge_init(pci_bus, FULONG2E_VIA_SLOT, env->irq[5],
                                &smbus, &isa_bus);
 
+    /* GPU */
+    dev = DEVICE(pci_create(pci_bus, -1, "ati-vga"));
+    qdev_prop_set_uint16(dev, "device_id", 0x5159);
+    qdev_init_nofail(dev);
+
     /* Populate SPD eeprom data */
     spd_data = spd_data_generate(DDR, ram_size, &err);
     if (err) {