From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bruno =?UTF-8?B?UHLDqW1vbnQ=?= <bonbons@linux-vserver.org>
Subject: [PATCH 1/2 v2] vgaarb: Don't default exclusively to first video
 device with mem+io
Date: Sun, 24 Aug 2014 23:09:53 +0200
Message-ID: <20140824230953.7c04890f@neptune.home>
References: <20140514224339.7f8be3a9@neptune.home>
 <20140625005501.7ff7e982@neptune.home>
 <20140705171503.GC6247@google.com>
 <CAMxnaaXxAZAJAdr5AYYRZC_xKFCuyrfY=qpJu8x+P-S+osm5vw@mail.gmail.com>
 <CAMxnaaXGQe4vg9cY5e2KZBnG4F-z49OriwxEGUE-DCE6MKUryQ@mail.gmail.com>
 <20140810112654.1bf684d6@neptune.home>
 <CAMxnaaUsd+XHppMmPMXdFL13d1-OhLzoH_yjv_9abOx_uP=_Ug@mail.gmail.com>
 <20140810183411.19370721@neptune.home>
 <CAMxnaaVNpiSZmhQsHa_ZHJckgzG+xHyOL6hOT3Ts8GdcGN_A9g@mail.gmail.com>
 <20140816192135.34260115@neptune.home>
 <CAMxnaaWQoX9KMQVCKHTkeqSxGEybz5u1qU6AVBqzW3+mj_nJHQ@mail.gmail.com>
 <20140820075508.74f5b622@pluto> <20140820091152.76cd4e1a@pluto>
 <CAMxnaaUodONkqmdPWedN-Q1qheHiJAScFcG_XbX1--ZmiOQZDg@mail.gmail.com>
 <20140821233435.19a9cffa@neptune.home>
 <CAErSpo6D1B+dPLrYoAF4OA1KeWuW8VZW2_RR5jB1GbCRo+6vHg@mail.gmail.com>
 <20140822082324.12cb6e93@pluto>
 <CAMxnaaU9EiMcne-aQjS1sY1Orn6xGbVHEnd057ogcZ77p74Y=Q@mail.gmail.com>
 <20140823130624.06ecc057@neptune.home>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <dri-devel-bounces@lists.freedesktop.org>
Received: from hygieia.santi-shop.eu (hygieia.santi-shop.eu [78.46.175.2])
 by gabe.freedesktop.org (Postfix) with ESMTP id 2E3B689E0E
 for <dri-devel@lists.freedesktop.org>; Sun, 24 Aug 2014 14:09:59 -0700 (PDT)
In-Reply-To: <20140823130624.06ecc057@neptune.home>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
To: Andreas Noever <andreas.noever@gmail.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>, Matthew Garrett <matthew.garrett@nebula.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, dri-devel@lists.freedesktop.org, Linux PCI <linux-pci@vger.kernel.org>
List-Id: dri-devel@lists.freedesktop.org

V2l0aCBjb21taXQgMjBjZGU2OTQwMjdlIGJvb3QgdmlkZW8gZGV2aWNlIGRldGVjdGlvbiB3YXMg
bW92ZWQgZnJvbQplZmlmYiB0byB4ODYgYW5kIGlhNjQgcGNpL2ZpeHVwLmMuCgpGb3IgZHVhbC1H
UFUgQXBwbGUgY29tcHV0ZXJzIGFib3ZlIGNoYW5nZSByZXByZXNlbnRzIGEgcmVncmVzc2lvbiBh
cwpjb2RlIGluIGVmaWZiIGRpZCBmb3JjZWZ1bGx5IG92ZXJyaWRlIHZnYV9kZWZhdWx0X2Rldmlj
ZSB3aGlsZSB0aGUKbWVyZ2UgZGlkIG5vdCAodmdhYXJiIGhhcHBlbnMgcHJpb3IgdG8gUENJIGZp
eHVwKS4KClRvIGltcHJvdmUgb24gaW5pdGlhbCBkZXZpY2Ugc2VsZWN0aW9uIGJ5IHZnYWFyYiAo
aXQgY2Fubm90IGtub3cgaWYKUENJIGRldmljZSBub3QgYmVoaW5kIGJyaWRnZXMgc2VlL2RlY29k
ZSBsZWdhY3kgVkdBIEkvTyBvciBub3QpLCBtb3ZlCnRoZSBzY3JlZW5faW5mbyBiYXNlZCBjaGVj
ayBmcm9tIHBjaV92aWRlb19maXh1cCB0byB2Z2FhcmIncyBpbml0CmZ1bmN0aW9uIGFuZCB1c2Ug
aXQgdG8gcmVmaW5lL292ZXJyaWRlIGRlY2lzaW9uIHRha2VuIHdoaWxlIGFkZGluZwp0aGUgaW5k
aXZpZHVhbCBQQ0kgVkdBIGRldmljZXMuClRoaXMgd2F5IFBDSSBmaXh1cCBoYXMgbm8gcmVhc29u
IHRvIGFkanVzdCB2Z2FfZGVmYXVsdF9kZXZpY2UKYW55bW9yZSBidXQgY2FuIGRlcGVuZCBvbiBp
dHMgdmFsdWUgZm9yIGZsYWdnaW5nIHNoYWRvd2VkIFZCSU9TLgoKVGhpcyBoYXMgdGhlIG5pY2Ug
YmVuZWZpdCBvZiByZW1vdmluZyBkdXBsaWNhdGVkIGNvZGUgYnV0IGRvZXMKaW50cm9kdWNlIGEg
I2lmIGRlZmluZWQoKSBibG9jayBpbiB2Z2FhcmIuCk5vdCBhbGwgYXJjaGl0ZWN0dXJlcyBoYXZl
IHNjcmVlbl9pbmZvIGFuZCB3b3VsZCBjYXVzZSBjb21waWxlIHRvCmZhaWwgd2l0aG91dCBpdC4K
ClJlcG9ydGVkLUJ5OiBBbmRyZWFzIE5vZXZlciA8YW5kcmVhcy5ub2V2ZXJAZ21haWwuY29tPgpD
QzogTWF0dGhldyBHYXJyZXR0IDxtYXR0aGV3LmdhcnJldHRAbmVidWxhLmNvbT4KQ0M6IHN0YWJs
ZUB2Z2VyLmtlcm5lbC5vcmcgIyB2My41KwpTaWduZWQtb2ZmLWJ5OiBCcnVubyBQcsOpbW9udCA8
Ym9uYm9uc0BsaW51eC12c2VydmVyLm9yZz4KLS0tCkFuZHJlYXMsIGRvZXMgdGhpcyB3b3JrIHBy
b3Blcmx5IGZvciB5b3UsIGluY2x1ZGluZyB0aGUgaW1wcm92ZW1lbnQKb24gaTkxNSBjb21wbGFp
bnQgYWJvdXQgVkJJT1MgZ29pbmcgZnJvbSBLRVJOX0VSUiB0byBLRVJOX0lORk8/CgoKT3RoZXIg
YXJjaGVzIHVzaW5nIFBDSSBhbmQgdmdhYXJiIHRoYXQgaGF2ZSBzY3JlZW5faW5mbyBtYXkgd2Fu
dAp0byBiZSBhZGRlZCB0byB0aGUgI2lmIGRlZmluZWQoKSBibG9jayBvciBldmVuIGludHJvZHVj
ZSBhIG5ldwpDT05GSUdfSEFWRV9TQ1JFRU5fSU5GTyBvciBzaW1pbGFyLi4uCgoKIGFyY2gvaWE2
NC9wY2kvZml4dXAuYyAgICB8IDI0ICstLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogYXJjaC94ODYv
cGNpL2ZpeHVwLmMgICAgIHwgMjQgKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dw
dS92Z2EvdmdhYXJiLmMgfCAzOCArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr
LQogMyBmaWxlcyBjaGFuZ2VkLCAzOSBpbnNlcnRpb25zKCspLCA0NyBkZWxldGlvbnMoLSkKCmRp
ZmYgLS1naXQgYS9hcmNoL2lhNjQvcGNpL2ZpeHVwLmMgYi9hcmNoL2lhNjQvcGNpL2ZpeHVwLmMK
aW5kZXggZWM3M2IyYy4uZmM1MDVkNSAxMDA2NDQKLS0tIGEvYXJjaC9pYTY0L3BjaS9maXh1cC5j
CisrKyBiL2FyY2gvaWE2NC9wY2kvZml4dXAuYwpAQCAtMzgsMjcgKzM4LDYgQEAgc3RhdGljIHZv
aWQgcGNpX2ZpeHVwX3ZpZGVvKHN0cnVjdCBwY2lfZGV2ICpwZGV2KQogCQlyZXR1cm47CiAJLyog
TWF5YmUsIHRoaXMgbWFjaGluZSBzdXBwb3J0cyBsZWdhY3kgbWVtb3J5IG1hcC4gKi8KIAotCWlm
ICghdmdhX2RlZmF1bHRfZGV2aWNlKCkpIHsKLQkJcmVzb3VyY2Vfc2l6ZV90IHN0YXJ0LCBlbmQ7
Ci0JCWludCBpOwotCi0JCS8qIERvZXMgZmlybXdhcmUgZnJhbWVidWZmZXIgYmVsb25nIHRvIHVz
PyAqLwotCQlmb3IgKGkgPSAwOyBpIDwgREVWSUNFX0NPVU5UX1JFU09VUkNFOyBpKyspIHsKLQkJ
CWlmICghKHBjaV9yZXNvdXJjZV9mbGFncyhwZGV2LCBpKSAmIElPUkVTT1VSQ0VfTUVNKSkKLQkJ
CQljb250aW51ZTsKLQotCQkJc3RhcnQgPSBwY2lfcmVzb3VyY2Vfc3RhcnQocGRldiwgaSk7Ci0J
CQllbmQgID0gcGNpX3Jlc291cmNlX2VuZChwZGV2LCBpKTsKLQotCQkJaWYgKCFzdGFydCB8fCAh
ZW5kKQotCQkJCWNvbnRpbnVlOwotCi0JCQlpZiAoc2NyZWVuX2luZm8ubGZiX2Jhc2UgPj0gc3Rh
cnQgJiYKLQkJCSAgICAoc2NyZWVuX2luZm8ubGZiX2Jhc2UgKyBzY3JlZW5faW5mby5sZmJfc2l6
ZSkgPCBlbmQpCi0JCQkJdmdhX3NldF9kZWZhdWx0X2RldmljZShwZGV2KTsKLQkJfQotCX0KLQog
CS8qIElzIFZHQSByb3V0ZWQgdG8gdXM/ICovCiAJYnVzID0gcGRldi0+YnVzOwogCXdoaWxlIChi
dXMpIHsKQEAgLTgzLDggKzYyLDcgQEAgc3RhdGljIHZvaWQgcGNpX2ZpeHVwX3ZpZGVvKHN0cnVj
dCBwY2lfZGV2ICpwZGV2KQogCQlwY2lfcmVhZF9jb25maWdfd29yZChwZGV2LCBQQ0lfQ09NTUFO
RCwgJmNvbmZpZyk7CiAJCWlmIChjb25maWcgJiAoUENJX0NPTU1BTkRfSU8gfCBQQ0lfQ09NTUFO
RF9NRU1PUlkpKSB7CiAJCQlwZGV2LT5yZXNvdXJjZVtQQ0lfUk9NX1JFU09VUkNFXS5mbGFncyB8
PSBJT1JFU09VUkNFX1JPTV9TSEFET1c7Ci0JCQlkZXZfcHJpbnRrKEtFUk5fREVCVUcsICZwZGV2
LT5kZXYsICJCb290IHZpZGVvIGRldmljZVxuIik7Ci0JCQl2Z2Ffc2V0X2RlZmF1bHRfZGV2aWNl
KHBkZXYpOworCQkJZGV2X3ByaW50ayhLRVJOX0RFQlVHLCAmcGRldi0+ZGV2LCAiVmlkZW8gZGV2
aWNlIHdpdGggc2hhZG93ZWQgUk9NXG4iKTsKIAkJfQogCX0KIH0KZGlmZiAtLWdpdCBhL2FyY2gv
eDg2L3BjaS9maXh1cC5jIGIvYXJjaC94ODYvcGNpL2ZpeHVwLmMKaW5kZXggYzYxZWE1Ny4uOWEy
YjcxMCAxMDA2NDQKLS0tIGEvYXJjaC94ODYvcGNpL2ZpeHVwLmMKKysrIGIvYXJjaC94ODYvcGNp
L2ZpeHVwLmMKQEAgLTMyNiwyNyArMzI2LDYgQEAgc3RhdGljIHZvaWQgcGNpX2ZpeHVwX3ZpZGVv
KHN0cnVjdCBwY2lfZGV2ICpwZGV2KQogCXN0cnVjdCBwY2lfYnVzICpidXM7CiAJdTE2IGNvbmZp
ZzsKIAotCWlmICghdmdhX2RlZmF1bHRfZGV2aWNlKCkpIHsKLQkJcmVzb3VyY2Vfc2l6ZV90IHN0
YXJ0LCBlbmQ7Ci0JCWludCBpOwotCi0JCS8qIERvZXMgZmlybXdhcmUgZnJhbWVidWZmZXIgYmVs
b25nIHRvIHVzPyAqLwotCQlmb3IgKGkgPSAwOyBpIDwgREVWSUNFX0NPVU5UX1JFU09VUkNFOyBp
KyspIHsKLQkJCWlmICghKHBjaV9yZXNvdXJjZV9mbGFncyhwZGV2LCBpKSAmIElPUkVTT1VSQ0Vf
TUVNKSkKLQkJCQljb250aW51ZTsKLQotCQkJc3RhcnQgPSBwY2lfcmVzb3VyY2Vfc3RhcnQocGRl
diwgaSk7Ci0JCQllbmQgID0gcGNpX3Jlc291cmNlX2VuZChwZGV2LCBpKTsKLQotCQkJaWYgKCFz
dGFydCB8fCAhZW5kKQotCQkJCWNvbnRpbnVlOwotCi0JCQlpZiAoc2NyZWVuX2luZm8ubGZiX2Jh
c2UgPj0gc3RhcnQgJiYKLQkJCSAgICAoc2NyZWVuX2luZm8ubGZiX2Jhc2UgKyBzY3JlZW5faW5m
by5sZmJfc2l6ZSkgPCBlbmQpCi0JCQkJdmdhX3NldF9kZWZhdWx0X2RldmljZShwZGV2KTsKLQkJ
fQotCX0KLQogCS8qIElzIFZHQSByb3V0ZWQgdG8gdXM/ICovCiAJYnVzID0gcGRldi0+YnVzOwog
CXdoaWxlIChidXMpIHsKQEAgLTM3MSw4ICszNTAsNyBAQCBzdGF0aWMgdm9pZCBwY2lfZml4dXBf
dmlkZW8oc3RydWN0IHBjaV9kZXYgKnBkZXYpCiAJCXBjaV9yZWFkX2NvbmZpZ193b3JkKHBkZXYs
IFBDSV9DT01NQU5ELCAmY29uZmlnKTsKIAkJaWYgKGNvbmZpZyAmIChQQ0lfQ09NTUFORF9JTyB8
IFBDSV9DT01NQU5EX01FTU9SWSkpIHsKIAkJCXBkZXYtPnJlc291cmNlW1BDSV9ST01fUkVTT1VS
Q0VdLmZsYWdzIHw9IElPUkVTT1VSQ0VfUk9NX1NIQURPVzsKLQkJCWRldl9wcmludGsoS0VSTl9E
RUJVRywgJnBkZXYtPmRldiwgIkJvb3QgdmlkZW8gZGV2aWNlXG4iKTsKLQkJCXZnYV9zZXRfZGVm
YXVsdF9kZXZpY2UocGRldik7CisJCQlkZXZfcHJpbnRrKEtFUk5fREVCVUcsICZwZGV2LT5kZXYs
ICJWaWRlbyBkZXZpY2Ugd2l0aCBzaGFkb3dlZCBST01cbiIpOwogCQl9CiAJfQogfQpkaWZmIC0t
Z2l0IGEvZHJpdmVycy9ncHUvdmdhL3ZnYWFyYi5jIGIvZHJpdmVycy9ncHUvdmdhL3ZnYWFyYi5j
CmluZGV4IGQyMDc3ZjAuLmNmZmRmZjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L3ZnYS92Z2Fh
cmIuYworKysgYi9kcml2ZXJzL2dwdS92Z2EvdmdhYXJiLmMKQEAgLTQxLDYgKzQxLDcgQEAKICNp
bmNsdWRlIDxsaW51eC9wb2xsLmg+CiAjaW5jbHVkZSA8bGludXgvbWlzY2RldmljZS5oPgogI2lu
Y2x1ZGUgPGxpbnV4L3NsYWIuaD4KKyNpbmNsdWRlIDxsaW51eC9zY3JlZW5faW5mby5oPgogCiAj
aW5jbHVkZSA8bGludXgvdWFjY2Vzcy5oPgogCkBAIC01ODUsOCArNTg2LDExIEBAIHN0YXRpYyBi
b29sIHZnYV9hcmJpdGVyX2FkZF9wY2lfZGV2aWNlKHN0cnVjdCBwY2lfZGV2ICpwZGV2KQogCSAq
LwogI2lmbmRlZiBfX0FSQ0hfSEFTX1ZHQV9ERUZBVUxUX0RFVklDRQogCWlmICh2Z2FfZGVmYXVs
dCA9PSBOVUxMICYmCi0JICAgICgodmdhZGV2LT5vd25zICYgVkdBX1JTUkNfTEVHQUNZX01BU0sp
ID09IFZHQV9SU1JDX0xFR0FDWV9NQVNLKSkKKwkgICAgKCh2Z2FkZXYtPm93bnMgJiBWR0FfUlNS
Q19MRUdBQ1lfTUFTSykgPT0gVkdBX1JTUkNfTEVHQUNZX01BU0spKSB7CisJCXByX2luZm8oInZn
YWFyYjogc2V0dGluZyBhcyBib290IGRldmljZTogUENJOiVzXG4iLAorCQkJcGNpX25hbWUocGRl
dikpOwogCQl2Z2Ffc2V0X2RlZmF1bHRfZGV2aWNlKHBkZXYpOworCX0KICNlbmRpZgogCiAJdmdh
X2FyYml0ZXJfY2hlY2tfYnJpZGdlX3NoYXJpbmcodmdhZGV2KTsKQEAgLTEzMjAsNiArMTMyNCwz
OCBAQCBzdGF0aWMgaW50IF9faW5pdCB2Z2FfYXJiX2RldmljZV9pbml0KHZvaWQpCiAJcHJfaW5m
bygidmdhYXJiOiBsb2FkZWRcbiIpOwogCiAJbGlzdF9mb3JfZWFjaF9lbnRyeSh2Z2FkZXYsICZ2
Z2FfbGlzdCwgbGlzdCkgeworI2lmIGRlZmluZWQoQ09ORklHX1g4NikgfHwgZGVmaW5lZChDT05G
SUdfSUE2NCkKKwkJLyogT3ZlcnJpZGUgSS9PIGJhc2VkIGRldGVjdGlvbiBkb25lIGJ5IHZnYV9h
cmJpdGVyX2FkZF9wY2lfZGV2aWNlKCkKKwkJICogYXMgaXQgbWF5IHRha2UgdGhlIHdyb25nIGRl
dmljZSAoZS5nLiBvbiBBcHBsZSBzeXN0ZW0gdW5kZXIgRUZJKS4KKwkJICoKKwkJICogU2VsZWN0
IHRoZSBkZXZpY2Ugb3duaW5nIHRoZSBib290IGZyYW1lYnVmZmVyIGlmIHRoZXJlIGlzIG9uZS4K
KwkJICovCisJCXJlc291cmNlX3NpemVfdCBzdGFydCwgZW5kOworCQlpbnQgaTsKKworCQkvKiBE
b2VzIGZpcm13YXJlIGZyYW1lYnVmZmVyIGJlbG9uZyB0byB1cz8gKi8KKwkJZm9yIChpID0gMDsg
aSA8IERFVklDRV9DT1VOVF9SRVNPVVJDRTsgaSsrKSB7CisJCQlpZiAoIShwY2lfcmVzb3VyY2Vf
ZmxhZ3ModmdhZGV2LT5wZGV2LCBpKSAmIElPUkVTT1VSQ0VfTUVNKSkKKwkJCQljb250aW51ZTsK
KworCQkJc3RhcnQgPSBwY2lfcmVzb3VyY2Vfc3RhcnQodmdhZGV2LT5wZGV2LCBpKTsKKwkJCWVu
ZCAgPSBwY2lfcmVzb3VyY2VfZW5kKHZnYWRldi0+cGRldiwgaSk7CisKKwkJCWlmICghc3RhcnQg
fHwgIWVuZCkKKwkJCQljb250aW51ZTsKKworCQkJaWYgKHNjcmVlbl9pbmZvLmxmYl9iYXNlIDwg
c3RhcnQgfHwKKwkJCSAgICAoc2NyZWVuX2luZm8ubGZiX2Jhc2UgKyBzY3JlZW5faW5mby5sZmJf
c2l6ZSkgPj0gZW5kKQorCQkJCWNvbnRpbnVlOworCQkJaWYgKCF2Z2FfZGVmYXVsdF9kZXZpY2Uo
KSkKKwkJCQlwcl9pbmZvKCJ2Z2FhcmI6IHNldHRpbmcgYXMgYm9vdCBkZXZpY2U6IFBDSTolc1xu
IiwKKwkJCQkJcGNpX25hbWUodmdhZGV2LT5wZGV2KSk7CisJCQllbHNlIGlmICh2Z2FkZXYtPnBk
ZXYgIT0gdmdhX2RlZmF1bHRfZGV2aWNlKCkpCisJCQkJcHJfaW5mbygidmdhYXJiOiBvdmVycmlk
aW5nIGJvb3QgZGV2aWNlOiBQQ0k6JXNcbiIsCisJCQkJCXBjaV9uYW1lKHZnYWRldi0+cGRldikp
OworCQkJdmdhX3NldF9kZWZhdWx0X2RldmljZSh2Z2FkZXYtPnBkZXYpOworCQl9CisjZW5kaWYK
IAkJaWYgKHZnYWRldi0+YnJpZGdlX2hhc19vbmVfdmdhKQogCQkJcHJfaW5mbygidmdhYXJiOiBi
cmlkZ2UgY29udHJvbCBwb3NzaWJsZSAlc1xuIiwgcGNpX25hbWUodmdhZGV2LT5wZGV2KSk7CiAJ
CWVsc2UKLS0gCjEuOC41LjUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNr
dG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJp
LWRldmVsCg==