From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bruno =?UTF-8?B?UHLDqW1vbnQ=?= Subject: Re: [PATCH 0/2] x86, ia64: Move EFI_FB vga_default_device() initialization to pci_vga_fixup() Date: Wed, 20 Aug 2014 09:11:52 +0200 Message-ID: <20140820091152.76cd4e1a@pluto> References: <20140514224339.7f8be3a9@neptune.home> <20140527234255.GJ11907@google.com> <20140602201650.35f0e936@neptune.home> <20140602201926.4d476818@neptune.home> <20140625005501.7ff7e982@neptune.home> <20140705171503.GC6247@google.com> <20140810112654.1bf684d6@neptune.home> <20140810183411.19370721@neptune.home> <20140816192135.34260115@neptune.home> <20140820075508.74f5b622@pluto> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <20140820075508.74f5b622@pluto> Sender: linux-pci-owner@vger.kernel.org To: Andreas Noever Cc: Bjorn Helgaas , DRI mailing list , Linux PCI , Dave Airlie , Matthew Garrett , Greg Kroah-Hartman List-Id: dri-devel@lists.freedesktop.org On Wed, 20 Aug 2014 07:55:08 +0200 Bruno Pr=C3=A9mont wrote: > On Tue, 19 Aug 2014 17:45:00 +0200 Andreas Noever wrote: > > On Sat, Aug 16, 2014 at 7:21 PM, Bruno Pr=C3=A9mont wrote: > > > This series improves on commit 20cde694027e (x86, ia64: Move EFI_= =46B > > > vga_default_device() initialization to pci_vga_fixup()): > > > - cleanup remaining but always-true #ifndefs > > > - fix boot regression on dual-GPU Macs > > > > > > Andreas, can you please test this series? It is a modification fr= om > > > previous testing patch that should still work fine for you. > > > That testing patch would have been failing X startup on old BIOS = systems > > > booted with vga=3Dnormal (or otherwise in VGA text mode). > > > > > > > > > Greg, in case you have scheduled above-mentioned commit for your = next > > > stable iteration, please hold it back in the queue until this fol= low-up > > > has landed and can be included within the same stable update as a= lone > > > that patch regresses for Macs with dual-GPU and using efifb. > > > > > > Bruno > >=20 > > Fails again (with and without efifb). > >=20 > > The vga_set_default_device in vga_arbiter_add_pci_device is at faul= t. > > It sets the boot video device to intel. Removing it makes the syste= m > > bootable again. >=20 > Could you provide your whole kernel log? I would like to understand > how your vga devices are setup and why it starts the wrong way. >=20 > If you can grab kernel log from both working and failing setups it > would be even better. The failing one is interesting for where exactl= y it > starts failing at boot. While collecting debug logs, please apply following patch to get PCI command and bridge control registers as configured when vgaarb look= s at them. diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c index af02597..8c8e7af 100644 --- a/drivers/gpu/vga/vgaarb.c +++ b/drivers/gpu/vga/vgaarb.c @@ -554,6 +554,7 @@ static bool vga_arbiter_add_pci_device(struct pci_d= ev *pdev) * clear that below if the bridge isn't forwarding */ pci_read_config_word(pdev, PCI_COMMAND, &cmd); + pr_info("vgaarb: PCI:%s PCI_COMMAND=3D%04x\n", pci_name(pdev), (unsig= ned int)cmd); if (cmd & PCI_COMMAND_IO) vgadev->owns |=3D VGA_RSRC_LEGACY_IO; if (cmd & PCI_COMMAND_MEMORY) @@ -567,6 +568,7 @@ static bool vga_arbiter_add_pci_device(struct pci_d= ev *pdev) u16 l; pci_read_config_word(bridge, PCI_BRIDGE_CONTROL, &l); + pr_info("vgaarb: PCI:%s, bridge PCI:%s PCI_BRIDGE_CONTROL=3D%04x\n"= , pci_name(pdev), pci_name(bridge), (unsigned int)l); if (!(l & PCI_BRIDGE_CTL_VGA)) { vgadev->owns =3D 0; break;