diff mbox series

[v5-resend,2/2] mips_fulong2e: Add on-board graphics chip

Message ID 12a45041a9a5ae863bf04edf3875aa9d25c481a3.1551902740.git.balaton@eik.bme.hu
State New
Headers show
Series Basic ATI VGA emulation | expand

Commit Message

BALATON Zoltan March 6, 2019, 8:05 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>
Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
---
 hw/mips/mips_fulong2e.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Philippe Mathieu-Daudé March 7, 2019, 12:32 a.m. UTC | #1
On 3/6/19 9:05 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>

Mojibaked again :(

Aleksandar, if you take this series, do you mind fixing with:

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Thanks!

Phil.

> Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
> ---
>  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 fbbc543eed..f877693766 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, "x-device-id", 0x5159);
> +    qdev_init_nofail(dev);
> +
>      /* Populate SPD eeprom data */
>      spd_data = spd_data_generate(DDR, ram_size, &err);
>      if (err) {
>
BALATON Zoltan March 7, 2019, 12:38 a.m. UTC | #2
On Thu, 7 Mar 2019, Philippe Mathieu-Daudé wrote:
> On 3/6/19 9:05 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>
>
> Mojibaked again :(

Sorry. Looks like my setup just can't handle your encoding. Maybe I need 
an additional header to specify content encoding? Do you have a git config 
to tell format-patch to generate that? Or have a way for maintainers to 
correct this on merging automatically?

> Aleksandar, if you take this series, do you mind fixing with:

I think it should go via Gerd's tree together with the other patch.

Regards,
BALATON Zoltan

> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> Thanks!
>
> Phil.
>
>> Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
>> ---
>>  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 fbbc543eed..f877693766 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, "x-device-id", 0x5159);
>> +    qdev_init_nofail(dev);
>> +
>>      /* Populate SPD eeprom data */
>>      spd_data = spd_data_generate(DDR, ram_size, &err);
>>      if (err) {
>>
>
>
Aleksandar Markovic March 7, 2019, 1:38 p.m. UTC | #3
> From: BALATON Zoltan <balaton@eik.bme.hu>
> Subject: Re: [PATCH v5-resend 2/2] mips_fulong2e: Add on-board graphics chip
> 
> > On Thu, 7 Mar 2019, Philippe Mathieu-Daudé wrote:
> > Aleksandar, if you take this series, do you mind fixing with:
> 
> I think it should go via Gerd's tree together with the other patch.
> 
> Regards,
> BALATON Zoltan

Yes, Gerd, should you agree with the patches, let they both go through your
tree/pull request, please.

Sincerely,
Aleksandar
Gerd Hoffmann March 8, 2019, 7:32 a.m. UTC | #4
On Thu, Mar 07, 2019 at 01:32:41AM +0100, Philippe Mathieu-Daudé wrote:
> On 3/6/19 9:05 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>
> 
> Mojibaked again :(

Mail was sent without Content-Type: header.  Both mutt and "git am" on
my machine assume utf-8 and everything looks fine.  I guess your mail
client assumes something else ...

"git send-email" should send the patches with correct headers, it even
asks for the charset it should use in case it finds non-ascii
characters.  So BALATON, could you check your mail client config, or
switch over to "git send-email" for submitting patches?

cheers,
  Gerd
BALATON Zoltan March 8, 2019, 4:22 p.m. UTC | #5
On Fri, 8 Mar 2019, Gerd Hoffmann wrote:
> On Thu, Mar 07, 2019 at 01:32:41AM +0100, Philippe Mathieu-Daudé wrote:
>> On 3/6/19 9:05 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>
>>
>> Mojibaked again :(
>
> Mail was sent without Content-Type: header.  Both mutt and "git am" on
> my machine assume utf-8 and everything looks fine.  I guess your mail
> client assumes something else ...

So it came out good at the end but that depends on what maintainer's 
config does by default it seems.

> "git send-email" should send the patches with correct headers, it even
> asks for the charset it should use in case it finds non-ascii
> characters.  So BALATON, could you check your mail client config, or
> switch over to "git send-email" for submitting patches?

I'm sending what git format-patch is generating and that does not add 
content type header by default. Is there a config option to enable that? I 
can't use git send-email because I'm sending from different machine than I 
use git on.

Regards,
BALATON Zoltan
Philippe Mathieu-Daudé March 8, 2019, 4:35 p.m. UTC | #6
On 3/8/19 5:22 PM, BALATON Zoltan wrote:
> On Fri, 8 Mar 2019, Gerd Hoffmann wrote:
>> On Thu, Mar 07, 2019 at 01:32:41AM +0100, Philippe Mathieu-Daudé wrote:
>>> On 3/6/19 9:05 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>
>>>
>>> Mojibaked again :(
>>
>> Mail was sent without Content-Type: header.  Both mutt and "git am" on
>> my machine assume utf-8 and everything looks fine.  I guess your mail
>> client assumes something else ...
> 
> So it came out good at the end but that depends on what maintainer's
> config does by default it seems.
> 
>> "git send-email" should send the patches with correct headers, it even
>> asks for the charset it should use in case it finds non-ascii
>> characters.  So BALATON, could you check your mail client config, or
>> switch over to "git send-email" for submitting patches?
> 
> I'm sending what git format-patch is generating and that does not add
> content type header by default. Is there a config option to enable that?
> I can't use git send-email because I'm sending from different machine
> than I use git on.

On another thread Laurent Vivier found it is a copy/paste problem
between an email client and an editor (IIUC):
https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg03669.html

Laurent, if you understood what's wrong, can you add en entry in the
wiki so we can refer contributors to it?

Thanks,

Phil.
Laurent Vivier March 8, 2019, 4:40 p.m. UTC | #7
Le 08/03/2019 à 17:35, Philippe Mathieu-Daudé a écrit :
> On 3/8/19 5:22 PM, BALATON Zoltan wrote:
>> On Fri, 8 Mar 2019, Gerd Hoffmann wrote:
>>> On Thu, Mar 07, 2019 at 01:32:41AM +0100, Philippe Mathieu-Daudé wrote:
>>>> On 3/6/19 9:05 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>
>>>>
>>>> Mojibaked again :(
>>>
>>> Mail was sent without Content-Type: header.  Both mutt and "git am" on
>>> my machine assume utf-8 and everything looks fine.  I guess your mail
>>> client assumes something else ...
>>
>> So it came out good at the end but that depends on what maintainer's
>> config does by default it seems.
>>
>>> "git send-email" should send the patches with correct headers, it even
>>> asks for the charset it should use in case it finds non-ascii
>>> characters.  So BALATON, could you check your mail client config, or
>>> switch over to "git send-email" for submitting patches?
>>
>> I'm sending what git format-patch is generating and that does not add
>> content type header by default. Is there a config option to enable that?
>> I can't use git send-email because I'm sending from different machine
>> than I use git on.
> 
> On another thread Laurent Vivier found it is a copy/paste problem
> between an email client and an editor (IIUC):
> https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg03669.html
> 
> Laurent, if you understood what's wrong, can you add en entry in the
> wiki so we can refer contributors to it?

No sure. My guess is a cut'n'paste between two windows with different
charsets doesn't work because the buffer keeps the char encoding of the
first window and put them as raw binaries in the second one, so it
encodes something else.

Thanks,
Laurent
Gerd Hoffmann March 11, 2019, 6:38 a.m. UTC | #8
Hi,

> > "git send-email" should send the patches with correct headers, it even
> > asks for the charset it should use in case it finds non-ascii
> > characters.  So BALATON, could you check your mail client config, or
> > switch over to "git send-email" for submitting patches?
> 
> I'm sending what git format-patch is generating and that does not add
> content type header by default. Is there a config option to enable that? I
> can't use git send-email because I'm sending from different machine than I
> use git on.

git send-email also accepts files generated by git format-patch,
so you can:

  (1) "git format-patch master..$branch", on machine A
  (2) copy over 000*.patch from machine A to machine B
  (3) "git send-email 000*.patch", on machine B

But take care that you don't have old 000*.patch files lying around on
machine B ...

HTH,
  Gerd
diff mbox series

Patch

diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index fbbc543eed..f877693766 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, "x-device-id", 0x5159);
+    qdev_init_nofail(dev);
+
     /* Populate SPD eeprom data */
     spd_data = spd_data_generate(DDR, ram_size, &err);
     if (err) {