From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PULL 1/3] xenfb: remove xen_init_display "temporary" hack Date: Fri, 7 Jul 2017 11:30:02 -0700 Message-ID: <1499452204-20769-1-git-send-email-sstabellini@kernel.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dTY16-0005qS-TZ for xen-devel@lists.xenproject.org; Fri, 07 Jul 2017 18:30:13 +0000 In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: peter.maydell@linaro.org, stefanha@gmail.com Cc: anthony.perard@citrix.com, xen-devel@lists.xenproject.org, sstabellini@kernel.org, qemu-devel@nongnu.org, stefanha@redhat.com List-Id: xen-devel@lists.xenproject.org SW5pdGlhbGl6ZSB4ZW5mYiBwcm9wZXJseSwgYXMgYWxsIG90aGVyIGJhY2tlbmRzLCBmcm9tIGl0 cyBvd24KImluaXRpYWxpc2UiIGZ1bmN0aW9uLgoKUmVtb3ZlIHRoZSBkZXBlbmRlbmN5IG9mIHZr YmQgb24gdmZiOiB1c2UgcWVtdV9jb25zb2xlX2xvb2t1cF9ieV9pbmRleAp0byBmaW5kIHRoZSBw cmluY2lwYWwgY29uc29sZSAodG8gZ2V0IHRoZSBzaXplIG9mIHRoZSBzY3JlZW4pIGluc3RlYWQg b2YKcmVseWluZyBvbiBhIHZmYiBiYWNrZW5kIHRvIGJlIGF2YWlsYWJsZSAod2hpY2ggYWRkcyBh IGRlcGVuZGVuY3kKYmV0d2VlbiB0aGUgdHdvKS4KClNpZ25lZC1vZmYtYnk6IFN0ZWZhbm8gU3Rh YmVsbGluaSA8c3N0YWJlbGxpbmlAa2VybmVsLm9yZz4KUmV2aWV3ZWQtYnk6IFBhdWwgRHVycmFu dCA8cGF1bC5kdXJyYW50QGNpdHJpeC5jb20+Ci0tLQogaHcvZGlzcGxheS94ZW5mYi5jICAgICAg ICAgICB8IDgxICsrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBo dy94ZW5wdi94ZW5fbWFjaGluZV9wdi5jICAgIHwgIDMgLS0KIGluY2x1ZGUvaHcveGVuL3hlbl9i YWNrZW5kLmggfCAgMiAtLQogMyBmaWxlcyBjaGFuZ2VkLCAxOCBpbnNlcnRpb25zKCspLCA2OCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ody9kaXNwbGF5L3hlbmZiLmMgYi9ody9kaXNwbGF5 L3hlbmZiLmMKaW5kZXggZTc2YzBkOC4uZGY4Yjc4ZiAxMDA2NDQKLS0tIGEvaHcvZGlzcGxheS94 ZW5mYi5jCisrKyBiL2h3L2Rpc3BsYXkveGVuZmIuYwpAQCAtNDYsNyArNDYsNiBAQAogc3RydWN0 IGNvbW1vbiB7CiAgICAgc3RydWN0IFhlbkRldmljZSAgeGVuZGV2OyAgLyogbXVzdCBiZSBmaXJz dCAqLwogICAgIHZvaWQgICAgICAgICAgICAgICpwYWdlOwotICAgIFFlbXVDb25zb2xlICAgICAg ICpjb247CiB9OwogCiBzdHJ1Y3QgWGVuSW5wdXQgewpAQCAtNjEsNiArNjAsNyBAQCBzdHJ1Y3Qg WGVuSW5wdXQgewogCiBzdHJ1Y3QgWGVuRkIgewogICAgIHN0cnVjdCBjb21tb24gICAgIGM7Cisg ICAgUWVtdUNvbnNvbGUgICAgICAgKmNvbjsKICAgICBzaXplX3QgICAgICAgICAgICBmYl9sZW47 CiAgICAgaW50ICAgICAgICAgICAgICAgcm93X3N0cmlkZTsKICAgICBpbnQgICAgICAgICAgICAg ICBkZXB0aDsKQEAgLTcxLDcgKzcxLDYgQEAgc3RydWN0IFhlbkZCIHsKICAgICBpbnQgICAgICAg ICAgICAgICBmYnBhZ2VzOwogICAgIGludCAgICAgICAgICAgICAgIGZlYXR1cmVfdXBkYXRlOwog ICAgIGludCAgICAgICAgICAgICAgIGJ1Z190cmlnZ2VyOwotICAgIGludCAgICAgICAgICAgICAg IGhhdmVfY29uc29sZTsKICAgICBpbnQgICAgICAgICAgICAgICBkb19yZXNpemU7CiAKICAgICBz dHJ1Y3QgewpAQCAtODAsNiArNzksNyBAQCBzdHJ1Y3QgWGVuRkIgewogICAgIGludCAgICAgICAg ICAgICAgIHVwX2NvdW50OwogICAgIGludCAgICAgICAgICAgICAgIHVwX2Z1bGxzY3JlZW47CiB9 Oworc3RhdGljIGNvbnN0IEdyYXBoaWNId09wcyB4ZW5mYl9vcHM7CiAKIC8qIC0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t ICovCiAKQEAgLTMwNiwxMCArMzA2LDE4IEBAIHN0YXRpYyB2b2lkIHhlbmZiX21vdXNlX2V2ZW50 KHZvaWQgKm9wYXF1ZSwKIAkJCSAgICAgIGludCBkeCwgaW50IGR5LCBpbnQgZHosIGludCBidXR0 b25fc3RhdGUpCiB7CiAgICAgc3RydWN0IFhlbklucHV0ICp4ZW5mYiA9IG9wYXF1ZTsKLSAgICBE aXNwbGF5U3VyZmFjZSAqc3VyZmFjZSA9IHFlbXVfY29uc29sZV9zdXJmYWNlKHhlbmZiLT5jLmNv bik7Ci0gICAgaW50IGR3ID0gc3VyZmFjZV93aWR0aChzdXJmYWNlKTsKLSAgICBpbnQgZGggPSBz dXJmYWNlX2hlaWdodChzdXJmYWNlKTsKLSAgICBpbnQgaTsKKyAgICBRZW11Q29uc29sZSAqY29u ID0gcWVtdV9jb25zb2xlX2xvb2t1cF9ieV9pbmRleCgwKTsKKyAgICBEaXNwbGF5U3VyZmFjZSAq c3VyZmFjZTsKKyAgICBpbnQgZHcsIGRoLCBpOworCisgICAgaWYgKCFjb24pIHsKKyAgICAgICAg eGVuX3B2X3ByaW50ZigmeGVuZmItPmMueGVuZGV2LCAwLCAiTm8gUUVNVSBjb25zb2xlIGF2YWls YWJsZSIpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgc3VyZmFjZSA9IHFlbXVfY29u c29sZV9zdXJmYWNlKGNvbik7CisgICAgZHcgPSBzdXJmYWNlX3dpZHRoKHN1cmZhY2UpOworICAg IGRoID0gc3VyZmFjZV9oZWlnaHQoc3VyZmFjZSk7CiAKICAgICB0cmFjZV94ZW5mYl9tb3VzZV9l dmVudChvcGFxdWUsIGR4LCBkeSwgZHosIGJ1dHRvbl9zdGF0ZSwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB4ZW5mYi0+YWJzX3BvaW50ZXJfd2FudGVkKTsKQEAgLTM0NCwxMSArMzUyLDYg QEAgc3RhdGljIGludCBpbnB1dF9pbml0aWFsaXNlKHN0cnVjdCBYZW5EZXZpY2UgKnhlbmRldikK ICAgICBzdHJ1Y3QgWGVuSW5wdXQgKmluID0gY29udGFpbmVyX29mKHhlbmRldiwgc3RydWN0IFhl bklucHV0LCBjLnhlbmRldik7CiAgICAgaW50IHJjOwogCi0gICAgaWYgKCFpbi0+Yy5jb24pIHsK LSAgICAgICAgeGVuX3B2X3ByaW50Zih4ZW5kZXYsIDEsICJkcyBub3Qgc2V0ICh5ZXQpXG4iKTsK LSAgICAgICAgcmV0dXJuIC0xOwotICAgIH0KLQogICAgIHJjID0gY29tbW9uX2JpbmQoJmluLT5j KTsKICAgICBpZiAocmMgIT0gMCkKIAlyZXR1cm4gcmM7CkBAIC02MDgsNyArNjExLDcgQEAgc3Rh dGljIGludCB4ZW5mYl9jb25maWd1cmVfZmIoc3RydWN0IFhlbkZCICp4ZW5mYiwgc2l6ZV90IGZi X2xlbl9saW0sCiAgKi8KIHN0YXRpYyB2b2lkIHhlbmZiX2d1ZXN0X2NvcHkoc3RydWN0IFhlbkZC ICp4ZW5mYiwgaW50IHgsIGludCB5LCBpbnQgdywgaW50IGgpCiB7Ci0gICAgRGlzcGxheVN1cmZh Y2UgKnN1cmZhY2UgPSBxZW11X2NvbnNvbGVfc3VyZmFjZSh4ZW5mYi0+Yy5jb24pOworICAgIERp c3BsYXlTdXJmYWNlICpzdXJmYWNlID0gcWVtdV9jb25zb2xlX3N1cmZhY2UoeGVuZmItPmNvbik7 CiAgICAgaW50IGxpbmUsIG9vcHMgPSAwOwogICAgIGludCBicHAgPSBzdXJmYWNlX2JpdHNfcGVy X3BpeGVsKHN1cmZhY2UpOwogICAgIGludCBsaW5lc2l6ZSA9IHN1cmZhY2Vfc3RyaWRlKHN1cmZh Y2UpOwpAQCAtNjQyLDcgKzY0NSw3IEBAIHN0YXRpYyB2b2lkIHhlbmZiX2d1ZXN0X2NvcHkoc3Ry dWN0IFhlbkZCICp4ZW5mYiwgaW50IHgsIGludCB5LCBpbnQgdywgaW50IGgpCiAgICAgICAgIHhl bl9wdl9wcmludGYoJnhlbmZiLT5jLnhlbmRldiwgMCwgIiVzOiBvb3BzOiBjb252ZXJ0ICVkIC0+ ICVkIGJwcD9cbiIsCiAgICAgICAgICAgICAgICAgICAgICAgX19GVU5DVElPTl9fLCB4ZW5mYi0+ ZGVwdGgsIGJwcCk7CiAKLSAgICBkcHlfZ2Z4X3VwZGF0ZSh4ZW5mYi0+Yy5jb24sIHgsIHksIHcs IGgpOworICAgIGRweV9nZnhfdXBkYXRlKHhlbmZiLT5jb24sIHgsIHksIHcsIGgpOwogfQogCiAj aWZkZWYgWEVORkJfVFlQRV9SRUZSRVNIX1BFUklPRApAQCAtNzI4LDcgKzczMSw3IEBAIHN0YXRp YyB2b2lkIHhlbmZiX3VwZGF0ZSh2b2lkICpvcGFxdWUpCiAgICAgICAgICAgICBzdXJmYWNlID0g cWVtdV9jcmVhdGVfZGlzcGxheXN1cmZhY2UoeGVuZmItPndpZHRoLCB4ZW5mYi0+aGVpZ2h0KTsK ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9Ci0gICAgICAgIGRweV9nZnhfcmVwbGFjZV9z dXJmYWNlKHhlbmZiLT5jLmNvbiwgc3VyZmFjZSk7CisgICAgICAgIGRweV9nZnhfcmVwbGFjZV9z dXJmYWNlKHhlbmZiLT5jb24sIHN1cmZhY2UpOwogICAgICAgICB4ZW5fcHZfcHJpbnRmKCZ4ZW5m Yi0+Yy54ZW5kZXYsIDEsCiAgICAgICAgICAgICAgICAgICAgICAgInVwZGF0ZTogcmVzaXppbmc6 ICVkeCVkIEAgJWQgYnBwJXNcbiIsCiAgICAgICAgICAgICAgICAgICAgICAgeGVuZmItPndpZHRo LCB4ZW5mYi0+aGVpZ2h0LCB4ZW5mYi0+ZGVwdGgsCkBAIC04NzcsMTYgKzg4MCw3IEBAIHN0YXRp YyBpbnQgZmJfaW5pdGlhbGlzZShzdHJ1Y3QgWGVuRGV2aWNlICp4ZW5kZXYpCiAgICAgaWYgKHJj ICE9IDApCiAJcmV0dXJuIHJjOwogCi0jaWYgMCAgLyogaGFuZGxlZCBpbiB4ZW5faW5pdF9kaXNw bGF5KCkgZm9yIG5vdyAqLwotICAgIGlmICghZmItPmhhdmVfY29uc29sZSkgewotICAgICAgICBm Yi0+Yy5kcyA9IGdyYXBoaWNfY29uc29sZV9pbml0KHhlbmZiX3VwZGF0ZSwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB4ZW5mYl9pbnZhbGlkYXRlLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE5VTEwsCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgTlVMTCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBmYik7Ci0gICAgICAgIGZiLT5oYXZlX2NvbnNvbGUgPSAxOwotICAgIH0KLSNl bmRpZgorICAgIGZiLT5jb24gPSBncmFwaGljX2NvbnNvbGVfaW5pdChOVUxMLCAwLCAmeGVuZmJf b3BzLCBmYik7CiAKICAgICBpZiAoeGVuc3RvcmVfcmVhZF9mZV9pbnQoeGVuZGV2LCAiZmVhdHVy ZS11cGRhdGUiLCAmZmItPmZlYXR1cmVfdXBkYXRlKSA9PSAtMSkKIAlmYi0+ZmVhdHVyZV91cGRh dGUgPSAwOwpAQCAtOTcyLDQyICs5NjYsMyBAQCBzdGF0aWMgY29uc3QgR3JhcGhpY0h3T3BzIHhl bmZiX29wcyA9IHsKICAgICAuZ2Z4X3VwZGF0ZSAgPSB4ZW5mYl91cGRhdGUsCiAgICAgLnVwZGF0 ZV9pbnRlcnZhbCA9IHhlbmZiX3VwZGF0ZV9pbnRlcnZhbCwKIH07Ci0KLS8qCi0gKiBGSVhNRS9U T0RPOiBLaWxsIHRoaXMuCi0gKiBUZW1wb3JhcnkgbmVlZGVkIHdoaWxlIERpc3BsYXlTdGF0ZSBy ZW9yZ2FuaXphdGlvbiBpcyBpbiBmbGlnaHQuCi0gKi8KLXZvaWQgeGVuX2luaXRfZGlzcGxheShp bnQgZG9taWQpCi17Ci0gICAgc3RydWN0IFhlbkRldmljZSAqeGZiLCAqeGluOwotICAgIHN0cnVj dCBYZW5GQiAqZmI7Ci0gICAgc3RydWN0IFhlbklucHV0ICppbjsKLSAgICBpbnQgaSA9IDA7Ci0K LXdhaXRfbW9yZToKLSAgICBpKys7Ci0gICAgbWFpbl9sb29wX3dhaXQodHJ1ZSk7Ci0gICAgeGZi ID0geGVuX3B2X2ZpbmRfeGVuZGV2KCJ2ZmIiLCBkb21pZCwgMCk7Ci0gICAgeGluID0geGVuX3B2 X2ZpbmRfeGVuZGV2KCJ2a2JkIiwgZG9taWQsIDApOwotICAgIGlmICgheGZiIHx8ICF4aW4pIHsK LSAgICAgICAgaWYgKGkgPCAyNTYpIHsKLSAgICAgICAgICAgIHVzbGVlcCgxMDAwMCk7Ci0gICAg ICAgICAgICBnb3RvIHdhaXRfbW9yZTsKLSAgICAgICAgfQotICAgICAgICB4ZW5fcHZfcHJpbnRm KE5VTEwsIDEsICJkaXNwbGF5c3RhdGUgc2V0dXAgZmFpbGVkXG4iKTsKLSAgICAgICAgcmV0dXJu OwotICAgIH0KLQotICAgIC8qIHZmYiAqLwotICAgIGZiID0gY29udGFpbmVyX29mKHhmYiwgc3Ry dWN0IFhlbkZCLCBjLnhlbmRldik7Ci0gICAgZmItPmMuY29uID0gZ3JhcGhpY19jb25zb2xlX2lu aXQoTlVMTCwgMCwgJnhlbmZiX29wcywgZmIpOwotICAgIGZiLT5oYXZlX2NvbnNvbGUgPSAxOwot Ci0gICAgLyogdmtiZCAqLwotICAgIGluID0gY29udGFpbmVyX29mKHhpbiwgc3RydWN0IFhlbklu cHV0LCBjLnhlbmRldik7Ci0gICAgaW4tPmMuY29uID0gZmItPmMuY29uOwotCi0gICAgLyogcmV0 cnkgLT5pbml0KCkgKi8KLSAgICB4ZW5fYmVfY2hlY2tfc3RhdGUoeGluKTsKLSAgICB4ZW5fYmVf Y2hlY2tfc3RhdGUoeGZiKTsKLX0KZGlmZiAtLWdpdCBhL2h3L3hlbnB2L3hlbl9tYWNoaW5lX3B2 LmMgYi9ody94ZW5wdi94ZW5fbWFjaGluZV9wdi5jCmluZGV4IDc5YWVmNGUuLjMxZDJmMjUgMTAw NjQ0Ci0tLSBhL2h3L3hlbnB2L3hlbl9tYWNoaW5lX3B2LmMKKysrIGIvaHcveGVucHYveGVuX21h Y2hpbmVfcHYuYwpAQCAtOTQsOSArOTQsNiBAQCBzdGF0aWMgdm9pZCB4ZW5faW5pdF9wdihNYWNo aW5lU3RhdGUgKm1hY2hpbmUpCiAKICAgICAvKiBjb25maWcgY2xlYW51cCBob29rICovCiAgICAg YXRleGl0KHhlbl9jb25maWdfY2xlYW51cCk7Ci0KLSAgICAvKiBzZXR1cCBmcmFtZWJ1ZmZlciAq LwotICAgIHhlbl9pbml0X2Rpc3BsYXkoeGVuX2RvbWlkKTsKIH0KIAogc3RhdGljIHZvaWQgeGVu cHZfbWFjaGluZV9pbml0KE1hY2hpbmVDbGFzcyAqbWMpCmRpZmYgLS1naXQgYS9pbmNsdWRlL2h3 L3hlbi94ZW5fYmFja2VuZC5oIGIvaW5jbHVkZS9ody94ZW4veGVuX2JhY2tlbmQuaAppbmRleCA4 NTJjMmVhLi44YTZmYmNiIDEwMDY0NAotLS0gYS9pbmNsdWRlL2h3L3hlbi94ZW5fYmFja2VuZC5o CisrKyBiL2luY2x1ZGUvaHcveGVuL3hlbl9iYWNrZW5kLmgKQEAgLTU1LDggKzU1LDYgQEAgZXh0 ZXJuIHN0cnVjdCBYZW5EZXZPcHMgeGVuX25ldGRldl9vcHM7ICAgICAgIC8qIHhlbl9uaWMuYyAg ICAgICAgICovCiBleHRlcm4gc3RydWN0IFhlbkRldk9wcyB4ZW5fdXNiX29wczsgICAgICAgICAg LyogeGVuLXVzYi5jICAgICAgICAgKi8KICNlbmRpZgogCi12b2lkIHhlbl9pbml0X2Rpc3BsYXko aW50IGRvbWlkKTsKLQogLyogY29uZmlndXJhdGlvbiAoYWthIHhlbmJ1cyBzZXR1cCkgKi8KIHZv aWQgeGVuX2NvbmZpZ19jbGVhbnVwKHZvaWQpOwogaW50IHhlbl9jb25maWdfZGV2X2JsayhEcml2 ZUluZm8gKmRpc2spOwotLSAKMS45LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54 ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK