From: Bjorn Helgaas <helgaas@kernel.org>
To: Daniel Vetter <daniel@ffwll.ch>
Cc: Christoph Hellwig <hch@infradead.org>,
Huacai Chen <chenhuacai@loongson.cn>,
David Airlie <airlied@linux.ie>,
Xuefeng Li <lixuefeng@loongson.cn>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
dri-devel@lists.freedesktop.org, linux-pci@vger.kernel.org,
Bjorn Helgaas <bhelgaas@google.com>
Subject: Re: [PATCH v2 0/9] PCI/VGA: Rework default VGA device selection
Date: Fri, 23 Jul 2021 17:43:35 -0500 [thread overview]
Message-ID: <20210723224335.GA446523@bjorn-Precision-5520> (raw)
In-Reply-To: <YPp9XCa+1kS/s3wK@phenom.ffwll.local>
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
next prev parent reply other threads:[~2021-07-23 22:43 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-22 21:29 [PATCH v2 0/9] PCI/VGA: Rework default VGA device selection Bjorn Helgaas
2021-07-22 21:29 ` [PATCH v2 1/9] PCI/VGA: Move vgaarb to drivers/pci Bjorn Helgaas
2021-07-22 21:38 ` Randy Dunlap
2021-07-22 21:55 ` Bjorn Helgaas
2021-07-22 21:29 ` [PATCH v2 2/9] PCI/VGA: Replace full MIT license text with SPDX identifier Bjorn Helgaas
2021-07-22 21:29 ` [PATCH v2 3/9] PCI/VGA: Use unsigned format string to print lock counts Bjorn Helgaas
2021-07-22 21:29 ` [PATCH v2 4/9] PCI/VGA: Remove empty vga_arb_device_card_gone() Bjorn Helgaas
2021-07-22 21:29 ` [PATCH v2 5/9] PCI/VGA: Move vga_arb_integrated_gpu() earlier in file Bjorn Helgaas
2021-07-22 21:29 ` [PATCH v2 6/9] PCI/VGA: Prefer vga_default_device() Bjorn Helgaas
2021-07-22 21:29 ` [PATCH v2 7/9] PCI/VGA: Split out vga_arb_update_default_device() Bjorn Helgaas
2021-07-22 21:29 ` [PATCH v2 8/9] PCI/VGA: Log bridge control messages when adding devices Bjorn Helgaas
2021-07-22 21:29 ` [PATCH v2 9/9] PCI/VGA: Rework default VGA device selection Bjorn Helgaas
2021-07-23 5:51 ` [PATCH v2 0/9] " Christoph Hellwig
2021-07-23 8:27 ` Daniel Vetter
2021-07-23 22:43 ` Bjorn Helgaas [this message]
2021-07-27 9:32 ` Daniel Vetter
2021-07-23 9:53 ` Huacai Chen
2021-07-24 0:10 ` Bjorn Helgaas
2021-07-24 9:30 ` Huacai Chen
2021-08-03 17:06 ` Bjorn Helgaas
2021-08-09 18:59 ` Bjorn Helgaas
2021-08-19 21:52 ` Bjorn Helgaas
2021-08-20 4:07 ` Huacai Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210723224335.GA446523@bjorn-Precision-5520 \
--to=helgaas@kernel.org \
--cc=airlied@linux.ie \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=chenhuacai@loongson.cn \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=hch@infradead.org \
--cc=linux-pci@vger.kernel.org \
--cc=lixuefeng@loongson.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).