On Fri, Jul 23, 2021 at 06:51:59AM +0100, Christoph Hellwig wrote:
On Thu, Jul 22, 2021 at 04:29:11PM -0500, Bjorn Helgaas wrote:
From: Bjorn Helgaas bhelgaas@google.com
This is a little bit of rework and extension of Huacai's nice work at [1].
It moves the VGA arbiter to the PCI subsystem, fixes a few nits, and breaks a few pieces off Huacai's patch to make the main patch a little smaller.
That last patch is still not very small, and it needs a commit log, as I mentioned at [2].
FYI, I have a bunch of changes to this code that the drm maintainers picked up. They should show up in the next linux-next I think.
Yeah I think for merging I think there'll be two options:
- We also merge this series through drm-misc-next to avoid conflicts, but anything after that will (i.e. from 5.16-rc1 onwards) will go in through the pci tree.
- You also merge Christoph's series, and we tell Linus to ignore the vgaarb changes that also come in through drm-next pull.
It's a non-rebasing tree so taking them out isn't an option, and reverting feels silly. Either of the above is fine with me.
Also I just noticed that the scrip has gone wrong for drm-misc-next and it's not actually yet in linux-next. I'll sort that out. Ok I just did sort that out while I forgot this reply draft here, one of our committers pushed a patch to the wrong branch. Luckily it was a broken one and the right fix is in the right branch (and already in Linus' tree), so a hard reset was all it took. So should be all in linux-next on the next update. -Daniel
On Fri, Jul 23, 2021 at 10:27:08AM +0200, Daniel Vetter wrote:
On Fri, Jul 23, 2021 at 06:51:59AM +0100, Christoph Hellwig wrote:
On Thu, Jul 22, 2021 at 04:29:11PM -0500, Bjorn Helgaas wrote:
From: Bjorn Helgaas bhelgaas@google.com
This is a little bit of rework and extension of Huacai's nice work at [1].
It moves the VGA arbiter to the PCI subsystem, fixes a few nits, and breaks a few pieces off Huacai's patch to make the main patch a little smaller.
That last patch is still not very small, and it needs a commit log, as I mentioned at [2].
FYI, I have a bunch of changes to this code that the drm maintainers picked up. They should show up in the next linux-next I think.
Yeah I think for merging I think there'll be two options:
We also merge this series through drm-misc-next to avoid conflicts, but anything after that will (i.e. from 5.16-rc1 onwards) will go in through the pci tree.
You also merge Christoph's series, and we tell Linus to ignore the vgaarb changes that also come in through drm-next pull.
It's a non-rebasing tree so taking them out isn't an option, and reverting feels silly. Either of the above is fine with me.
Seems easiest/cleanest if I just fix this up so it applies on top of drm-misc-next, e.g., on top of this:
474596fc749c ("dt-bindings: display: simple-bridge: Add corpro,gm7123 compatible")
I'll post a v3 after that rebase and working on the commit log from Huacai.
Bjorn
On Fri, Jul 23, 2021 at 05:43:35PM -0500, Bjorn Helgaas wrote:
On Fri, Jul 23, 2021 at 10:27:08AM +0200, Daniel Vetter wrote:
On Fri, Jul 23, 2021 at 06:51:59AM +0100, Christoph Hellwig wrote:
On Thu, Jul 22, 2021 at 04:29:11PM -0500, Bjorn Helgaas wrote:
From: Bjorn Helgaas bhelgaas@google.com
This is a little bit of rework and extension of Huacai's nice work at [1].
It moves the VGA arbiter to the PCI subsystem, fixes a few nits, and breaks a few pieces off Huacai's patch to make the main patch a little smaller.
That last patch is still not very small, and it needs a commit log, as I mentioned at [2].
FYI, I have a bunch of changes to this code that the drm maintainers picked up. They should show up in the next linux-next I think.
Yeah I think for merging I think there'll be two options:
- We also merge this series through drm-misc-next to avoid conflicts, but anything after that will (i.e. from 5.16-rc1 onwards) will go in through the pci tree.
I meant 5.15-rc1 here ofc. Living a bit too much in the future :-)
- You also merge Christoph's series, and we tell Linus to ignore the vgaarb changes that also come in through drm-next pull.
It's a non-rebasing tree so taking them out isn't an option, and reverting feels silly. Either of the above is fine with me.
Seems easiest/cleanest if I just fix this up so it applies on top of drm-misc-next, e.g., on top of this:
474596fc749c ("dt-bindings: display: simple-bridge: Add corpro,gm7123 compatible")
I'll post a v3 after that rebase and working on the commit log from Huacai.
Thanks, Daniel
dri-devel@lists.freedesktop.org
-
Bjorn Helgaas -
Daniel Vetter