From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bruno =?UTF-8?B?UHLDqW1vbnQ=?= Subject: [PATCH 2/2] x86, ia64: Don't default to first video device Date: Sat, 16 Aug 2014 19:30:39 +0200 Message-ID: <20140816193039.76304abb@neptune.home> 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> 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 559C4891CD for ; Sat, 16 Aug 2014 10:31:58 -0700 (PDT) In-Reply-To: <20140816192135.34260115@neptune.home> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Andreas Noever Cc: Matthew Garrett , Linux PCI , DRI mailing list , Greg Kroah-Hartman , Bjorn Helgaas List-Id: dri-devel@lists.freedesktop.org V2l0aCBjb21taXQgMjBjZGU2OTQwMjdlIGJvb3QgdmlkZW8gZGV2aWNlIGRldGVjdGlvbiB3YXMg bW92ZWQgZnJvbQplZmlmYiB0byB4ODYgYW5kIGlhNjQgcGNpL2ZpeHVwLmMuCgpGb3IgZHVhbC1H UFUgQXBwbGUgY29tcHV0ZXJzIGFib3ZlIGFib3ZlIGNoYW5nZSByZXByZXNlbnRzIGEgcmVncmVz c2lvbgphcyBjb2RlIGluIGVmaWZiIGRpZCBmb3JjZWZ1bGx5IG92ZXJyaWRlIHZnYV9kZWZhdWx0 X2RldmljZSB3aGlsZSB0aGUKbWVyZ2UgZGlkIG5vdCAoY2hhbmdlZCBvcmRlcmluZyBvZiBhY3Rp b25zKS4KClRoaXMgc3RvcHMgc2V0dGluZyBkZWZhdWx0X3ZnYV9kZXZpY2Ugd2hlbiBhcHBseWlu ZwpJT1JFU09VUkNFX1JPTV9TSEFET1cgKG9ubHkgZG9pbmcgc28gZm9yIHRoZSBkZXRlY3RlZCBi b290IEdQVSkgYW5kCnVwZGF0ZXMgbG9nZ2luZyBvZiBib290IHZpZGVvIGRldmljZSBzZWxlY3Rp b24sIGluIHZnYWFyYiB3aGljaCBjb3ZlcnMKVkdBIHRleHQtbW9kZSBib290aW5nIGFuZCBmaXJz dCBoYWxmIG9mIHBjaV9maXh1cF92aWRlbyB3aGljaCBjb3ZlcnMKZnJhbWVidWZmZXIgbW9kZSAo RUZJLCBWRVNBKS4KCkJ5IHNldHRpbmcgSU9SRVNPVVJDRV9ST01fU0hBRE9XIG9ubHkgb24gZWZm ZWN0aXZlIGJvb3QgR1BVIHdlIGFsc28KY29ycmVjdHMgYSBsb25nc3RhbmRpbmcgY29tcGxhaW50 IGZyb20gaW50ZWwgZHJpdmVyIGFzIHJlcG9ydGVkIGJ5CkFuZHJlYXM6CiAgPiBEb2VzIHNldHRp bmcgdGhlIFJPTV9TSEFET1cgZmxhZyBvbiAocG9zc2libHkpIHRoZSB3cm9uZyBkZXZpY2UKICA+ IGhhdmUgYW55IGVmZmVjdD8KICBZZXMgaXQgZG9lcy4gUmVtb3ZpbmcgdGhlIGxpbmUgY2hhbmdl cyBhIGxvbmcgc3RhbmRpbmcKICAgIGk5MTUgMDAwMDowMDowMi4wOiBJbnZhbGlkIFJPTSBjb250 ZW50cwogIGludG8gYQogICAgaTkxNSAwMDAwOjAwOjAyLjA6IEJBUiA2OiBjYW4ndCBhc3NpZ24g Wz8/PyAweDAwMDAwMDAwIGZsYWdzCiAgICAweDIwMDAwMDAwXSAoYm9ndXMgYWxpZ25tZW50KS4K ICBUaGUgZmlyc3QgaXMgbG9nZ2VkIGF0IEtFUk5fRVJSIHdoaWxlIHRoZSBzZWNvbmQgaXMgYXQg S0VSTl9JTkZPLgoKUmVwb3J0ZWQtQnk6IEFuZHJlYXMgTm9ldmVyIDxhbmRyZWFzLm5vZXZlckBn bWFpbC5jb20+ClNpZ25lZC1vZmYtYnk6IEJydW5vIFByw6ltb250IDxib25ib25zQGxpbnV4LXZz ZXJ2ZXIub3JnPgpDQzogTWF0dGhldyBHYXJyZXR0IDxtYXR0aGV3LmdhcnJldHRAbmVidWxhLmNv bT4KQ0M6IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcgIyB2My41KwotLS0KTXVzdCBiZSBhcHBsaWVk IHRvIHN0YWJsZSB3aGVuIHVwc3RyZWFtIGNvbW1pdAoyMGNkZTY5NDAyN2U3NDc3Y2M1MzI4MzNl MzhhYjlmY2FhODNmYjY0LCB3aGljaCBpcyBtYXJrZWQgZm9yCnN0YWJsZSwgZ2V0cyBhcHBsaWVk LgoKQ2FuIGJlIGFwcGxpZWQgd2l0aG91dCBwYXRjaCAxLzIgZnJvbSB0aGlzIHNlcmllcyB0aG91 Z2ggZHJvcHBlZAojaWZuZGVmcyB3aWxsIGNhdXNlIHRoaXMgcGF0Y2ggbm90IHRvIGFwcGx5IGNs ZWFubHkuCgoKIGFyY2gvaWE2NC9wY2kvZml4dXAuYyAgICB8IDkgKysrKystLS0tCiBhcmNoL3g4 Ni9wY2kvZml4dXAuYyAgICAgfCA5ICsrKysrLS0tLQogZHJpdmVycy9ncHUvdmdhL3ZnYWFyYi5j IHwgNCArKystCiAzIGZpbGVzIGNoYW5nZWQsIDEzIGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvYXJjaC9pYTY0L3BjaS9maXh1cC5jIGIvYXJjaC9pYTY0L3BjaS9m aXh1cC5jCmluZGV4IGVjNzNiMmMuLjA1MTk4ZjggMTAwNjQ0Ci0tLSBhL2FyY2gvaWE2NC9wY2kv Zml4dXAuYworKysgYi9hcmNoL2lhNjQvcGNpL2ZpeHVwLmMKQEAgLTU0LDggKzU0LDEwIEBAIHN0 YXRpYyB2b2lkIHBjaV9maXh1cF92aWRlbyhzdHJ1Y3QgcGNpX2RldiAqcGRldikKIAkJCQljb250 aW51ZTsKIAogCQkJaWYgKHNjcmVlbl9pbmZvLmxmYl9iYXNlID49IHN0YXJ0ICYmCi0JCQkgICAg KHNjcmVlbl9pbmZvLmxmYl9iYXNlICsgc2NyZWVuX2luZm8ubGZiX3NpemUpIDwgZW5kKQorCQkJ ICAgIChzY3JlZW5faW5mby5sZmJfYmFzZSArIHNjcmVlbl9pbmZvLmxmYl9zaXplKSA8IGVuZCkg eworCQkJCWRldl9wcmludGsoS0VSTl9ERUJVRywgJnBkZXYtPmRldiwgIkJvb3QgdmlkZW8gZGV2 aWNlXG4iKTsKIAkJCQl2Z2Ffc2V0X2RlZmF1bHRfZGV2aWNlKHBkZXYpOworCQkJfQogCQl9CiAJ fQogCkBAIC03OSwxMiArODEsMTEgQEAgc3RhdGljIHZvaWQgcGNpX2ZpeHVwX3ZpZGVvKHN0cnVj dCBwY2lfZGV2ICpwZGV2KQogCQl9CiAJCWJ1cyA9IGJ1cy0+cGFyZW50OwogCX0KLQlpZiAoIXZn YV9kZWZhdWx0X2RldmljZSgpIHx8IHBkZXYgPT0gdmdhX2RlZmF1bHRfZGV2aWNlKCkpIHsKKwlp ZiAocGRldiA9PSB2Z2FfZGVmYXVsdF9kZXZpY2UoKSkgewogCQlwY2lfcmVhZF9jb25maWdfd29y ZChwZGV2LCBQQ0lfQ09NTUFORCwgJmNvbmZpZyk7CiAJCWlmIChjb25maWcgJiAoUENJX0NPTU1B TkRfSU8gfCBQQ0lfQ09NTUFORF9NRU1PUlkpKSB7CiAJCQlwZGV2LT5yZXNvdXJjZVtQQ0lfUk9N X1JFU09VUkNFXS5mbGFncyB8PSBJT1JFU09VUkNFX1JPTV9TSEFET1c7Ci0JCQlkZXZfcHJpbnRr KEtFUk5fREVCVUcsICZwZGV2LT5kZXYsICJCb290IHZpZGVvIGRldmljZVxuIik7Ci0JCQl2Z2Ff c2V0X2RlZmF1bHRfZGV2aWNlKHBkZXYpOworCQkJZGV2X3ByaW50ayhLRVJOX0RFQlVHLCAmcGRl di0+ZGV2LCAiVmlkZW8gZGV2aWNlIHdpdGggc2hhZG93ZWQgUk9NXG4iKTsKIAkJfQogCX0KIH0K ZGlmZiAtLWdpdCBhL2FyY2gveDg2L3BjaS9maXh1cC5jIGIvYXJjaC94ODYvcGNpL2ZpeHVwLmMK aW5kZXggYzYxZWE1Ny4uNWIzOTJkMiAxMDA2NDQKLS0tIGEvYXJjaC94ODYvcGNpL2ZpeHVwLmMK KysrIGIvYXJjaC94ODYvcGNpL2ZpeHVwLmMKQEAgLTM0Miw4ICszNDIsMTAgQEAgc3RhdGljIHZv aWQgcGNpX2ZpeHVwX3ZpZGVvKHN0cnVjdCBwY2lfZGV2ICpwZGV2KQogCQkJCWNvbnRpbnVlOwog CiAJCQlpZiAoc2NyZWVuX2luZm8ubGZiX2Jhc2UgPj0gc3RhcnQgJiYKLQkJCSAgICAoc2NyZWVu X2luZm8ubGZiX2Jhc2UgKyBzY3JlZW5faW5mby5sZmJfc2l6ZSkgPCBlbmQpCisJCQkgICAgKHNj cmVlbl9pbmZvLmxmYl9iYXNlICsgc2NyZWVuX2luZm8ubGZiX3NpemUpIDwgZW5kKSB7CisJCQkJ ZGV2X3ByaW50ayhLRVJOX0RFQlVHLCAmcGRldi0+ZGV2LCAiQm9vdCB2aWRlbyBkZXZpY2VcbiIp OwogCQkJCXZnYV9zZXRfZGVmYXVsdF9kZXZpY2UocGRldik7CisJCQl9CiAJCX0KIAl9CiAKQEAg LTM2NywxMiArMzY5LDExIEBAIHN0YXRpYyB2b2lkIHBjaV9maXh1cF92aWRlbyhzdHJ1Y3QgcGNp X2RldiAqcGRldikKIAkJfQogCQlidXMgPSBidXMtPnBhcmVudDsKIAl9Ci0JaWYgKCF2Z2FfZGVm YXVsdF9kZXZpY2UoKSB8fCBwZGV2ID09IHZnYV9kZWZhdWx0X2RldmljZSgpKSB7CisJaWYgKHBk ZXYgPT0gdmdhX2RlZmF1bHRfZGV2aWNlKCkpIHsKIAkJcGNpX3JlYWRfY29uZmlnX3dvcmQocGRl diwgUENJX0NPTU1BTkQsICZjb25maWcpOwogCQlpZiAoY29uZmlnICYgKFBDSV9DT01NQU5EX0lP IHwgUENJX0NPTU1BTkRfTUVNT1JZKSkgewogCQkJcGRldi0+cmVzb3VyY2VbUENJX1JPTV9SRVNP VVJDRV0uZmxhZ3MgfD0gSU9SRVNPVVJDRV9ST01fU0hBRE9XOwotCQkJZGV2X3ByaW50ayhLRVJO X0RFQlVHLCAmcGRldi0+ZGV2LCAiQm9vdCB2aWRlbyBkZXZpY2VcbiIpOwotCQkJdmdhX3NldF9k ZWZhdWx0X2RldmljZShwZGV2KTsKKwkJCWRldl9wcmludGsoS0VSTl9ERUJVRywgJnBkZXYtPmRl diwgIlZpZGVvIGRldmljZSB3aXRoIHNoYWRvd2VkIFJPTVxuIik7CiAJCX0KIAl9CiB9CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS92Z2EvdmdhYXJiLmMgYi9kcml2ZXJzL2dwdS92Z2EvdmdhYXJi LmMKaW5kZXggMjU3Njc0ZC4uYzZlZWVkNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvdmdhL3Zn YWFyYi5jCisrKyBiL2RyaXZlcnMvZ3B1L3ZnYS92Z2FhcmIuYwpAQCAtNTgwLDggKzU4MCwxMCBA QCBzdGF0aWMgYm9vbCB2Z2FfYXJiaXRlcl9hZGRfcGNpX2RldmljZShzdHJ1Y3QgcGNpX2RldiAq cGRldikKIAkgKiBieSBkZWZhdWx0IGlmIGFyY2ggZG9lc24ndCBoYXZlIGl0J3Mgb3duIGhvb2sK IAkgKi8KIAlpZiAodmdhX2RlZmF1bHQgPT0gTlVMTCAmJgotCSAgICAoKHZnYWRldi0+b3ducyAm IFZHQV9SU1JDX0xFR0FDWV9NQVNLKSA9PSBWR0FfUlNSQ19MRUdBQ1lfTUFTSykpCisJICAgICgo dmdhZGV2LT5vd25zICYgVkdBX1JTUkNfTEVHQUNZX01BU0spID09IFZHQV9SU1JDX0xFR0FDWV9N QVNLKSkgeworCQlwcl9pbmZvKCJ2Z2FhcmI6IEJvb3QgdmlkZW8gZGV2aWNlOiBQQ0k6JXNcbiIs IHBjaV9uYW1lKHBkZXYpKTsKIAkJdmdhX3NldF9kZWZhdWx0X2RldmljZShwZGV2KTsKKwl9CiAK IAl2Z2FfYXJiaXRlcl9jaGVja19icmlkZ2Vfc2hhcmluZyh2Z2FkZXYpOwogCi0tIAoxLjguNS41 CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2 ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=