diff for duplicates of <1500040204.2865.90.camel@kernel.crashing.org> diff --git a/a/1.txt b/N1/1.txt index 2d602c6..cc09834 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,20 +4,20 @@ On Fri, 2017-07-14 at 12:26 +0000, Gabriele Paoloni wrote: > --- a/drivers/gpu/vga/vgaarb.c > +++ b/drivers/gpu/vga/vgaarb.c > @@ -1424,6 +1424,14 @@ static int __init vga_arb_device_init(void) -> -> list_for_each_entry(vgadev, &vga_list, list) { -> struct device *dev = &vgadev->pdev->dev; +> ? +> ????????list_for_each_entry(vgadev, &vga_list, list) { +> ????????????????struct device *dev = &vgadev->pdev->dev; > + -> + /* if no legacy device has been set as default VGA -> + * device, just pick up the first one in the list */ -> + if (vga_default == NULL) { -> + vgaarb_info(dev, "setting as boot VGA device\n"); -> + vga_set_default_device(vgadev->pdev); -> + } +> +???????????????/* if no legacy device has been set as default VGA +> +??????????????? * device, just pick up the first one in the list */ +> +???????????????if (vga_default == NULL) { +> +???????????????????????vgaarb_info(dev, "setting as boot VGA device\n"); +> +???????????????????????vga_set_default_device(vgadev->pdev); +> +???????????????} > + -> #if defined(CONFIG_X86) || defined(CONFIG_IA64) -> /* -> * Override vga_arbiter_add_pci_device()'s I/O based detection +> ?#if defined(CONFIG_X86) || defined(CONFIG_IA64) +> ????????????????/* +> ???????????????? * Override vga_arbiter_add_pci_device()'s I/O based detection > > Above after we have filled the list of VGA devices by iterating over all > PCI devices we check if no legacy one has been set as default VGA device diff --git a/a/content_digest b/N1/content_digest index 5013624..c39328c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,21 +5,10 @@ "ref\020170713151146.53e9644c@w520.home\0" "ref\01499980882.2865.65.camel@kernel.crashing.org\0" "ref\0EE11001F9E5DDD47B7634E2F8A612F2E40B399B4@FRAEML521-MBX.china.huawei.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 23:50:04 +1000\0" - "To\0Gabriele Paoloni <gabriele.paoloni@huawei.com>" - Alex Williamson <alex.williamson@redhat.com> - " Bjorn Helgaas <helgaas@kernel.org>\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>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Fri, 2017-07-14 at 12:26 +0000, Gabriele Paoloni wrote:\n" @@ -28,20 +17,20 @@ "> --- a/drivers/gpu/vga/vgaarb.c\n" "> +++ b/drivers/gpu/vga/vgaarb.c\n" "> @@ -1424,6 +1424,14 @@ static int __init vga_arb_device_init(void)\n" - "> \302\240\n" - "> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240list_for_each_entry(vgadev, &vga_list, list) {\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\240\302\240struct device *dev = &vgadev->pdev->dev;\n" + "> ?\n" + "> ????????list_for_each_entry(vgadev, &vga_list, list) {\n" + "> ????????????????struct device *dev = &vgadev->pdev->dev;\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\240/* if no legacy device has been set as default VGA\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\240 * device, just pick up the first one in the list */\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\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\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240vgaarb_info(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\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240vga_set_default_device(vgadev->pdev);\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\240}\n" + "> +???????????????/* if no legacy device has been set as default VGA\n" + "> +??????????????? * device, just pick up the first one in the list */\n" + "> +???????????????if (vga_default == NULL) {\n" + "> +???????????????????????vgaarb_info(dev, \"setting as boot VGA device\\n\");\n" + "> +???????????????????????vga_set_default_device(vgadev->pdev);\n" + "> +???????????????}\n" "> +\n" - "> \302\240#if defined(CONFIG_X86) || defined(CONFIG_IA64)\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\240\302\240/*\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\240\302\240 * Override vga_arbiter_add_pci_device()'s I/O based detection \n" + "> ?#if defined(CONFIG_X86) || defined(CONFIG_IA64)\n" + "> ????????????????/*\n" + "> ???????????????? * Override vga_arbiter_add_pci_device()'s I/O based detection \n" "> \n" "> Above after we have filled the list of VGA devices by iterating over all\n" "> PCI devices we check if no legacy one has been set as default VGA device\n" @@ -59,4 +48,4 @@ "\n" Ben. -db91e54fdf1e0b0a7a49a9cbbf4f1408ddf1e5f7197b42a14ca03e10e3f1a315 +50b39a70c178e61641dc39f2fdf684952e3b767b02f40351fdee6b09a2599db0
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.