From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bruno =?UTF-8?B?UHLDqW1vbnQ=?= Subject: [PATCH 1/2 v2] x86, ia64: Move EFI_FB vga_default_device() initialization to pci_vga_fixup() Date: Wed, 25 Jun 2014 00:55:01 +0200 Message-ID: <20140625005501.7ff7e982@neptune.home> References: <20140514224339.7f8be3a9@neptune.home> <20140527234255.GJ11907@google.com> <20140602201650.35f0e936@neptune.home> <20140602201926.4d476818@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 D154988F06 for ; Tue, 24 Jun 2014 15:55:05 -0700 (PDT) In-Reply-To: <20140602201926.4d476818@neptune.home> 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: Linux PCI , DRI mailing list , Matthew Garrett List-Id: dri-devel@lists.freedesktop.org V2l0aCBjb21taXQgYjRhYTAxNjMwNTZiICgiZWZpZmI6IEltcGxlbWVudCB2Z2FfZGVmYXVsdF9k ZXZpY2UoKSAodjIpIikKTWF0dGhldyBHYXJyZXR0IGludHJvZHVjZWQgYSBlZmlmYiB2Z2FfZGVm YXVsdF9kZXZpY2UoKSBzbyB0aGF0IEVGSQpzeXN0ZW1zIHRoYXQgZG8gbm90IGxvYWQgc2hhZG93 IFZCSU9TIG9yIHNldHVwIFZHQSBnZXQgcHJvcGVyIHZhbHVlIGZvcgpib290X3ZnYSBQQ0kgc3lz ZnMgYXR0cmlidXRlIG9uIHRoZSBjb3JyZXNwb25kaW5nIFBDSSBkZXZpY2UuCgpYb3JnIGlzIHJl ZnVzaW5nIHRvIGRldGVjdCBkZXZpY2VzIHdoZW4gYm9vdF92Z2E9MCB3aGljaCBpcyB0aGUgY2Fz ZSBvbgpzb21lIEVGSSBzeXN0ZW0gKGUuZy4gTWFjQm9va0FpcjIsMSkuIFhvcmcgZGV0ZWN0cyB0 aGUgR1BVIGFuZCBmaW5kcwp0aGUgZHJpIGRldmljZSBidXQgdGhlbiBiYWlscyBvdXQgd2l0aCAi bm8gZGV2aWNlcyBkZXRlY3RlZCIuCgpOb3RlOiBXaGVuIHZnYV9kZWZhdWx0X2RldmljZSgpIGlz IHNldCBib290X3ZnYSBQQ0kgc3lzZnMgYXR0cmlidXRlCnJlZmxlY3RzIGl0cyBzdGF0ZS4gV2hl biB1bnNldCB0aGlzIGF0dHJpYnV0ZSBpcyAxIHdoZW5ldmVyCklPUkVTT1VSQ0VfUk9NX1NIQURP VyBmbGFnIGlzIHNldC4KCldpdGggaW50cm9kdWN0aW9uIG9mIHN5c2ZiL3NpbXBsZWZiL3NpbXBs ZWRybSBlZmlmYiBpcyBnZXR0aW5nIG9ic29sZXRlCndoaWxlIGhhdmluZyBuYXRpdmUgZHJpdmVy cyBmb3IgdGhlIEdQVSBhbHNvIG1ha2VzIHNlbGVjdGluZwpzeXNmYi9lZmlmYiBvcHRpb25hbC4K ClJlbW92ZSB0aGUgZWZpZmIgaW1wbGVtZW50YXRpb24gb2YgdmdhX2RlZmF1bHRfZGV2aWNlKCkg YW5kIGluaXRpYWxpemUKdmdhYXJiJ3MgdmdhX2RlZmF1bHRfZGV2aWNlKCkgd2l0aCB0aGUgUENJ IEdQVSB0aGF0IG1hdGNoZXMgYm9vdApzY3JlZW5faW5mbyBpbiBwY2lfZml4dXBfdmlkZW8oKS4K ClRlc3RlZC1ieTogQW5pYmFsIEZyYW5jaXNjbyBNYXJ0aW5leiBDb3J0aW5hIDxsaW51eGtpZC56 ZXV6QGdtYWlsLmNvbT4KQ2M6IE1hdHRoZXcgR2FycmV0dCA8bWF0dGhldy5nYXJyZXR0QG5lYnVs YS5jb20+CkNjOiBzdGFibGVAdmdlci5rZXJuZWwub3JnClNpZ25lZC1vZmYtYnk6IEJydW5vIFBy w6ltb250IDxib25ib25zQGxpbnV4LXZzZXJ2ZXIub3JnPgotLS0KCkNoYW5nZXMgc2luY2UgdjE6 CiAgQWRkZWQgVGVzdGVkLWJ5LCBDYwoKIGFyY2gvaWE2NC9wY2kvZml4dXAuYyAgICAgICB8IDIx ICsrKysrKysrKysrKysrKysrKysrKwogYXJjaC94ODYvaW5jbHVkZS9hc20vdmdhLmggIHwgIDYg LS0tLS0tCiBhcmNoL3g4Ni9wY2kvZml4dXAuYyAgICAgICAgfCAyMSArKysrKysrKysrKysrKysr KysrKysKIGRyaXZlcnMvdmlkZW8vZmJkZXYvZWZpZmIuYyB8IDM4IC0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDQyIGluc2VydGlvbnMoKyks IDQ0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2FyY2gvaWE2NC9wY2kvZml4dXAuYyBiL2Fy Y2gvaWE2NC9wY2kvZml4dXAuYwppbmRleCBlZWUwNjlhLi45ZWQ1YmVmIDEwMDY0NAotLS0gYS9h cmNoL2lhNjQvcGNpL2ZpeHVwLmMKKysrIGIvYXJjaC9pYTY0L3BjaS9maXh1cC5jCkBAIC0zNyw2 ICszNywyNyBAQCBzdGF0aWMgdm9pZCBwY2lfZml4dXBfdmlkZW8oc3RydWN0IHBjaV9kZXYgKnBk ZXYpCiAJCXJldHVybjsKIAkvKiBNYXliZSwgdGhpcyBtYWNoaW5lIHN1cHBvcnRzIGxlZ2FjeSBt ZW1vcnkgbWFwLiAqLwogCisJaWYgKCF2Z2FfZGVmYXVsdF9kZXZpY2UoKSkgeworCQlyZXNvdXJj ZV9zaXplX3Qgc3RhcnQsIGVuZDsKKwkJaW50IGk7CisKKwkJLyogRG9lcyBmaXJtd2FyZSBmcmFt ZWJ1ZmZlciBiZWxvbmcgdG8gdXM/ICovCisJCWZvciAoaT0wOyBpIDwgREVWSUNFX0NPVU5UX1JF U09VUkNFOyBpKyspIHsKKwkJCWlmICghKHBjaV9yZXNvdXJjZV9mbGFncyhwZGV2LCBpKSAmIElP UkVTT1VSQ0VfTUVNKSkKKwkJCQljb250aW51ZTsKKworCQkJc3RhcnQgPSBwY2lfcmVzb3VyY2Vf c3RhcnQocGRldiwgaSk7CisJCQllbmQgID0gcGNpX3Jlc291cmNlX2VuZChwZGV2LCBpKTsKKwor CQkJaWYgKCFzdGFydCB8fCAhZW5kKQorCQkJCWNvbnRpbnVlOworCisJCQlpZiAoc2NyZWVuX2lu Zm8ubGZiX2Jhc2UgPj0gc3RhcnQgJiYKKwkJCQkoc2NyZWVuX2luZm8ubGZiX2Jhc2UgKyBzY3Jl ZW5faW5mby5sZmJfc2l6ZSkgPCBlbmQpCisJCQkJdmdhX3NldF9kZWZhdWx0X2RldmljZShwZGV2 KTsKKwkJfQorCX0KKwogCS8qIElzIFZHQSByb3V0ZWQgdG8gdXM/ICovCiAJYnVzID0gcGRldi0+ YnVzOwogCXdoaWxlIChidXMpIHsKZGlmZiAtLWdpdCBhL2FyY2gveDg2L2luY2x1ZGUvYXNtL3Zn YS5oIGIvYXJjaC94ODYvaW5jbHVkZS9hc20vdmdhLmgKaW5kZXggNDQyODJmYi4uYzRiOWRjMiAx MDA2NDQKLS0tIGEvYXJjaC94ODYvaW5jbHVkZS9hc20vdmdhLmgKKysrIGIvYXJjaC94ODYvaW5j bHVkZS9hc20vdmdhLmgKQEAgLTE3LDEwICsxNyw0IEBACiAjZGVmaW5lIHZnYV9yZWFkYih4KSAo Kih4KSkKICNkZWZpbmUgdmdhX3dyaXRlYih4LCB5KSAoKih5KSA9ICh4KSkKIAotI2lmZGVmIENP TkZJR19GQl9FRkkKLSNkZWZpbmUgX19BUkNIX0hBU19WR0FfREVGQVVMVF9ERVZJQ0UKLWV4dGVy biBzdHJ1Y3QgcGNpX2RldiAqdmdhX2RlZmF1bHRfZGV2aWNlKHZvaWQpOwotZXh0ZXJuIHZvaWQg dmdhX3NldF9kZWZhdWx0X2RldmljZShzdHJ1Y3QgcGNpX2RldiAqcGRldik7Ci0jZW5kaWYKLQog I2VuZGlmIC8qIF9BU01fWDg2X1ZHQV9IICovCmRpZmYgLS1naXQgYS9hcmNoL3g4Ni9wY2kvZml4 dXAuYyBiL2FyY2gveDg2L3BjaS9maXh1cC5jCmluZGV4IDk0YWU5YWUuLjcyNDZjZjIgMTAwNjQ0 Ci0tLSBhL2FyY2gveDg2L3BjaS9maXh1cC5jCisrKyBiL2FyY2gveDg2L3BjaS9maXh1cC5jCkBA IC0zMjUsNiArMzI1LDI3IEBAIHN0YXRpYyB2b2lkIHBjaV9maXh1cF92aWRlbyhzdHJ1Y3QgcGNp X2RldiAqcGRldikKIAlzdHJ1Y3QgcGNpX2J1cyAqYnVzOwogCXUxNiBjb25maWc7CiAKKwlpZiAo IXZnYV9kZWZhdWx0X2RldmljZSgpKSB7CisJCXJlc291cmNlX3NpemVfdCBzdGFydCwgZW5kOwor CQlpbnQgaTsKKworCQkvKiBEb2VzIGZpcm13YXJlIGZyYW1lYnVmZmVyIGJlbG9uZyB0byB1cz8g Ki8KKwkJZm9yIChpPTA7IGkgPCBERVZJQ0VfQ09VTlRfUkVTT1VSQ0U7IGkrKykgeworCQkJaWYg KCEocGNpX3Jlc291cmNlX2ZsYWdzKHBkZXYsIGkpICYgSU9SRVNPVVJDRV9NRU0pKQorCQkJCWNv bnRpbnVlOworCisJCQlzdGFydCA9IHBjaV9yZXNvdXJjZV9zdGFydChwZGV2LCBpKTsKKwkJCWVu ZCAgPSBwY2lfcmVzb3VyY2VfZW5kKHBkZXYsIGkpOworCisJCQlpZiAoIXN0YXJ0IHx8ICFlbmQp CisJCQkJY29udGludWU7CisKKwkJCWlmIChzY3JlZW5faW5mby5sZmJfYmFzZSA+PSBzdGFydCAm JgorCQkJCShzY3JlZW5faW5mby5sZmJfYmFzZSArIHNjcmVlbl9pbmZvLmxmYl9zaXplKSA8IGVu ZCkKKwkJCQl2Z2Ffc2V0X2RlZmF1bHRfZGV2aWNlKHBkZXYpOworCQl9CisJfQorCiAJLyogSXMg VkdBIHJvdXRlZCB0byB1cz8gKi8KIAlidXMgPSBwZGV2LT5idXM7CiAJd2hpbGUgKGJ1cykgewpk aWZmIC0tZ2l0IGEvZHJpdmVycy92aWRlby9mYmRldi9lZmlmYi5jIGIvZHJpdmVycy92aWRlby9m YmRldi9lZmlmYi5jCmluZGV4IGFlOTYxOGYuLmEwMzMxODAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv dmlkZW8vZmJkZXYvZWZpZmIuYworKysgYi9kcml2ZXJzL3ZpZGVvL2ZiZGV2L2VmaWZiLmMKQEAg LTE5LDggKzE5LDYgQEAKIAogc3RhdGljIGJvb2wgcmVxdWVzdF9tZW1fc3VjY2VlZGVkID0gZmFs c2U7CiAKLXN0YXRpYyBzdHJ1Y3QgcGNpX2RldiAqZGVmYXVsdF92Z2E7Ci0KIHN0YXRpYyBzdHJ1 Y3QgZmJfdmFyX3NjcmVlbmluZm8gZWZpZmJfZGVmaW5lZCA9IHsKIAkuYWN0aXZhdGUJCT0gRkJf QUNUSVZBVEVfTk9XLAogCS5oZWlnaHQJCQk9IC0xLApAQCAtODQsMTggKzgyLDYgQEAgc3RhdGlj IHN0cnVjdCBmYl9vcHMgZWZpZmJfb3BzID0gewogCS5mYl9pbWFnZWJsaXQJPSBjZmJfaW1hZ2Vi bGl0LAogfTsKIAotc3RydWN0IHBjaV9kZXYgKnZnYV9kZWZhdWx0X2RldmljZSh2b2lkKQotewot CXJldHVybiBkZWZhdWx0X3ZnYTsKLX0KLQotRVhQT1JUX1NZTUJPTF9HUEwodmdhX2RlZmF1bHRf ZGV2aWNlKTsKLQotdm9pZCB2Z2Ffc2V0X2RlZmF1bHRfZGV2aWNlKHN0cnVjdCBwY2lfZGV2ICpw ZGV2KQotewotCWRlZmF1bHRfdmdhID0gcGRldjsKLX0KLQogc3RhdGljIGludCBlZmlmYl9zZXR1 cChjaGFyICpvcHRpb25zKQogewogCWNoYXIgKnRoaXNfb3B0OwpAQCAtMTI2LDMwICsxMTIsNiBA QCBzdGF0aWMgaW50IGVmaWZiX3NldHVwKGNoYXIgKm9wdGlvbnMpCiAJCX0KIAl9CiAKLQlmb3Jf ZWFjaF9wY2lfZGV2KGRldikgewotCQlpbnQgaTsKLQotCQlpZiAoKGRldi0+Y2xhc3MgPj4gOCkg IT0gUENJX0NMQVNTX0RJU1BMQVlfVkdBKQotCQkJY29udGludWU7Ci0KLQkJZm9yIChpPTA7IGkg PCBERVZJQ0VfQ09VTlRfUkVTT1VSQ0U7IGkrKykgewotCQkJcmVzb3VyY2Vfc2l6ZV90IHN0YXJ0 LCBlbmQ7Ci0KLQkJCWlmICghKHBjaV9yZXNvdXJjZV9mbGFncyhkZXYsIGkpICYgSU9SRVNPVVJD RV9NRU0pKQotCQkJCWNvbnRpbnVlOwotCi0JCQlzdGFydCA9IHBjaV9yZXNvdXJjZV9zdGFydChk ZXYsIGkpOwotCQkJZW5kICA9IHBjaV9yZXNvdXJjZV9lbmQoZGV2LCBpKTsKLQotCQkJaWYgKCFz dGFydCB8fCAhZW5kKQotCQkJCWNvbnRpbnVlOwotCi0JCQlpZiAoc2NyZWVuX2luZm8ubGZiX2Jh c2UgPj0gc3RhcnQgJiYKLQkJCSAgICAoc2NyZWVuX2luZm8ubGZiX2Jhc2UgKyBzY3JlZW5faW5m by5sZmJfc2l6ZSkgPCBlbmQpCi0JCQkJZGVmYXVsdF92Z2EgPSBkZXY7Ci0JCX0KLQl9Ci0KIAly ZXR1cm4gMDsKIH0KIAotLSAKMS44LjUuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwK