diff for duplicates of <1499978726.2865.59.camel@kernel.crashing.org> diff --git a/a/1.txt b/N1/1.txt index 20b6f78..363ae37 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -10,17 +10,17 @@ On Thu, 2017-07-13 at 06:29 -0500, Bjorn Helgaas wrote: > > --- a/drivers/gpu/vga/vgaarb.c > > +++ b/drivers/gpu/vga/vgaarb.c > > @@ -667,8 +667,7 @@ static bool vga_arbiter_add_pci_device(struct pci_dev *pdev) -> > /* Deal with VGA default device. Use first enabled one -> > * by default if arch doesn't have it's own hook -> > */ -> > - if (vga_default == NULL && -> > - ((vgadev->owns & VGA_RSRC_LEGACY_MASK) == VGA_RSRC_LEGACY_MASK)) { -> > + if (vga_default == NULL) { -> > vgaarb_info(&pdev->dev, "setting as boot VGA device\n"); -> > vga_set_default_device(pdev); -> > } +> > ???????/* Deal with VGA default device. Use first enabled one +> > ??????? * by default if arch doesn't have it's own hook +> > ??????? */ +> > -?????if (vga_default == NULL && +> > -???????? ((vgadev->owns & VGA_RSRC_LEGACY_MASK) == VGA_RSRC_LEGACY_MASK)) { +> > +?????if (vga_default == NULL) { +> > ???????????????vgaarb_info(&pdev->dev, "setting as boot VGA device\n"); +> > ???????????????vga_set_default_device(pdev); +> > ???????} > -> I don't know enough about the VGA arbiter to answer this. This test was +> I don't know enough about the VGA arbiter to answer this.? This test was > part of the initial implementation: deb2d2ecd43d ("PCI/GPU: implement VGA > arbitration on Linux") by Ben. diff --git a/a/content_digest b/N1/content_digest index 0d49d40..6b1fe05 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,21 +2,10 @@ "ref\020170712200430.GI14614@bhelgaas-glaptop.roam.corp.google.com\0" "ref\0EE11001F9E5DDD47B7634E2F8A612F2E40B35F02@FRAEML521-MBX.china.huawei.com\0" "ref\020170713112938.GI4486@bhelgaas-glaptop.roam.corp.google.com\0" - "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" - "Subject\0Re: [PATCH v4] PCI: Support hibmc VGA cards behind a misbehaving HiSilicon bridge\0" + "From\0benh@kernel.crashing.org (Benjamin Herrenschmidt)\0" + "Subject\0[PATCH v4] PCI: Support hibmc VGA cards behind a misbehaving HiSilicon bridge\0" "Date\0Fri, 14 Jul 2017 06:45:26 +1000\0" - "To\0Bjorn Helgaas <helgaas@kernel.org>" - " Gabriele Paoloni <gabriele.paoloni@huawei.com>\0" - "Cc\0Daniel Axtens <dja@axtens.net>" - linux-pci@vger.kernel.org <linux-pci@vger.kernel.org> - Liuxinliang (Matthew Liu) <z.liuxinliang@hisilicon.com> - Rongrong Zou <zourongrong@gmail.com> - Catalin Marinas <catalin.marinas@arm.com> - Will Deacon <will.deacon@arm.com> - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> - David Airlie <airlied@linux.ie> - Daniel Vetter <daniel.vetter@intel.com> - " Alex Williamson <alex.williamson@redhat.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Thu, 2017-07-13 at 06:29 -0500, Bjorn Helgaas wrote:\n" @@ -31,17 +20,17 @@ "> > --- a/drivers/gpu/vga/vgaarb.c\n" "> > +++ b/drivers/gpu/vga/vgaarb.c\n" "> > @@ -667,8 +667,7 @@ static bool vga_arbiter_add_pci_device(struct pci_dev *pdev)\n" - "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240/* Deal with VGA default device. Use first enabled one\n" - "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240 * by default if arch doesn't have it's own hook\n" - "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240 */\n" - "> > -\302\240\302\240\302\240\302\240\302\240if (vga_default == NULL &&\n" - "> > -\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 ((vgadev->owns & VGA_RSRC_LEGACY_MASK) == VGA_RSRC_LEGACY_MASK)) {\n" - "> > +\302\240\302\240\302\240\302\240\302\240if (vga_default == NULL) {\n" - "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240vgaarb_info(&pdev->dev, \"setting as boot VGA device\\n\");\n" - "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240vga_set_default_device(pdev);\n" - "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240}\n" + "> > ???????/* Deal with VGA default device. Use first enabled one\n" + "> > ??????? * by default if arch doesn't have it's own hook\n" + "> > ??????? */\n" + "> > -?????if (vga_default == NULL &&\n" + "> > -???????? ((vgadev->owns & VGA_RSRC_LEGACY_MASK) == VGA_RSRC_LEGACY_MASK)) {\n" + "> > +?????if (vga_default == NULL) {\n" + "> > ???????????????vgaarb_info(&pdev->dev, \"setting as boot VGA device\\n\");\n" + "> > ???????????????vga_set_default_device(pdev);\n" + "> > ???????}\n" "> \n" - "> I don't know enough about the VGA arbiter to answer this.\302\240 This test was\n" + "> I don't know enough about the VGA arbiter to answer this.? This test was\n" "> part of the initial implementation: deb2d2ecd43d (\"PCI/GPU: implement VGA\n" "> arbitration on Linux\") by Ben.\n" "\n" @@ -57,4 +46,4 @@ "Cheers,\n" Ben. -5a1d715cd9a422d89fc1870937d59bbef21926cba4d2b140bdb050d8d6ef8dd0 +31613841396c3d23c45e035d821bdc22e70ab2ce81fe61904595612b08a9adea
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.