[Qemu-devel] [PATCH] ppc: Include vga cirrus card into the compiling process

Sebastian Bauer posted 1 patch 5 years, 10 months ago
Failed in applying to current master (apply log)
There is a newer version of this series
default-configs/ppc-softmmu.mak | 1 +
1 file changed, 1 insertion(+)
[Qemu-devel] [PATCH] ppc: Include vga cirrus card into the compiling process
Posted by Sebastian Bauer 5 years, 10 months ago
Drivers for this card exists on PPC-based AmigaOS guests so it is useful to
allow users to emulate the graphics card for PPC machines.

Signed-off-by: Sebastian Bauer <mail@sebastianbauer.info>
---
 default-configs/ppc-softmmu.mak | 1 +
 1 file changed, 1 insertion(+)

diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index 860de80a27..218b14779c 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -29,6 +29,7 @@ CONFIG_IDE_SII3112=y
 CONFIG_I2C=y
 CONFIG_BITBANG_I2C=y
 CONFIG_M41T80=y
+CONFIG_VGA_CIRRUS=y
 
 # For Macs
 CONFIG_MAC=y
-- 
2.17.1


Re: [Qemu-devel] [PATCH] ppc: Include vga cirrus card into the compiling process
Posted by David Gibson 5 years, 10 months ago
On Mon, Jun 18, 2018 at 11:56:01PM +0200, Sebastian Bauer wrote:
> Drivers for this card exists on PPC-based AmigaOS guests so it is useful to
> allow users to emulate the graphics card for PPC machines.
> 
> Signed-off-by: Sebastian Bauer <mail@sebastianbauer.info>

Have you checked the Cirrus VGA actually works on a ppc machine?

> ---
>  default-configs/ppc-softmmu.mak | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
> index 860de80a27..218b14779c 100644
> --- a/default-configs/ppc-softmmu.mak
> +++ b/default-configs/ppc-softmmu.mak
> @@ -29,6 +29,7 @@ CONFIG_IDE_SII3112=y
>  CONFIG_I2C=y
>  CONFIG_BITBANG_I2C=y
>  CONFIG_M41T80=y
> +CONFIG_VGA_CIRRUS=y
>  
>  # For Macs
>  CONFIG_MAC=y

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson
Re: [Qemu-devel] [PATCH] ppc: Include vga cirrus card into the compiling process
Posted by Sebastian Bauer 5 years, 10 months ago
Am 2018-06-19 01:55, schrieb David Gibson:
> Have you checked the Cirrus VGA actually works on a ppc machine?

Yes, it works for AmigaOS guests. Better than the sm501 for instance.

Bye
Sebastian

Re: [Qemu-devel] [PATCH] ppc: Include vga cirrus card into the compiling process
Posted by David Gibson 5 years, 10 months ago
On Tue, Jun 19, 2018 at 06:32:55AM +0200, Sebastian Bauer wrote:
> Am 2018-06-19 01:55, schrieb David Gibson:
> > Have you checked the Cirrus VGA actually works on a ppc machine?
> 
> Yes, it works for AmigaOS guests. Better than the sm501 for
> instance.

Ok.  However, your patch doesn't apply against the ppc-for-3.0 tree.
It looks like you've made it against a tree including some of BALATON
Zoltan's proposed but not yet merged patches.

Please make sure your patches are against the current ppc-for-3.0 tree
before posting.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson
Re: [Qemu-devel] [Qemu-ppc] [PATCH] ppc: Include vga cirrus card into the compiling process
Posted by BALATON Zoltan 5 years, 10 months ago
On Tue, 19 Jun 2018, David Gibson wrote:
> On Tue, Jun 19, 2018 at 06:32:55AM +0200, Sebastian Bauer wrote:
>> Am 2018-06-19 01:55, schrieb David Gibson:
>>> Have you checked the Cirrus VGA actually works on a ppc machine?
>>
>> Yes, it works for AmigaOS guests. Better than the sm501 for
>> instance.
>
> Ok.  However, your patch doesn't apply against the ppc-for-3.0 tree.
> It looks like you've made it against a tree including some of BALATON
> Zoltan's proposed but not yet merged patches.

I've sent those patches as well. But if this also works with pseries maybe 
it does not have to be in the For sam460ex part of the config but could be 
on it's own with a comment saying that multiple machines can use it.

Also what about ppcemb-softmmu? It's deprecated but do we still want to 
update it until it's removed or deprecated means no new features are added 
to it? I've also updated ppcemb config in my other patches to keep 
sam460ex working there the same as with ppc-softmmu.

Regards,
BALATON Zoltan

Re: [Qemu-devel] [Qemu-ppc] [PATCH] ppc: Include vga cirrus card into the compiling process
Posted by Sebastian Bauer 5 years, 10 months ago
Am 2018-06-19 12:23, schrieb BALATON Zoltan:
> On Tue, 19 Jun 2018, David Gibson wrote:
>> Ok.  However, your patch doesn't apply against the ppc-for-3.0 tree.
>> It looks like you've made it against a tree including some of BALATON
>> Zoltan's proposed but not yet merged patches.
> I've sent those patches as well. But if this also works with pseries
> maybe it does not have to be in the For sam460ex part of the config
> but could be on it's own with a comment saying that multiple machines
> can use it.

In my opinion, it should be added to pci.mak (and removed from all 
present configs that include pci.mak). There is also CONFIG_VGA_PCI 
there, a bunch of network cards and other stuff. The Cirrus VGA is just 
another PCI card that one could plug into any systems that has a PCI(e) 
bus, also on physical hardware (whether it is supported by which guests 
is a different question).

However, I wanted to be conservative with my change so I added it only 
to the 32 bit PPC branch, because this is the platform that I can easily 
test. Does anybody know why CONFIG_VGA_CIRRUS is selectively enabled for 
PCI-based systems? What would speak against adding it to pci.mak?

Bye
Sebastian

Re: [Qemu-devel] [Qemu-ppc] [PATCH] ppc: Include vga cirrus card into the compiling process
Posted by Thomas Huth 5 years, 10 months ago
On 19.06.2018 12:46, Sebastian Bauer wrote:
[...]
> In my opinion, it should be added to pci.mak (and removed from all
> present configs that include pci.mak). There is also CONFIG_VGA_PCI
> there, a bunch of network cards and other stuff. The Cirrus VGA is just
> another PCI card that one could plug into any systems that has a PCI(e)
> bus, also on physical hardware (whether it is supported by which guests
> is a different question).
> 
> However, I wanted to be conservative with my change so I added it only
> to the 32 bit PPC branch, because this is the platform that I can easily
> test. Does anybody know why CONFIG_VGA_CIRRUS is selectively enabled for
> PCI-based systems? What would speak against adding it to pci.mak?

I've got no real clue, but I think the Cirrus card is rather considered
as ugly legacy these days, e.g. see:

https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/

So I think it should not be added to boards that do not really need it.

 Thomas

Re: [Qemu-devel] [Qemu-ppc] [PATCH] ppc: Include vga cirrus card into the compiling process
Posted by Thomas Huth 5 years, 10 months ago
On 19.06.2018 12:23, BALATON Zoltan wrote:
[...]
> Also what about ppcemb-softmmu? It's deprecated but do we still want to
> update it until it's removed or deprecated means no new features are
> added to it? I've also updated ppcemb config in my other patches to keep
> sam460ex working there the same as with ppc-softmmu.

IMHO it's not worth the effort anymore to update the ppcemb-softmmu
configs. It's going to be removed soon anyway.

 Thomas

Re: [Qemu-devel] [PATCH] ppc: Include vga cirrus card into the compiling process
Posted by Sebastian Bauer 5 years, 10 months ago
Hello David,

Am 2018-06-19 06:36, schrieb David Gibson:
> Ok.  However, your patch doesn't apply against the ppc-for-3.0 tree.
> It looks like you've made it against a tree including some of BALATON
> Zoltan's proposed but not yet merged patches.
> 
> Please make sure your patches are against the current ppc-for-3.0 tree
> before posting.

Okay, I'm sorry for the wrong timing. It is okay to wait for Zoltan's 
patch queue to be applied before applying this patch as I don't want to 
introduce new conflicts in those patches.

Bye
Sebastian

Re: [Qemu-devel] [PATCH] ppc: Include vga cirrus card into the compiling process
Posted by Sebastian Bauer 5 years, 10 months ago
Hi,

Am 2018-06-19 06:36, schrieb David Gibson:
> Ok.  However, your patch doesn't apply against the ppc-for-3.0 tree.
> It looks like you've made it against a tree including some of BALATON
> Zoltan's proposed but not yet merged patches.
> 
> Please make sure your patches are against the current ppc-for-3.0 tree
> before posting.

The patch seems to apply now to ppc-for-3.0 without any problem as 
Zoltan's changes have been integrated. Let me know if I shall resend the 
patch or if you can use the original one. Thanks.

Bye
Sebastian

Re: [Qemu-devel] [PATCH] ppc: Include vga cirrus card into the compiling process
Posted by David Gibson 5 years, 10 months ago
On Fri, Jun 29, 2018 at 08:06:10PM +0200, Sebastian Bauer wrote:
> Hi,
> 
> Am 2018-06-19 06:36, schrieb David Gibson:
> > Ok.  However, your patch doesn't apply against the ppc-for-3.0 tree.
> > It looks like you've made it against a tree including some of BALATON
> > Zoltan's proposed but not yet merged patches.
> > 
> > Please make sure your patches are against the current ppc-for-3.0 tree
> > before posting.
> 
> The patch seems to apply now to ppc-for-3.0 without any problem as Zoltan's
> changes have been integrated. Let me know if I shall resend the patch or if
> you can use the original one. Thanks.

Resend please.  Assuming it would need a respin, I didn't keep it
around.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson
Re: [Qemu-devel] [PATCH] ppc: Include vga cirrus card into the compiling process
Posted by BALATON Zoltan 5 years, 10 months ago
On Sat, 30 Jun 2018, David Gibson wrote:
> On Fri, Jun 29, 2018 at 08:06:10PM +0200, Sebastian Bauer wrote:
>> Hi,
>>
>> Am 2018-06-19 06:36, schrieb David Gibson:
>>> Ok.  However, your patch doesn't apply against the ppc-for-3.0 tree.
>>> It looks like you've made it against a tree including some of BALATON
>>> Zoltan's proposed but not yet merged patches.
>>>
>>> Please make sure your patches are against the current ppc-for-3.0 tree
>>> before posting.
>>
>> The patch seems to apply now to ppc-for-3.0 without any problem as Zoltan's
>> changes have been integrated. Let me know if I shall resend the patch or if
>> you can use the original one. Thanks.
>
> Resend please.  Assuming it would need a respin, I didn't keep it
> around.

Still avalilable here:

http://patchwork.ozlabs.org/patch/931209/

or here

http://patchew.org/QEMU/20180618215601.8974-1-mail@sebastianbauer.info/

Regards,
BALATON Zoltan

Re: [Qemu-devel] [PATCH] ppc: Include vga cirrus card into the compiling process
Posted by David Gibson 5 years, 9 months ago
On Sat, Jun 30, 2018 at 01:29:05PM +0200, BALATON Zoltan wrote:
11;rgb:ffff/ffff/ffff> On Sat, 30 Jun 2018, David Gibson wrote:
> > On Fri, Jun 29, 2018 at 08:06:10PM +0200, Sebastian Bauer wrote:
> > > Hi,
> > > 
> > > Am 2018-06-19 06:36, schrieb David Gibson:
> > > > Ok.  However, your patch doesn't apply against the ppc-for-3.0 tree.
> > > > It looks like you've made it against a tree including some of BALATON
> > > > Zoltan's proposed but not yet merged patches.
> > > > 
> > > > Please make sure your patches are against the current ppc-for-3.0 tree
> > > > before posting.
> > > 
> > > The patch seems to apply now to ppc-for-3.0 without any problem as Zoltan's
> > > changes have been integrated. Let me know if I shall resend the patch or if
> > > you can use the original one. Thanks.
> > 
> > Resend please.  Assuming it would need a respin, I didn't keep it
> > around.
> 
> Still avalilable here:
> 
> http://patchwork.ozlabs.org/patch/931209/
> 
> or here
> 
> http://patchew.org/QEMU/20180618215601.8974-1-mail@sebastianbauer.info/

Ok, applied.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson
Re: [Qemu-devel] [PATCH] ppc: Include vga cirrus card into the compiling process
Posted by David Gibson 5 years, 9 months ago
On Mon, Jul 02, 2018 at 02:02:39PM +1000, David Gibson wrote:
> On Sat, Jun 30, 2018 at 01:29:05PM +0200, BALATON Zoltan wrote:
> 11;rgb:ffff/ffff/ffff> On Sat, 30 Jun 2018, David Gibson wrote:
> > > On Fri, Jun 29, 2018 at 08:06:10PM +0200, Sebastian Bauer wrote:
> > > > Hi,
> > > > 
> > > > Am 2018-06-19 06:36, schrieb David Gibson:
> > > > > Ok.  However, your patch doesn't apply against the ppc-for-3.0 tree.
> > > > > It looks like you've made it against a tree including some of BALATON
> > > > > Zoltan's proposed but not yet merged patches.
> > > > > 
> > > > > Please make sure your patches are against the current ppc-for-3.0 tree
> > > > > before posting.
> > > > 
> > > > The patch seems to apply now to ppc-for-3.0 without any problem as Zoltan's
> > > > changes have been integrated. Let me know if I shall resend the patch or if
> > > > you can use the original one. Thanks.
> > > 
> > > Resend please.  Assuming it would need a respin, I didn't keep it
> > > around.
> > 
> > Still avalilable here:
> > 
> > http://patchwork.ozlabs.org/patch/931209/
> > 
> > or here
> > 
> > http://patchew.org/QEMU/20180618215601.8974-1-mail@sebastianbauer.info/
> 
> Ok, applied.

And now unapplied, since it breaks make check all over the place for
ppc64-softmmu.

Please folks, running an all-targets make check is really the
*minimum* bar for testing before posting a patch for inclusion.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson
Re: [Qemu-devel] [PATCH] ppc: Include vga cirrus card into the compiling process
Posted by Sebastian Bauer 5 years, 9 months ago
Am 2018-07-02 07:22, schrieb David Gibson:
> And now unapplied, since it breaks make check all over the place for
> ppc64-softmmu.
> 
> Please folks, running an all-targets make check is really the
> *minimum* bar for testing before posting a patch for inclusion.

Okay, will do next time. Sorry for the inconvenience.

But I can't find anything about this procedure in the Wiki. Maybe it 
would be a good idea to add this info for people that are new, or if it 
is written somewhere it should be linked from here: 
https://wiki.qemu.org/Contribute/SubmitAPatch as this is most likely the 
starting point for new contributors.

Bye
Sebastian

Re: [Qemu-devel] [PATCH] ppc: Include vga cirrus card into the compiling process
Posted by David Gibson 5 years, 9 months ago
On Mon, Jul 02, 2018 at 09:42:49AM +0200, Sebastian Bauer wrote:
> Am 2018-07-02 07:22, schrieb David Gibson:
> > And now unapplied, since it breaks make check all over the place for
> > ppc64-softmmu.
> > 
> > Please folks, running an all-targets make check is really the
> > *minimum* bar for testing before posting a patch for inclusion.
> 
> Okay, will do next time. Sorry for the inconvenience.
> 
> But I can't find anything about this procedure in the Wiki. Maybe it would
> be a good idea to add this info for people that are new, or if it is written
> somewhere it should be linked from here:
> https://wiki.qemu.org/Contribute/SubmitAPatch as this is most likely the
> starting point for new contributors.

That's a good point.  At the moment there's really nothing there about
testing your patch before submission, which is a bit of an ommission.

[1] covers a bunch of ways that qemu can be tested, but doesn't give
much idea about priority.

+eblake, you seem to have made more mods than anyone else to the
SubmitAPatch wiki page.  What do you think about adding a subsection
about what basic testing you should do before posting a patch?

[1] https://wiki.qemu.org/Testing

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson
Re: [Qemu-devel] [PATCH] ppc: Include vga cirrus card into the compiling process
Posted by Eric Blake 5 years, 9 months ago
On 07/02/2018 11:41 PM, David Gibson wrote:

> That's a good point.  At the moment there's really nothing there about
> testing your patch before submission, which is a bit of an ommission.
> 
> [1] covers a bunch of ways that qemu can be tested, but doesn't give
> much idea about priority.
> 
> +eblake, you seem to have made more mods than anyone else to the
> SubmitAPatch wiki page.  What do you think about adding a subsection
> about what basic testing you should do before posting a patch?

No good deed goes unpunished :)

I've added https://wiki.qemu.org/Contribute/SubmitAPatch#Test_your_patches

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org

Re: [Qemu-devel] [PATCH] ppc: Include vga cirrus card into the compiling process
Posted by David Gibson 5 years, 9 months ago
On Tue, Jul 03, 2018 at 10:20:41AM -0500, Eric Blake wrote:
> On 07/02/2018 11:41 PM, David Gibson wrote:
> 
> > That's a good point.  At the moment there's really nothing there about
> > testing your patch before submission, which is a bit of an ommission.
> > 
> > [1] covers a bunch of ways that qemu can be tested, but doesn't give
> > much idea about priority.
> > 
> > +eblake, you seem to have made more mods than anyone else to the
> > SubmitAPatch wiki page.  What do you think about adding a subsection
> > about what basic testing you should do before posting a patch?
> 
> No good deed goes unpunished :)

Heh.  I was just asking if you had any input, not requesting that you
make the change..

> I've added https://wiki.qemu.org/Contribute/SubmitAPatch#Test_your_patches

..but thanks!

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson
Re: [Qemu-devel] [PATCH] ppc: Include vga cirrus card into the compiling process
Posted by Thomas Huth 5 years, 10 months ago
On 19.06.2018 01:55, David Gibson wrote:
> On Mon, Jun 18, 2018 at 11:56:01PM +0200, Sebastian Bauer wrote:
>> Drivers for this card exists on PPC-based AmigaOS guests so it is useful to
>> allow users to emulate the graphics card for PPC machines.
>>
>> Signed-off-by: Sebastian Bauer <mail@sebastianbauer.info>
> 
> Have you checked the Cirrus VGA actually works on a ppc machine?

FWIW: It actually even works with SLOF on the pseries machine:

https://github.com/aik/SLOF/blob/master/board-qemu/slof/pci-device_1013_00b8.fs#L252

 Thomas