From: Daniel Vetter <daniel@ffwll.ch>
To: Christoph Hellwig <hch@infradead.org>
Cc: Bjorn Helgaas <helgaas@kernel.org>,
Huacai Chen <chenhuacai@loongson.cn>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
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 10:27:08 +0200 [thread overview]
Message-ID: <YPp9XCa+1kS/s3wK@phenom.ffwll.local> (raw)
In-Reply-To: <YPpY/zRTYK3xI6rK@infradead.org>
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
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel@ffwll.ch>
To: Christoph Hellwig <hch@infradead.org>
Cc: David Airlie <airlied@linux.ie>,
dri-devel@lists.freedesktop.org,
Bjorn Helgaas <helgaas@kernel.org>,
linux-pci@vger.kernel.org, Bjorn Helgaas <bhelgaas@google.com>,
Xuefeng Li <lixuefeng@loongson.cn>,
Huacai Chen <chenhuacai@loongson.cn>
Subject: Re: [PATCH v2 0/9] PCI/VGA: Rework default VGA device selection
Date: Fri, 23 Jul 2021 10:27:08 +0200 [thread overview]
Message-ID: <YPp9XCa+1kS/s3wK@phenom.ffwll.local> (raw)
In-Reply-To: <YPpY/zRTYK3xI6rK@infradead.org>
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
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
next prev parent reply other threads:[~2021-07-23 8:27 UTC|newest]
Thread overview: 45+ 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 ` Bjorn Helgaas
2021-07-22 21:29 ` [PATCH v2 1/9] PCI/VGA: Move vgaarb to drivers/pci Bjorn Helgaas
2021-07-22 21:29 ` Bjorn Helgaas
2021-07-22 21:38 ` Randy Dunlap
2021-07-22 21:38 ` Randy Dunlap
2021-07-22 21:55 ` Bjorn Helgaas
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 ` 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 ` 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 ` 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 ` Bjorn Helgaas
2021-07-22 21:29 ` [PATCH v2 6/9] PCI/VGA: Prefer vga_default_device() Bjorn Helgaas
2021-07-22 21:29 ` 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 ` 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 ` Bjorn Helgaas
2021-07-22 21:29 ` [PATCH v2 9/9] PCI/VGA: Rework default VGA device selection Bjorn Helgaas
2021-07-22 21:29 ` Bjorn Helgaas
2021-07-23 5:51 ` [PATCH v2 0/9] " Christoph Hellwig
2021-07-23 8:27 ` Daniel Vetter [this message]
2021-07-23 8:27 ` Daniel Vetter
2021-07-23 22:43 ` Bjorn Helgaas
2021-07-23 22:43 ` Bjorn Helgaas
2021-07-27 9:32 ` Daniel Vetter
2021-07-27 9:32 ` Daniel Vetter
2021-07-23 9:53 ` Huacai Chen
2021-07-23 9:53 ` Huacai Chen
2021-07-24 0:10 ` Bjorn Helgaas
2021-07-24 0:10 ` Bjorn Helgaas
2021-07-24 9:30 ` Huacai Chen
2021-07-24 9:30 ` Huacai Chen
2021-08-03 17:06 ` Bjorn Helgaas
2021-08-03 17:06 ` Bjorn Helgaas
2021-08-09 18:59 ` Bjorn Helgaas
2021-08-09 18:59 ` Bjorn Helgaas
2021-08-19 21:52 ` Bjorn Helgaas
2021-08-19 21:52 ` Bjorn Helgaas
2021-08-20 4:07 ` Huacai Chen
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=YPp9XCa+1kS/s3wK@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=airlied@linux.ie \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=chenhuacai@loongson.cn \
--cc=dri-devel@lists.freedesktop.org \
--cc=hch@infradead.org \
--cc=helgaas@kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.