From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bruno =?UTF-8?B?UHLDqW1vbnQ=?= Subject: [PATCH 1/2] x86, ia64: Move EFI_FB vga_default_device() initialization to pci_vga_fixup() Date: Mon, 2 Jun 2014 20:19:26 +0200 Message-ID: <20140602201926.4d476818@neptune.home> References: <20140514224339.7f8be3a9@neptune.home> <20140527234255.GJ11907@google.com> <20140602201650.35f0e936@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 0A89C6E62A for ; Mon, 2 Jun 2014 11:20:17 -0700 (PDT) In-Reply-To: <20140602201650.35f0e936@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 List-Id: dri-devel@lists.freedesktop.org V2l0aCBjb21taXQgYjRhYTAxNjMwNTZiICgiZWZpZmI6IEltcGxlbWVudCB2Z2FfZGVmYXVsdF9k ZXZpY2UoKSAodjIpIikKTWF0dGhldyBHYXJyZXR0IGludHJvZHVjZWQgYSBlZmlmYiB2Z2FfZGVm YXVsdF9kZXZpY2UoKSBzbyB0aGF0IEVGSQpzeXN0ZW1zIHRoYXQgZG8gbm90IGxvYWQgc2hhZG93 IFZCSU9TIG9yIHNldHVwIFZHQSBnZXQgcHJvcGVyIHZhbHVlIGZvcgpib290X3ZnYSBQQ0kgc3lz ZnMgYXR0cmlidXRlIG9uIHRoZSBjb3JyZXNwb25kaW5nIFBDSSBkZXZpY2UuCgpYb3JnIGlzIHJl ZnVzaW5nIHRvIGRldGVjdCBkZXZpY2VzIHdoZW4gYm9vdF92Z2E9MCB3aGljaCBpcyB0aGUgY2Fz ZSBvbgpzb21lIEVGSSBzeXN0ZW0gKGUuZy4gTWFjQm9va0FpcjIsMSkuIFhvcmcgZGV0ZWN0cyB0 aGUgR1BVIGFuZCBmaW5kcwp0aGUgZHJpIGRldmljZSBidXQgdGhlbiBiYWlscyBvdXQgd2l0aCAi bm8gZGV2aWNlcyBkZXRlY3RlZCIuCgpOb3RlOiBXaGVuIHZnYV9kZWZhdWx0X2RldmljZSgpIGlz IHNldCBib290X3ZnYSBQQ0kgc3lzZnMgYXR0cmlidXRlCnJlZmxlY3RzIGl0cyBzdGF0ZS4gV2hl biB1bnNldCB0aGlzIGF0dHJpYnV0ZSBpcyAxIHdoZW5ldmVyCklPUkVTT1VSQ0VfUk9NX1NIQURP VyBmbGFnIGlzIHNldC4KCldpdGggaW50cm9kdWN0aW9uIG9mIHN5c2ZiL3NpbXBsZWZiL3NpbXBs ZWRybSBlZmlmYiBpcyBnZXR0aW5nIG9ic29sZXRlCndoaWxlIGhhdmluZyBuYXRpdmUgZHJpdmVy cyBmb3IgdGhlIEdQVSBhbHNvIG1ha2VzIHNlbGVjdGluZwpzeXNmYi9lZmlmYiBvcHRpb25hbC4K ClJlbW92ZSB0aGUgZWZpZmIgaW1wbGVtZW50YXRpb24gb2YgdmdhX2RlZmF1bHRfZGV2aWNlKCkg YW5kIGluaXRpYWxpemUKdmdhYXJiJ3MgdmdhX2RlZmF1bHRfZGV2aWNlKCkgd2l0aCB0aGUgUENJ IEdQVSB0aGF0IG1hdGNoZXMgYm9vdApzY3JlZW5faW5mbyBpbiBwY2lfZml4dXBfdmlkZW8oKS4K ClNpZ25lZC1vZmYtYnk6IEJydW5vIFByw6ltb250IDxib25ib25zQGxpbnV4LXZzZXJ2ZXIub3Jn PgotLS0KIGFyY2gvaWE2NC9wY2kvZml4dXAuYyAgICAgICB8IDIxICsrKysrKysrKysrKysrKysr KysrKwogYXJjaC94ODYvaW5jbHVkZS9hc20vdmdhLmggIHwgIDYgLS0tLS0tCiBhcmNoL3g4Ni9w Y2kvZml4dXAuYyAgICAgICAgfCAyMSArKysrKysrKysrKysrKysrKysrKysKIGRyaXZlcnMvdmlk ZW8vZmJkZXYvZWZpZmIuYyB8IDM4IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tCiA0IGZpbGVzIGNoYW5nZWQsIDQyIGluc2VydGlvbnMoKyksIDQ0IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2FyY2gvaWE2NC9wY2kvZml4dXAuYyBiL2FyY2gvaWE2NC9wY2kvZml4dXAu YwppbmRleCBlZWUwNjlhLi45ZWQ1YmVmIDEwMDY0NAotLS0gYS9hcmNoL2lhNjQvcGNpL2ZpeHVw LmMKKysrIGIvYXJjaC9pYTY0L3BjaS9maXh1cC5jCkBAIC0zNyw2ICszNywyNyBAQCBzdGF0aWMg dm9pZCBwY2lfZml4dXBfdmlkZW8oc3RydWN0IHBjaV9kZXYgKnBkZXYpCiAJCXJldHVybjsKIAkv KiBNYXliZSwgdGhpcyBtYWNoaW5lIHN1cHBvcnRzIGxlZ2FjeSBtZW1vcnkgbWFwLiAqLwogCisJ aWYgKCF2Z2FfZGVmYXVsdF9kZXZpY2UoKSkgeworCQlyZXNvdXJjZV9zaXplX3Qgc3RhcnQsIGVu ZDsKKwkJaW50IGk7CisKKwkJLyogRG9lcyBmaXJtd2FyZSBmcmFtZWJ1ZmZlciBiZWxvbmcgdG8g dXM/ICovCisJCWZvciAoaT0wOyBpIDwgREVWSUNFX0NPVU5UX1JFU09VUkNFOyBpKyspIHsKKwkJ CWlmICghKHBjaV9yZXNvdXJjZV9mbGFncyhwZGV2LCBpKSAmIElPUkVTT1VSQ0VfTUVNKSkKKwkJ CQljb250aW51ZTsKKworCQkJc3RhcnQgPSBwY2lfcmVzb3VyY2Vfc3RhcnQocGRldiwgaSk7CisJ CQllbmQgID0gcGNpX3Jlc291cmNlX2VuZChwZGV2LCBpKTsKKworCQkJaWYgKCFzdGFydCB8fCAh ZW5kKQorCQkJCWNvbnRpbnVlOworCisJCQlpZiAoc2NyZWVuX2luZm8ubGZiX2Jhc2UgPj0gc3Rh cnQgJiYKKwkJCQkoc2NyZWVuX2luZm8ubGZiX2Jhc2UgKyBzY3JlZW5faW5mby5sZmJfc2l6ZSkg PCBlbmQpCisJCQkJdmdhX3NldF9kZWZhdWx0X2RldmljZShwZGV2KTsKKwkJfQorCX0KKwogCS8q IElzIFZHQSByb3V0ZWQgdG8gdXM/ICovCiAJYnVzID0gcGRldi0+YnVzOwogCXdoaWxlIChidXMp IHsKZGlmZiAtLWdpdCBhL2FyY2gveDg2L2luY2x1ZGUvYXNtL3ZnYS5oIGIvYXJjaC94ODYvaW5j bHVkZS9hc20vdmdhLmgKaW5kZXggNDQyODJmYi4uYzRiOWRjMiAxMDA2NDQKLS0tIGEvYXJjaC94 ODYvaW5jbHVkZS9hc20vdmdhLmgKKysrIGIvYXJjaC94ODYvaW5jbHVkZS9hc20vdmdhLmgKQEAg LTE3LDEwICsxNyw0IEBACiAjZGVmaW5lIHZnYV9yZWFkYih4KSAoKih4KSkKICNkZWZpbmUgdmdh X3dyaXRlYih4LCB5KSAoKih5KSA9ICh4KSkKIAotI2lmZGVmIENPTkZJR19GQl9FRkkKLSNkZWZp bmUgX19BUkNIX0hBU19WR0FfREVGQVVMVF9ERVZJQ0UKLWV4dGVybiBzdHJ1Y3QgcGNpX2RldiAq dmdhX2RlZmF1bHRfZGV2aWNlKHZvaWQpOwotZXh0ZXJuIHZvaWQgdmdhX3NldF9kZWZhdWx0X2Rl dmljZShzdHJ1Y3QgcGNpX2RldiAqcGRldik7Ci0jZW5kaWYKLQogI2VuZGlmIC8qIF9BU01fWDg2 X1ZHQV9IICovCmRpZmYgLS1naXQgYS9hcmNoL3g4Ni9wY2kvZml4dXAuYyBiL2FyY2gveDg2L3Bj aS9maXh1cC5jCmluZGV4IDk0YWU5YWUuLjcyNDZjZjIgMTAwNjQ0Ci0tLSBhL2FyY2gveDg2L3Bj aS9maXh1cC5jCisrKyBiL2FyY2gveDg2L3BjaS9maXh1cC5jCkBAIC0zMjUsNiArMzI1LDI3IEBA IHN0YXRpYyB2b2lkIHBjaV9maXh1cF92aWRlbyhzdHJ1Y3QgcGNpX2RldiAqcGRldikKIAlzdHJ1 Y3QgcGNpX2J1cyAqYnVzOwogCXUxNiBjb25maWc7CiAKKwlpZiAoIXZnYV9kZWZhdWx0X2Rldmlj ZSgpKSB7CisJCXJlc291cmNlX3NpemVfdCBzdGFydCwgZW5kOworCQlpbnQgaTsKKworCQkvKiBE b2VzIGZpcm13YXJlIGZyYW1lYnVmZmVyIGJlbG9uZyB0byB1cz8gKi8KKwkJZm9yIChpPTA7IGkg PCBERVZJQ0VfQ09VTlRfUkVTT1VSQ0U7IGkrKykgeworCQkJaWYgKCEocGNpX3Jlc291cmNlX2Zs YWdzKHBkZXYsIGkpICYgSU9SRVNPVVJDRV9NRU0pKQorCQkJCWNvbnRpbnVlOworCisJCQlzdGFy dCA9IHBjaV9yZXNvdXJjZV9zdGFydChwZGV2LCBpKTsKKwkJCWVuZCAgPSBwY2lfcmVzb3VyY2Vf ZW5kKHBkZXYsIGkpOworCisJCQlpZiAoIXN0YXJ0IHx8ICFlbmQpCisJCQkJY29udGludWU7CisK KwkJCWlmIChzY3JlZW5faW5mby5sZmJfYmFzZSA+PSBzdGFydCAmJgorCQkJCShzY3JlZW5faW5m by5sZmJfYmFzZSArIHNjcmVlbl9pbmZvLmxmYl9zaXplKSA8IGVuZCkKKwkJCQl2Z2Ffc2V0X2Rl ZmF1bHRfZGV2aWNlKHBkZXYpOworCQl9CisJfQorCiAJLyogSXMgVkdBIHJvdXRlZCB0byB1cz8g Ki8KIAlidXMgPSBwZGV2LT5idXM7CiAJd2hpbGUgKGJ1cykgewpkaWZmIC0tZ2l0IGEvZHJpdmVy cy92aWRlby9mYmRldi9lZmlmYi5jIGIvZHJpdmVycy92aWRlby9mYmRldi9lZmlmYi5jCmluZGV4 IGFlOTYxOGYuLmEwMzMxODAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvZWZpZmIu YworKysgYi9kcml2ZXJzL3ZpZGVvL2ZiZGV2L2VmaWZiLmMKQEAgLTE5LDggKzE5LDYgQEAKIAog c3RhdGljIGJvb2wgcmVxdWVzdF9tZW1fc3VjY2VlZGVkID0gZmFsc2U7CiAKLXN0YXRpYyBzdHJ1 Y3QgcGNpX2RldiAqZGVmYXVsdF92Z2E7Ci0KIHN0YXRpYyBzdHJ1Y3QgZmJfdmFyX3NjcmVlbmlu Zm8gZWZpZmJfZGVmaW5lZCA9IHsKIAkuYWN0aXZhdGUJCT0gRkJfQUNUSVZBVEVfTk9XLAogCS5o ZWlnaHQJCQk9IC0xLApAQCAtODQsMTggKzgyLDYgQEAgc3RhdGljIHN0cnVjdCBmYl9vcHMgZWZp ZmJfb3BzID0gewogCS5mYl9pbWFnZWJsaXQJPSBjZmJfaW1hZ2VibGl0LAogfTsKIAotc3RydWN0 IHBjaV9kZXYgKnZnYV9kZWZhdWx0X2RldmljZSh2b2lkKQotewotCXJldHVybiBkZWZhdWx0X3Zn YTsKLX0KLQotRVhQT1JUX1NZTUJPTF9HUEwodmdhX2RlZmF1bHRfZGV2aWNlKTsKLQotdm9pZCB2 Z2Ffc2V0X2RlZmF1bHRfZGV2aWNlKHN0cnVjdCBwY2lfZGV2ICpwZGV2KQotewotCWRlZmF1bHRf dmdhID0gcGRldjsKLX0KLQogc3RhdGljIGludCBlZmlmYl9zZXR1cChjaGFyICpvcHRpb25zKQog ewogCWNoYXIgKnRoaXNfb3B0OwpAQCAtMTI2LDMwICsxMTIsNiBAQCBzdGF0aWMgaW50IGVmaWZi X3NldHVwKGNoYXIgKm9wdGlvbnMpCiAJCX0KIAl9CiAKLQlmb3JfZWFjaF9wY2lfZGV2KGRldikg ewotCQlpbnQgaTsKLQotCQlpZiAoKGRldi0+Y2xhc3MgPj4gOCkgIT0gUENJX0NMQVNTX0RJU1BM QVlfVkdBKQotCQkJY29udGludWU7Ci0KLQkJZm9yIChpPTA7IGkgPCBERVZJQ0VfQ09VTlRfUkVT T1VSQ0U7IGkrKykgewotCQkJcmVzb3VyY2Vfc2l6ZV90IHN0YXJ0LCBlbmQ7Ci0KLQkJCWlmICgh KHBjaV9yZXNvdXJjZV9mbGFncyhkZXYsIGkpICYgSU9SRVNPVVJDRV9NRU0pKQotCQkJCWNvbnRp bnVlOwotCi0JCQlzdGFydCA9IHBjaV9yZXNvdXJjZV9zdGFydChkZXYsIGkpOwotCQkJZW5kICA9 IHBjaV9yZXNvdXJjZV9lbmQoZGV2LCBpKTsKLQotCQkJaWYgKCFzdGFydCB8fCAhZW5kKQotCQkJ CWNvbnRpbnVlOwotCi0JCQlpZiAoc2NyZWVuX2luZm8ubGZiX2Jhc2UgPj0gc3RhcnQgJiYKLQkJ CSAgICAoc2NyZWVuX2luZm8ubGZiX2Jhc2UgKyBzY3JlZW5faW5mby5sZmJfc2l6ZSkgPCBlbmQp Ci0JCQkJZGVmYXVsdF92Z2EgPSBkZXY7Ci0JCX0KLQl9Ci0KIAlyZXR1cm4gMDsKIH0KIAotLSAK MS44LjUuNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K ZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK