From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from hygieia.santi-shop.eu ([78.46.175.2]:37289 "EHLO hygieia.santi-shop.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750875AbaH1Ur4 convert rfc822-to-8bit (ORCPT ); Thu, 28 Aug 2014 16:47:56 -0400 Date: Thu, 28 Aug 2014 22:47:50 +0200 From: Bruno =?UTF-8?B?UHLDqW1vbnQ=?= To: Bjorn Helgaas Cc: Andreas Noever , dri-devel@lists.freedesktop.org, Matthew Garrett , Greg Kroah-Hartman , Linux PCI Subject: Re: [PATCH 1/2 v2] vgaarb: Don't default exclusively to first video device with mem+io Message-ID: <20140828224750.23148125@neptune.home> In-Reply-To: References: <20140514224339.7f8be3a9@neptune.home> <20140810112654.1bf684d6@neptune.home> <20140810183411.19370721@neptune.home> <20140816192135.34260115@neptune.home> <20140820075508.74f5b622@pluto> <20140820091152.76cd4e1a@pluto> <20140821233435.19a9cffa@neptune.home> <20140822082324.12cb6e93@pluto> <20140823130624.06ecc057@neptune.home> <20140824230953.7c04890f@neptune.home> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-pci-owner@vger.kernel.org List-ID: On Tue, 26 August 2014 Andreas Noever wrote: > On Sun, Aug 24, 2014 at 11:09 PM, Bruno Prémont wrote: > > With commit 20cde694027e boot video device detection was moved from > > efifb to x86 and ia64 pci/fixup.c. > > > > For dual-GPU Apple computers above change represents a regression as > > code in efifb did forcefully override vga_default_device while the > > merge did not (vgaarb happens prior to PCI fixup). > > > > To improve on initial device selection by vgaarb (it cannot know if > > PCI device not behind bridges see/decode legacy VGA I/O or not), move > > the screen_info based check from pci_video_fixup to vgaarb's init > > function and use it to refine/override decision taken while adding > > the individual PCI VGA devices. > > This way PCI fixup has no reason to adjust vga_default_device > > anymore but can depend on its value for flagging shadowed VBIOS. > > > > This has the nice benefit of removing duplicated code but does > > introduce a #if defined() block in vgaarb. > > Not all architectures have screen_info and would cause compile to > > fail without it. > > > > Reported-By: Andreas Noever > > CC: Matthew Garrett > > CC: stable@vger.kernel.org # v3.5+ > > Signed-off-by: Bruno Prémont > > --- > > Andreas, does this work properly for you, including the improvement > > on i915 complaint about VBIOS going from KERN_ERR to KERN_INFO? > Yep, thanks! > > > > > Other arches using PCI and vgaarb that have screen_info may want > > to be added to the #if defined() block or even introduce a new > > CONFIG_HAVE_SCREEN_INFO or similar... Bjorn, can you queue these two patches, probably going through -next for a week and passing them to Linus for -rc4, adding Andreas's Tested-by to Patch 1/2 v2? Thanks, Bruno From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bruno =?UTF-8?B?UHLDqW1vbnQ=?= Subject: Re: [PATCH 1/2 v2] vgaarb: Don't default exclusively to first video device with mem+io Date: Thu, 28 Aug 2014 22:47:50 +0200 Message-ID: <20140828224750.23148125@neptune.home> References: <20140514224339.7f8be3a9@neptune.home> <20140810112654.1bf684d6@neptune.home> <20140810183411.19370721@neptune.home> <20140816192135.34260115@neptune.home> <20140820075508.74f5b622@pluto> <20140820091152.76cd4e1a@pluto> <20140821233435.19a9cffa@neptune.home> <20140822082324.12cb6e93@pluto> <20140823130624.06ecc057@neptune.home> <20140824230953.7c04890f@neptune.home> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from hygieia.santi-shop.eu (hygieia.santi-shop.eu [78.46.175.2]) by gabe.freedesktop.org (Postfix) with ESMTP id 548B789FE8 for ; Thu, 28 Aug 2014 13:47:56 -0700 (PDT) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Bjorn Helgaas Cc: Andreas Noever , Matthew Garrett , Linux PCI , dri-devel@lists.freedesktop.org, Greg Kroah-Hartman List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCAyNiBBdWd1c3QgMjAxNCBBbmRyZWFzIE5vZXZlciA8YW5kcmVhcy5ub2V2ZXJAZ21h aWwuY29tPiB3cm90ZToKPiBPbiBTdW4sIEF1ZyAyNCwgMjAxNCBhdCAxMTowOSBQTSwgQnJ1bm8g UHLDqW1vbnQgd3JvdGU6Cj4gPiBXaXRoIGNvbW1pdCAyMGNkZTY5NDAyN2UgYm9vdCB2aWRlbyBk ZXZpY2UgZGV0ZWN0aW9uIHdhcyBtb3ZlZCBmcm9tCj4gPiBlZmlmYiB0byB4ODYgYW5kIGlhNjQg cGNpL2ZpeHVwLmMuCj4gPgo+ID4gRm9yIGR1YWwtR1BVIEFwcGxlIGNvbXB1dGVycyBhYm92ZSBj aGFuZ2UgcmVwcmVzZW50cyBhIHJlZ3Jlc3Npb24gYXMKPiA+IGNvZGUgaW4gZWZpZmIgZGlkIGZv cmNlZnVsbHkgb3ZlcnJpZGUgdmdhX2RlZmF1bHRfZGV2aWNlIHdoaWxlIHRoZQo+ID4gbWVyZ2Ug ZGlkIG5vdCAodmdhYXJiIGhhcHBlbnMgcHJpb3IgdG8gUENJIGZpeHVwKS4KPiA+Cj4gPiBUbyBp bXByb3ZlIG9uIGluaXRpYWwgZGV2aWNlIHNlbGVjdGlvbiBieSB2Z2FhcmIgKGl0IGNhbm5vdCBr bm93IGlmCj4gPiBQQ0kgZGV2aWNlIG5vdCBiZWhpbmQgYnJpZGdlcyBzZWUvZGVjb2RlIGxlZ2Fj eSBWR0EgSS9PIG9yIG5vdCksIG1vdmUKPiA+IHRoZSBzY3JlZW5faW5mbyBiYXNlZCBjaGVjayBm cm9tIHBjaV92aWRlb19maXh1cCB0byB2Z2FhcmIncyBpbml0Cj4gPiBmdW5jdGlvbiBhbmQgdXNl IGl0IHRvIHJlZmluZS9vdmVycmlkZSBkZWNpc2lvbiB0YWtlbiB3aGlsZSBhZGRpbmcKPiA+IHRo ZSBpbmRpdmlkdWFsIFBDSSBWR0EgZGV2aWNlcy4KPiA+IFRoaXMgd2F5IFBDSSBmaXh1cCBoYXMg bm8gcmVhc29uIHRvIGFkanVzdCB2Z2FfZGVmYXVsdF9kZXZpY2UKPiA+IGFueW1vcmUgYnV0IGNh biBkZXBlbmQgb24gaXRzIHZhbHVlIGZvciBmbGFnZ2luZyBzaGFkb3dlZCBWQklPUy4KPiA+Cj4g PiBUaGlzIGhhcyB0aGUgbmljZSBiZW5lZml0IG9mIHJlbW92aW5nIGR1cGxpY2F0ZWQgY29kZSBi dXQgZG9lcwo+ID4gaW50cm9kdWNlIGEgI2lmIGRlZmluZWQoKSBibG9jayBpbiB2Z2FhcmIuCj4g PiBOb3QgYWxsIGFyY2hpdGVjdHVyZXMgaGF2ZSBzY3JlZW5faW5mbyBhbmQgd291bGQgY2F1c2Ug Y29tcGlsZSB0bwo+ID4gZmFpbCB3aXRob3V0IGl0Lgo+ID4KPiA+IFJlcG9ydGVkLUJ5OiBBbmRy ZWFzIE5vZXZlciA8YW5kcmVhcy5ub2V2ZXJAZ21haWwuY29tPgo+ID4gQ0M6IE1hdHRoZXcgR2Fy cmV0dCA8bWF0dGhldy5nYXJyZXR0QG5lYnVsYS5jb20+Cj4gPiBDQzogc3RhYmxlQHZnZXIua2Vy bmVsLm9yZyAjIHYzLjUrCj4gPiBTaWduZWQtb2ZmLWJ5OiBCcnVubyBQcsOpbW9udCA8Ym9uYm9u c0BsaW51eC12c2VydmVyLm9yZz4KPiA+IC0tLQo+ID4gQW5kcmVhcywgZG9lcyB0aGlzIHdvcmsg cHJvcGVybHkgZm9yIHlvdSwgaW5jbHVkaW5nIHRoZSBpbXByb3ZlbWVudAo+ID4gb24gaTkxNSBj b21wbGFpbnQgYWJvdXQgVkJJT1MgZ29pbmcgZnJvbSBLRVJOX0VSUiB0byBLRVJOX0lORk8/Cj4g WWVwLCB0aGFua3MhCj4gCj4gPgo+ID4gT3RoZXIgYXJjaGVzIHVzaW5nIFBDSSBhbmQgdmdhYXJi IHRoYXQgaGF2ZSBzY3JlZW5faW5mbyBtYXkgd2FudAo+ID4gdG8gYmUgYWRkZWQgdG8gdGhlICNp ZiBkZWZpbmVkKCkgYmxvY2sgb3IgZXZlbiBpbnRyb2R1Y2UgYSBuZXcKPiA+IENPTkZJR19IQVZF X1NDUkVFTl9JTkZPIG9yIHNpbWlsYXIuLi4KCkJqb3JuLCBjYW4geW91IHF1ZXVlIHRoZXNlIHR3 byBwYXRjaGVzLCBwcm9iYWJseSBnb2luZyB0aHJvdWdoIC1uZXh0CmZvciBhIHdlZWsgYW5kIHBh c3NpbmcgdGhlbSB0byBMaW51cyBmb3IgLXJjNCwgYWRkaW5nIEFuZHJlYXMncyBUZXN0ZWQtYnkK dG8gUGF0Y2ggMS8yIHYyPwoKVGhhbmtzLApCcnVubwpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2RyaS1kZXZlbAo=