| Message ID | 20181222090720.19234-4-okaya@kernel.org (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
| Series | Specify CONFIG_PCI dependency explicitly | expand |
On Sat, Dec 22, 2018 at 7:40 PM Lukas Wunner <lukas@wunner.de> wrote: > > On Sat, Dec 22, 2018 at 09:07:12AM +0000, Sinan Kaya wrote: > > This driver depends on the PCI infrastructure but the dependency has not > > been explicitly called out. > > > > Signed-off-by: Sinan Kaya <okaya@kernel.org> > > Reviewed-by: Lukas Wunner <lukas@wunner.de> > > This series doesn't have a cover letter so it's unclear to me through > which tree it's supposed to go in? Each patch through the individual > subsystem tree or all through the same tree? If the former I guess I > could push this to drm-misc... > Feel free to apply individual patches independently. Let me know which one you applied so that I can drop them on the next rev. > Thanks, > > Lukas > > > --- > > drivers/gpu/vga/Kconfig | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig > > index b677e5d524e6..d5f1d8e1c6f8 100644 > > --- a/drivers/gpu/vga/Kconfig > > +++ b/drivers/gpu/vga/Kconfig > > @@ -21,6 +21,7 @@ config VGA_SWITCHEROO > > bool "Laptop Hybrid Graphics - GPU switching support" > > depends on X86 > > depends on ACPI > > + depends on PCI > > select VGA_ARB > > help > > Many laptops released in 2008/9/10 have two GPUs with a multiplexer > > -- > > 2.19.0
On Sun, Dec 23, 2018 at 02:00:15AM +0300, Sinan Kaya wrote: > On Sat, Dec 22, 2018 at 7:40 PM Lukas Wunner <lukas@wunner.de> wrote: > > On Sat, Dec 22, 2018 at 09:07:12AM +0000, Sinan Kaya wrote: > > > This driver depends on the PCI infrastructure but the dependency has not > > > been explicitly called out. > > > > > > Signed-off-by: Sinan Kaya <okaya@kernel.org> > > > Reviewed-by: Lukas Wunner <lukas@wunner.de> > > > > This series doesn't have a cover letter so it's unclear to me through > > which tree it's supposed to go in? Each patch through the individual > > subsystem tree or all through the same tree? If the former I guess I > > could push this to drm-misc... > > Feel free to apply individual patches independently. Let me know which > one you applied so that I can drop them on the next rev. I've realized only now that this patch fixes fallout of commit 5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set") which is part of Rafael's acpi pull for v4.21. Usually such fixes go through the same tree as the offending commit, so I'd expect Raphael to pick up the whole series and forward it to Linus in the second half of the merge window. I'm not sure if that's how it'll play out though given the holidays. Additionally, drm-misc is currently in a somewhat confusing state: Normally fixes targeting v4.21 should have been applied to drm-misc-next-fixes for the last 2 weeks, yet no new commits have been applied to that branch since December 5, but plenty of stuff that should have been applied (various fixes and a MAINTAINERS change) went to drm-misc-next instead. So it looks like a lot of folks picked the wrong branch and drm-misc-next is now a mix of v4.22 features and v4.21 fixes. I think I should rather not add to this mess before a drm-misc maintainer has had a chance to sort it out. I'll be sure to keep an eye on this though. The fallout addressed by the patch is mostly confined to randconfigs I think, so waiting a few more days probably won't hurt much. Thanks, Lukas
On 12/23/2018 8:15 PM, Lukas Wunner wrote: > On Sun, Dec 23, 2018 at 02:00:15AM +0300, Sinan Kaya wrote: >> On Sat, Dec 22, 2018 at 7:40 PM Lukas Wunner <lukas@wunner.de> wrote: >>> On Sat, Dec 22, 2018 at 09:07:12AM +0000, Sinan Kaya wrote: >>>> This driver depends on the PCI infrastructure but the dependency has not >>>> been explicitly called out. >>>> >>>> Signed-off-by: Sinan Kaya <okaya@kernel.org> >>>> Reviewed-by: Lukas Wunner <lukas@wunner.de> >>> >>> This series doesn't have a cover letter so it's unclear to me through >>> which tree it's supposed to go in? Each patch through the individual >>> subsystem tree or all through the same tree? If the former I guess I >>> could push this to drm-misc... >> >> Feel free to apply individual patches independently. Let me know which >> one you applied so that I can drop them on the next rev. > > I've realized only now that this patch fixes fallout of commit > 5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set") > which is part of Rafael's acpi pull for v4.21. > > Usually such fixes go through the same tree as the offending commit, > so I'd expect Raphael to pick up the whole series and forward it to > Linus in the second half of the merge window. I'm not sure if that's > how it'll play out though given the holidays. I'll do follow-up with Rafael. Apologize for not giving the full story. Trying to get pieces out in the middle of vacation as there was a breakage. I didn't have time to polish.
On Sun, Dec 23, 2018 at 6:15 PM Lukas Wunner <lukas@wunner.de> wrote: > > On Sun, Dec 23, 2018 at 02:00:15AM +0300, Sinan Kaya wrote: > > On Sat, Dec 22, 2018 at 7:40 PM Lukas Wunner <lukas@wunner.de> wrote: > > > On Sat, Dec 22, 2018 at 09:07:12AM +0000, Sinan Kaya wrote: > > > > This driver depends on the PCI infrastructure but the dependency has not > > > > been explicitly called out. > > > > > > > > Signed-off-by: Sinan Kaya <okaya@kernel.org> > > > > Reviewed-by: Lukas Wunner <lukas@wunner.de> > > > > > > This series doesn't have a cover letter so it's unclear to me through > > > which tree it's supposed to go in? Each patch through the individual > > > subsystem tree or all through the same tree? If the former I guess I > > > could push this to drm-misc... > > > > Feel free to apply individual patches independently. Let me know which > > one you applied so that I can drop them on the next rev. > > I've realized only now that this patch fixes fallout of commit > 5d32a66541c4 ("PCI/ACPI: Allow ACPI to be built without CONFIG_PCI set") > which is part of Rafael's acpi pull for v4.21. > > Usually such fixes go through the same tree as the offending commit, > so I'd expect Raphael to pick up the whole series and forward it to > Linus in the second half of the merge window. I'm not sure if that's > how it'll play out though given the holidays. Yeah, best to get this merged through the tree that broke things. Acked-by: Daniel Vetter <daniel.ffwll.ch> for that. > Additionally, drm-misc is currently in a somewhat confusing state: > Normally fixes targeting v4.21 should have been applied to > drm-misc-next-fixes for the last 2 weeks, yet no new commits have > been applied to that branch since December 5, but plenty of stuff > that should have been applied (various fixes and a MAINTAINERS change) > went to drm-misc-next instead. So it looks like a lot of folks picked > the wrong branch and drm-misc-next is now a mix of v4.22 features and > v4.21 fixes. I think I should rather not add to this mess before a > drm-misc maintainer has had a chance to sort it out. If a patch has been misplaced the only way to fix it is to cherry-pick it over. Hence no need to wait for maintainers to sort out anything if you have patches for drm-misc-next-fixes, you can't make it worse :-) > I'll be sure to keep an eye on this though. The fallout addressed by > the patch is mostly confined to randconfigs I think, so waiting a few > more days probably won't hurt much. Agreed. -Daniel > > Thanks, > > Lukas > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig index b677e5d524e6..d5f1d8e1c6f8 100644 --- a/drivers/gpu/vga/Kconfig +++ b/drivers/gpu/vga/Kconfig @@ -21,6 +21,7 @@ config VGA_SWITCHEROO bool "Laptop Hybrid Graphics - GPU switching support" depends on X86 depends on ACPI + depends on PCI select VGA_ARB help Many laptops released in 2008/9/10 have two GPUs with a multiplexer