From: Gerd Hoffmann Subject: [PATCH] qxl: rewrite framebuffer support Date: Tue, 5 May 2015 13:52:49 +0200 Message-ID: <1430826769-302-1-git-send-email-kraxel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTP id 878766E0AE for ; Tue, 5 May 2015 04:53:02 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: open list List-Id: dri-devel@lists.freedesktop.org Q29tcGxldGVseSBkaWZmZXJlbnQgYXBwcm9hY2g6ICBJbnN0ZWFkIG9mIGVuY29kaW5nIGVhY2gg YW5kIGV2ZXJ5CmZyYW1lYnVmZmVyIHVwZGF0ZSBhcyBzcGljZSBvcGVyYXRpb24gc2ltcGx5IHVw ZGF0ZSB0aGUgc2hhZG93CmZyYW1lYnVmZmVyIGFuZCBtYWludGFpbiBhIGRpcnR5IHJlY3Rhbmds ZS4gIEFsc28gc2NoZWR1bGUgYSB3b3JrZXIKdG8gcHVzaCBhbiB1cGRhdGUgZm9yIHRoZSBkaXJ0 eSByZWN0YW5nbGUgYXMgc3BpY2Ugb3BlcmF0aW9uLiAgVXN1YWxseQphIGJ1bmNoIG9mIGRpcnR5 IHJlY3RhbmdsZSB1cGRhdGVzIGFyZSBjb2xsZWN0ZWQgYmVmb3JlIHRoZSB3b3JrZXIKYWN0dWFs bHkgcnVucy4KCldoYXQgY2hhbmdlczogIFVwZGF0ZXMgZ2V0IGJhdGNoZWQgbm93LiAgSW5zdGVh ZCBvZiBzZW5kaW5nIHRvbnMgb2YKc21hbGwgdXBkYXRlcyBhIGZldyBsYXJnZSBvbmVzIGFyZSBz ZW50LiAgV2hlbiB0aGUgc2FtZSByZWdpb24gaXMKdXBkYXRlZCBtdWx0aXBsZSB0aW1lcyB3aXRo aW4gYSBzaG9ydCB0aW1lZnJhbWUgKHNjcm9sbGluZyBtdWx0aXBsZQpsaW5lcyBmb3IgZXhhbXBs ZSkgd2Ugc2VuZCBhIHNpbmdsZSB1cGRhdGUgb25seS4gIFNwaWNlIHNlcnZlciBoYXMgYW4KZWFz aWVyIGpvYiBub3c6ICBUaGUgZGVwZW5kZW5jeSB0cmVlIGZvciBkaXNwbGF5IG9wZXJhdGlvbnMg d2hpY2ggc3BpY2UKc2VydmVyIG1haW50YWlucyBmb3IgbGF6eSByZW5kZXJpbmcgaXMgYWxvdCBz bWFsbGVyIG5vdy4gIFNwaWNlIHNlcnZlcidzCmltYWdlIGNvbXByZXNzaW9uIHByb2JhYmx5IHdv cmtzIGJldHRlciB0b28gd2l0aCB0aGUgbGFyZ2VyIGltYWdlIGJsaXRzLgoKTmV0IGVmZmVjdDog IGZyYW1lYnVmZmVyIGNvbnNvbGUgQCBxeGxkcm1mYiBpcyBhbiBvcmRlciBvZiBtYWduaXR1ZGUK ZmFzdGVyIG5vdy4KClNpZ25lZC1vZmYtYnk6IEdlcmQgSG9mZm1hbm4gPGtyYXhlbEByZWRoYXQu Y29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9xeGwvcXhsX2ZiLmMgfCAyNzUgKysrKysrKysrLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDU3IGluc2Vy dGlvbnMoKyksIDIxOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v cXhsL3F4bF9mYi5jIGIvZHJpdmVycy9ncHUvZHJtL3F4bC9xeGxfZmIuYwppbmRleCBmNzc4YzBl Li42YjZlNTdlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vcXhsL3F4bF9mYi5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9xeGwvcXhsX2ZiLmMKQEAgLTM3LDIxICszNyw2IEBACiAKICNkZWZp bmUgUVhMX0RJUlRZX0RFTEFZIChIWiAvIDMwKQogCi0jZGVmaW5lIFFYTF9GQl9PUF9GSUxMUkVD VCAxCi0jZGVmaW5lIFFYTF9GQl9PUF9DT1BZQVJFQSAyCi0jZGVmaW5lIFFYTF9GQl9PUF9JTUFH RUJMSVQgMwotCi1zdHJ1Y3QgcXhsX2ZiX29wIHsKLQlzdHJ1Y3QgbGlzdF9oZWFkIGhlYWQ7Ci0J aW50IG9wX3R5cGU7Ci0JdW5pb24gewotCQlzdHJ1Y3QgZmJfZmlsbHJlY3QgZnI7Ci0JCXN0cnVj dCBmYl9jb3B5YXJlYSBjYTsKLQkJc3RydWN0IGZiX2ltYWdlIGliOwotCX0gb3A7Ci0Jdm9pZCAq aW1nX2RhdGE7Ci19OwotCiBzdHJ1Y3QgcXhsX2ZiZGV2IHsKIAlzdHJ1Y3QgZHJtX2ZiX2hlbHBl ciBoZWxwZXI7CiAJc3RydWN0IHF4bF9mcmFtZWJ1ZmZlcglxZmI7CkBAIC02Niw3ICs1MSw2IEBA IHN0cnVjdCBxeGxfZmJkZXYgewogCS8qIGRpcnR5IG1lbW9yeSBsb2dnaW5nICovCiAJc3RydWN0 IHsKIAkJc3BpbmxvY2tfdCBsb2NrOwotCQlib29sIGFjdGl2ZTsKIAkJdW5zaWduZWQgeDE7CiAJ CXVuc2lnbmVkIHkxOwogCQl1bnNpZ25lZCB4MjsKQEAgLTEwNSwyMyArODksMzMgQEAgc3RhdGlj IHZvaWQgcXhsX2ZiX2RpcnR5X2ZsdXNoKHN0cnVjdCBmYl9pbmZvICppbmZvKQogCXN0cnVjdCBx eGxfZGV2aWNlICpxZGV2ID0gcWZiZGV2LT5xZGV2OwogCXN0cnVjdCBxeGxfZmJfaW1hZ2UgcXhs X2ZiX2ltYWdlOwogCXN0cnVjdCBmYl9pbWFnZSAqaW1hZ2UgPSAmcXhsX2ZiX2ltYWdlLmZiX2lt YWdlOworCXVuc2lnbmVkIGxvbmcgZmxhZ3M7CiAJdTMyIHgxLCB4MiwgeTEsIHkyOwogCiAJLyog VE9ETzogaGFyZCBjb2RpbmcgMzIgYnBwICovCiAJaW50IHN0cmlkZSA9IHFmYmRldi0+cWZiLmJh c2UucGl0Y2hlc1swXTsKIAorCXNwaW5fbG9ja19pcnFzYXZlKCZxZmJkZXYtPmRpcnR5LmxvY2ss IGZsYWdzKTsKKwogCXgxID0gcWZiZGV2LT5kaXJ0eS54MTsKIAl4MiA9IHFmYmRldi0+ZGlydHku eDI7CiAJeTEgPSBxZmJkZXYtPmRpcnR5LnkxOwogCXkyID0gcWZiZGV2LT5kaXJ0eS55MjsKKwlx ZmJkZXYtPmRpcnR5LngxID0gMDsKKwlxZmJkZXYtPmRpcnR5LngyID0gMDsKKwlxZmJkZXYtPmRp cnR5LnkxID0gMDsKKwlxZmJkZXYtPmRpcnR5LnkyID0gMDsKKworCXNwaW5fdW5sb2NrX2lycXJl c3RvcmUoJnFmYmRldi0+ZGlydHkubG9jaywgZmxhZ3MpOworCiAJLyoKIAkgKiB3ZSBhcmUgdXNp bmcgYSBzaGFkb3cgZHJhdyBidWZmZXIsIGF0IHFkZXYtPnN1cmZhY2UwX3NoYWRvdwogCSAqLwog CXF4bF9pb19sb2cocWRldiwgImRpcnR5IHhbJWQsICVkXSwgeVslZCwgJWRdIiwgeDEsIHgyLCB5 MSwgeTIpOwogCWltYWdlLT5keCA9IHgxOwogCWltYWdlLT5keSA9IHkxOwotCWltYWdlLT53aWR0 aCA9IHgyIC0geDE7Ci0JaW1hZ2UtPmhlaWdodCA9IHkyIC0geTE7CisJaW1hZ2UtPndpZHRoID0g eDIgLSB4MSArIDE7CisJaW1hZ2UtPmhlaWdodCA9IHkyIC0geTEgKyAxOwogCWltYWdlLT5mZ19j b2xvciA9IDB4ZmZmZmZmZmY7IC8qIHVudXNlZCwganVzdCB0byBhdm9pZCB1bmluaXRpYWxpemVk CiAJCQkJCSB3YXJuaW5ncyAqLwogCWltYWdlLT5iZ19jb2xvciA9IDA7CkBAIC0xMzYsMTAgKzEz MCwzNyBAQCBzdGF0aWMgdm9pZCBxeGxfZmJfZGlydHlfZmx1c2goc3RydWN0IGZiX2luZm8gKmlu Zm8pCiAKIAlxeGxfZmJfaW1hZ2VfaW5pdCgmcXhsX2ZiX2ltYWdlLCBxZGV2LCBpbmZvLCBOVUxM KTsKIAlxeGxfZHJhd19vcGFxdWVfZmIoJnF4bF9mYl9pbWFnZSwgc3RyaWRlKTsKLQlxZmJkZXYt PmRpcnR5LngxID0gMDsKLQlxZmJkZXYtPmRpcnR5LngyID0gMDsKLQlxZmJkZXYtPmRpcnR5Lnkx ID0gMDsKLQlxZmJkZXYtPmRpcnR5LnkyID0gMDsKK30KKworc3RhdGljIHZvaWQgcXhsX2RpcnR5 X3VwZGF0ZShzdHJ1Y3QgcXhsX2ZiZGV2ICpxZmJkZXYsCisJCQkgICAgIGludCB4LCBpbnQgeSwg aW50IHdpZHRoLCBpbnQgaGVpZ2h0KQoreworCXN0cnVjdCBxeGxfZGV2aWNlICpxZGV2ID0gcWZi ZGV2LT5xZGV2OworCXVuc2lnbmVkIGxvbmcgZmxhZ3M7CisJaW50IHgyLCB5MjsKKworCXgyID0g eCArIHdpZHRoIC0gMTsKKwl5MiA9IHkgKyBoZWlnaHQgLSAxOworCisJc3Bpbl9sb2NrX2lycXNh dmUoJnFmYmRldi0+ZGlydHkubG9jaywgZmxhZ3MpOworCisJaWYgKHFmYmRldi0+ZGlydHkueTEg PCB5KQorCQl5ID0gcWZiZGV2LT5kaXJ0eS55MTsKKwlpZiAocWZiZGV2LT5kaXJ0eS55MiA+IHky KQorCQl5MiA9IHFmYmRldi0+ZGlydHkueTI7CisJaWYgKHFmYmRldi0+ZGlydHkueDEgPCB4KQor CQl4ID0gcWZiZGV2LT5kaXJ0eS54MTsKKwlpZiAocWZiZGV2LT5kaXJ0eS54MiA+IHgyKQorCQl4 MiA9IHFmYmRldi0+ZGlydHkueDI7CisKKwlxZmJkZXYtPmRpcnR5LngxID0geDsKKwlxZmJkZXYt PmRpcnR5LngyID0geDI7CisJcWZiZGV2LT5kaXJ0eS55MSA9IHk7CisJcWZiZGV2LT5kaXJ0eS55 MiA9IHkyOworCisJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmcWZiZGV2LT5kaXJ0eS5sb2NrLCBm bGFncyk7CisKKwlzY2hlZHVsZV93b3JrKCZxZGV2LT5mYl93b3JrKTsKIH0KIAogc3RhdGljIHZv aWQgcXhsX2RlZmVycmVkX2lvKHN0cnVjdCBmYl9pbmZvICppbmZvLApAQCAtMTYyLDIzNCArMTgz LDUxIEBAIHN0YXRpYyB2b2lkIHF4bF9kZWZlcnJlZF9pbyhzdHJ1Y3QgZmJfaW5mbyAqaW5mbywK IAlpZiAobWluIDwgbWF4KSB7CiAJCXkxID0gbWluIC8gaW5mby0+Zml4LmxpbmVfbGVuZ3RoOwog CQl5MiA9IChtYXggLyBpbmZvLT5maXgubGluZV9sZW5ndGgpICsgMTsKLQotCQkvKiBUT0RPOiBh ZGQgc3BpbiBsb2NrPyAqLwotCQkvKiBzcGluX2xvY2tfaXJxc2F2ZSgmcWZiZGV2LT5kaXJ0eS5s b2NrLCBmbGFncyk7ICovCi0JCXFmYmRldi0+ZGlydHkueDEgPSAwOwotCQlxZmJkZXYtPmRpcnR5 LnkxID0geTE7Ci0JCXFmYmRldi0+ZGlydHkueDIgPSBpbmZvLT52YXIueHJlczsKLQkJcWZiZGV2 LT5kaXJ0eS55MiA9IHkyOwotCQkvKiBzcGluX3VubG9ja19pcnFyZXN0b3JlKCZxZmJkZXYtPmRp cnR5LmxvY2ssIGZsYWdzKTsgKi8KKwkJcXhsX2RpcnR5X3VwZGF0ZShxZmJkZXYsIDAsIHkxLCBp bmZvLT52YXIueHJlcywgeTIgLSB5MSk7CiAJfQotCi0JcXhsX2ZiX2RpcnR5X2ZsdXNoKGluZm8p OwogfTsKIAotCiBzdGF0aWMgc3RydWN0IGZiX2RlZmVycmVkX2lvIHF4bF9kZWZpbyA9IHsKIAku ZGVsYXkJCT0gUVhMX0RJUlRZX0RFTEFZLAogCS5kZWZlcnJlZF9pbwk9IHF4bF9kZWZlcnJlZF9p bywKIH07CiAKLXN0YXRpYyB2b2lkIHF4bF9mYl9kZWxheWVkX2ZpbGxyZWN0KHN0cnVjdCBxeGxf ZmJkZXYgKnFmYmRldiwKLQkJCQkgICAgY29uc3Qgc3RydWN0IGZiX2ZpbGxyZWN0ICpmYl9yZWN0 KQotewotCXN0cnVjdCBxeGxfZmJfb3AgKm9wOwotCXVuc2lnbmVkIGxvbmcgZmxhZ3M7Ci0KLQlv cCA9IGttYWxsb2Moc2l6ZW9mKHN0cnVjdCBxeGxfZmJfb3ApLCBHRlBfQVRPTUlDIHwgX19HRlBf Tk9XQVJOKTsKLQlpZiAoIW9wKQotCQlyZXR1cm47Ci0KLQlvcC0+b3AuZnIgPSAqZmJfcmVjdDsK LQlvcC0+aW1nX2RhdGEgPSBOVUxMOwotCW9wLT5vcF90eXBlID0gUVhMX0ZCX09QX0ZJTExSRUNU OwotCi0Jc3Bpbl9sb2NrX2lycXNhdmUoJnFmYmRldi0+ZGVsYXllZF9vcHNfbG9jaywgZmxhZ3Mp OwotCWxpc3RfYWRkX3RhaWwoJm9wLT5oZWFkLCAmcWZiZGV2LT5kZWxheWVkX29wcyk7Ci0Jc3Bp bl91bmxvY2tfaXJxcmVzdG9yZSgmcWZiZGV2LT5kZWxheWVkX29wc19sb2NrLCBmbGFncyk7Ci19 Ci0KLXN0YXRpYyB2b2lkIHF4bF9mYl9kZWxheWVkX2NvcHlhcmVhKHN0cnVjdCBxeGxfZmJkZXYg KnFmYmRldiwKLQkJCQkgICAgY29uc3Qgc3RydWN0IGZiX2NvcHlhcmVhICpmYl9jb3B5KQotewot CXN0cnVjdCBxeGxfZmJfb3AgKm9wOwotCXVuc2lnbmVkIGxvbmcgZmxhZ3M7Ci0KLQlvcCA9IGtt YWxsb2Moc2l6ZW9mKHN0cnVjdCBxeGxfZmJfb3ApLCBHRlBfQVRPTUlDIHwgX19HRlBfTk9XQVJO KTsKLQlpZiAoIW9wKQotCQlyZXR1cm47Ci0KLQlvcC0+b3AuY2EgPSAqZmJfY29weTsKLQlvcC0+ aW1nX2RhdGEgPSBOVUxMOwotCW9wLT5vcF90eXBlID0gUVhMX0ZCX09QX0NPUFlBUkVBOwotCi0J c3Bpbl9sb2NrX2lycXNhdmUoJnFmYmRldi0+ZGVsYXllZF9vcHNfbG9jaywgZmxhZ3MpOwotCWxp c3RfYWRkX3RhaWwoJm9wLT5oZWFkLCAmcWZiZGV2LT5kZWxheWVkX29wcyk7Ci0Jc3Bpbl91bmxv Y2tfaXJxcmVzdG9yZSgmcWZiZGV2LT5kZWxheWVkX29wc19sb2NrLCBmbGFncyk7Ci19Ci0KLXN0 YXRpYyB2b2lkIHF4bF9mYl9kZWxheWVkX2ltYWdlYmxpdChzdHJ1Y3QgcXhsX2ZiZGV2ICpxZmJk ZXYsCi0JCQkJICAgICBjb25zdCBzdHJ1Y3QgZmJfaW1hZ2UgKmZiX2ltYWdlKQotewotCXN0cnVj dCBxeGxfZmJfb3AgKm9wOwotCXVuc2lnbmVkIGxvbmcgZmxhZ3M7Ci0JdWludDMyX3Qgc2l6ZSA9 IGZiX2ltYWdlLT53aWR0aCAqIGZiX2ltYWdlLT5oZWlnaHQgKiAoZmJfaW1hZ2UtPmRlcHRoID49 IDggPyBmYl9pbWFnZS0+ZGVwdGggLyA4IDogMSk7Ci0KLQlvcCA9IGttYWxsb2Moc2l6ZW9mKHN0 cnVjdCBxeGxfZmJfb3ApICsgc2l6ZSwgR0ZQX0FUT01JQyB8IF9fR0ZQX05PV0FSTik7Ci0JaWYg KCFvcCkKLQkJcmV0dXJuOwotCi0Jb3AtPm9wLmliID0gKmZiX2ltYWdlOwotCW9wLT5pbWdfZGF0 YSA9ICh2b2lkICopKG9wICsgMSk7Ci0Jb3AtPm9wX3R5cGUgPSBRWExfRkJfT1BfSU1BR0VCTElU OwotCi0JbWVtY3B5KG9wLT5pbWdfZGF0YSwgZmJfaW1hZ2UtPmRhdGEsIHNpemUpOwotCi0Jb3At Pm9wLmliLmRhdGEgPSBvcC0+aW1nX2RhdGE7Ci0Jc3Bpbl9sb2NrX2lycXNhdmUoJnFmYmRldi0+ ZGVsYXllZF9vcHNfbG9jaywgZmxhZ3MpOwotCWxpc3RfYWRkX3RhaWwoJm9wLT5oZWFkLCAmcWZi ZGV2LT5kZWxheWVkX29wcyk7Ci0Jc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmcWZiZGV2LT5kZWxh eWVkX29wc19sb2NrLCBmbGFncyk7Ci19Ci0KLXN0YXRpYyB2b2lkIHF4bF9mYl9maWxscmVjdF9p bnRlcm5hbChzdHJ1Y3QgZmJfaW5mbyAqaW5mbywKLQkJCQkgICAgIGNvbnN0IHN0cnVjdCBmYl9m aWxscmVjdCAqZmJfcmVjdCkKLXsKLQlzdHJ1Y3QgcXhsX2ZiZGV2ICpxZmJkZXYgPSBpbmZvLT5w YXI7Ci0Jc3RydWN0IHF4bF9kZXZpY2UgKnFkZXYgPSBxZmJkZXYtPnFkZXY7Ci0Jc3RydWN0IHF4 bF9yZWN0IHJlY3Q7Ci0JdWludDMyX3QgY29sb3I7Ci0JaW50IHggPSBmYl9yZWN0LT5keDsKLQlp bnQgeSA9IGZiX3JlY3QtPmR5OwotCWludCB3aWR0aCA9IGZiX3JlY3QtPndpZHRoOwotCWludCBo ZWlnaHQgPSBmYl9yZWN0LT5oZWlnaHQ7Ci0JdWludDE2X3Qgcm9wOwotCXN0cnVjdCBxeGxfZHJh d19maWxsIHF4bF9kcmF3X2ZpbGxfcmVjOwotCi0JaWYgKGluZm8tPmZpeC52aXN1YWwgPT0gRkJf VklTVUFMX1RSVUVDT0xPUiB8fAotCSAgICBpbmZvLT5maXgudmlzdWFsID09IEZCX1ZJU1VBTF9E SVJFQ1RDT0xPUikKLQkJY29sb3IgPSAoKHUzMiAqKSAoaW5mby0+cHNldWRvX3BhbGV0dGUpKVtm Yl9yZWN0LT5jb2xvcl07Ci0JZWxzZQotCQljb2xvciA9IGZiX3JlY3QtPmNvbG9yOwotCXJlY3Qu bGVmdCA9IHg7Ci0JcmVjdC5yaWdodCA9IHggKyB3aWR0aDsKLQlyZWN0LnRvcCA9IHk7Ci0JcmVj dC5ib3R0b20gPSB5ICsgaGVpZ2h0OwotCXN3aXRjaCAoZmJfcmVjdC0+cm9wKSB7Ci0JY2FzZSBS T1BfWE9SOgotCQlyb3AgPSBTUElDRV9ST1BEX09QX1hPUjsKLQkJYnJlYWs7Ci0JY2FzZSBST1Bf Q09QWToKLQkJcm9wID0gU1BJQ0VfUk9QRF9PUF9QVVQ7Ci0JCWJyZWFrOwotCWRlZmF1bHQ6Ci0J CXByX2VycigicXhsX2ZiX2ZpbGxyZWN0KCk6IHVua25vd24gcm9wLCAiCi0JCSAgICAgICAiZGVm YXVsdGluZyB0byBTUElDRV9ST1BEX09QX1BVVFxuIik7Ci0JCXJvcCA9IFNQSUNFX1JPUERfT1Bf UFVUOwotCX0KLQlxeGxfZHJhd19maWxsX3JlYy5xZGV2ID0gcWRldjsKLQlxeGxfZHJhd19maWxs X3JlYy5yZWN0ID0gcmVjdDsKLQlxeGxfZHJhd19maWxsX3JlYy5jb2xvciA9IGNvbG9yOwotCXF4 bF9kcmF3X2ZpbGxfcmVjLnJvcCA9IHJvcDsKLQotCXF4bF9kcmF3X2ZpbGwoJnF4bF9kcmF3X2Zp bGxfcmVjKTsKLX0KLQogc3RhdGljIHZvaWQgcXhsX2ZiX2ZpbGxyZWN0KHN0cnVjdCBmYl9pbmZv ICppbmZvLAotCQkJICAgIGNvbnN0IHN0cnVjdCBmYl9maWxscmVjdCAqZmJfcmVjdCkKKwkJCSAg ICBjb25zdCBzdHJ1Y3QgZmJfZmlsbHJlY3QgKnJlY3QpCiB7CiAJc3RydWN0IHF4bF9mYmRldiAq cWZiZGV2ID0gaW5mby0+cGFyOwotCXN0cnVjdCBxeGxfZGV2aWNlICpxZGV2ID0gcWZiZGV2LT5x ZGV2OwogCi0JaWYgKCFkcm1fY2FuX3NsZWVwKCkpIHsKLQkJcXhsX2ZiX2RlbGF5ZWRfZmlsbHJl Y3QocWZiZGV2LCBmYl9yZWN0KTsKLQkJc2NoZWR1bGVfd29yaygmcWRldi0+ZmJfd29yayk7Ci0J CXJldHVybjsKLQl9Ci0JLyogbWFrZSBzdXJlIGFueSBwcmV2aW91cyB3b3JrIGlzIGRvbmUgKi8K LQlmbHVzaF93b3JrKCZxZGV2LT5mYl93b3JrKTsKLQlxeGxfZmJfZmlsbHJlY3RfaW50ZXJuYWwo aW5mbywgZmJfcmVjdCk7Ci19Ci0KLXN0YXRpYyB2b2lkIHF4bF9mYl9jb3B5YXJlYV9pbnRlcm5h bChzdHJ1Y3QgZmJfaW5mbyAqaW5mbywKLQkJCQkgICAgIGNvbnN0IHN0cnVjdCBmYl9jb3B5YXJl YSAqcmVnaW9uKQotewotCXN0cnVjdCBxeGxfZmJkZXYgKnFmYmRldiA9IGluZm8tPnBhcjsKLQot CXF4bF9kcmF3X2NvcHlhcmVhKHFmYmRldi0+cWRldiwKLQkJCSAgcmVnaW9uLT53aWR0aCwgcmVn aW9uLT5oZWlnaHQsCi0JCQkgIHJlZ2lvbi0+c3gsIHJlZ2lvbi0+c3ksCi0JCQkgIHJlZ2lvbi0+ ZHgsIHJlZ2lvbi0+ZHkpOworCXN5c19maWxscmVjdChpbmZvLCByZWN0KTsKKwlxeGxfZGlydHlf dXBkYXRlKHFmYmRldiwgcmVjdC0+ZHgsIHJlY3QtPmR5LCByZWN0LT53aWR0aCwKKwkJCSByZWN0 LT5oZWlnaHQpOwogfQogCiBzdGF0aWMgdm9pZCBxeGxfZmJfY29weWFyZWEoc3RydWN0IGZiX2lu Zm8gKmluZm8sCi0JCQkgICAgY29uc3Qgc3RydWN0IGZiX2NvcHlhcmVhICpyZWdpb24pCisJCQkg ICAgY29uc3Qgc3RydWN0IGZiX2NvcHlhcmVhICphcmVhKQogewogCXN0cnVjdCBxeGxfZmJkZXYg KnFmYmRldiA9IGluZm8tPnBhcjsKLQlzdHJ1Y3QgcXhsX2RldmljZSAqcWRldiA9IHFmYmRldi0+ cWRldjsKIAotCWlmICghZHJtX2Nhbl9zbGVlcCgpKSB7Ci0JCXF4bF9mYl9kZWxheWVkX2NvcHlh cmVhKHFmYmRldiwgcmVnaW9uKTsKLQkJc2NoZWR1bGVfd29yaygmcWRldi0+ZmJfd29yayk7Ci0J CXJldHVybjsKLQl9Ci0JLyogbWFrZSBzdXJlIGFueSBwcmV2aW91cyB3b3JrIGlzIGRvbmUgKi8K LQlmbHVzaF93b3JrKCZxZGV2LT5mYl93b3JrKTsKLQlxeGxfZmJfY29weWFyZWFfaW50ZXJuYWwo aW5mbywgcmVnaW9uKTsKLX0KLQotc3RhdGljIHZvaWQgcXhsX2ZiX2ltYWdlYmxpdF9zYWZlKHN0 cnVjdCBxeGxfZmJfaW1hZ2UgKnF4bF9mYl9pbWFnZSkKLXsKLQlxeGxfZHJhd19vcGFxdWVfZmIo cXhsX2ZiX2ltYWdlLCAwKTsKLX0KLQotc3RhdGljIHZvaWQgcXhsX2ZiX2ltYWdlYmxpdF9pbnRl cm5hbChzdHJ1Y3QgZmJfaW5mbyAqaW5mbywKLQkJCQkgICAgICBjb25zdCBzdHJ1Y3QgZmJfaW1h Z2UgKmltYWdlKQotewotCXN0cnVjdCBxeGxfZmJkZXYgKnFmYmRldiA9IGluZm8tPnBhcjsKLQlz dHJ1Y3QgcXhsX2ZiX2ltYWdlIHF4bF9mYl9pbWFnZTsKLQotCS8qIGVuc3VyZSBwcm9wZXIgb3Jk ZXIgIHJlbmRlcmluZyBvcGVyYXRpb25zIC0gVE9ETzogbXVzdCBkbyB0aGlzCi0JICogZm9yIGV2 ZXJ5dGhpbmcuICovCi0JcXhsX2ZiX2ltYWdlX2luaXQoJnF4bF9mYl9pbWFnZSwgcWZiZGV2LT5x ZGV2LCBpbmZvLCBpbWFnZSk7Ci0JcXhsX2ZiX2ltYWdlYmxpdF9zYWZlKCZxeGxfZmJfaW1hZ2Up OworCXN5c19jb3B5YXJlYShpbmZvLCBhcmVhKTsKKwlxeGxfZGlydHlfdXBkYXRlKHFmYmRldiwg YXJlYS0+ZHgsIGFyZWEtPmR5LCBhcmVhLT53aWR0aCwKKwkJCSBhcmVhLT5oZWlnaHQpOwogfQog CiBzdGF0aWMgdm9pZCBxeGxfZmJfaW1hZ2VibGl0KHN0cnVjdCBmYl9pbmZvICppbmZvLAogCQkJ ICAgICBjb25zdCBzdHJ1Y3QgZmJfaW1hZ2UgKmltYWdlKQogewogCXN0cnVjdCBxeGxfZmJkZXYg KnFmYmRldiA9IGluZm8tPnBhcjsKLQlzdHJ1Y3QgcXhsX2RldmljZSAqcWRldiA9IHFmYmRldi0+ cWRldjsKIAotCWlmICghZHJtX2Nhbl9zbGVlcCgpKSB7Ci0JCXF4bF9mYl9kZWxheWVkX2ltYWdl YmxpdChxZmJkZXYsIGltYWdlKTsKLQkJc2NoZWR1bGVfd29yaygmcWRldi0+ZmJfd29yayk7Ci0J CXJldHVybjsKLQl9Ci0JLyogbWFrZSBzdXJlIGFueSBwcmV2aW91cyB3b3JrIGlzIGRvbmUgKi8K LQlmbHVzaF93b3JrKCZxZGV2LT5mYl93b3JrKTsKLQlxeGxfZmJfaW1hZ2VibGl0X2ludGVybmFs KGluZm8sIGltYWdlKTsKKwlzeXNfaW1hZ2VibGl0KGluZm8sIGltYWdlKTsKKwlxeGxfZGlydHlf dXBkYXRlKHFmYmRldiwgaW1hZ2UtPmR4LCBpbWFnZS0+ZHksIGltYWdlLT53aWR0aCwKKwkJCSBp bWFnZS0+aGVpZ2h0KTsKIH0KIAogc3RhdGljIHZvaWQgcXhsX2ZiX3dvcmsoc3RydWN0IHdvcmtf c3RydWN0ICp3b3JrKQogewogCXN0cnVjdCBxeGxfZGV2aWNlICpxZGV2ID0gY29udGFpbmVyX29m KHdvcmssIHN0cnVjdCBxeGxfZGV2aWNlLCBmYl93b3JrKTsKLQl1bnNpZ25lZCBsb25nIGZsYWdz OwotCXN0cnVjdCBxeGxfZmJfb3AgKmVudHJ5LCAqdG1wOwogCXN0cnVjdCBxeGxfZmJkZXYgKnFm YmRldiA9IHFkZXYtPm1vZGVfaW5mby5xZmJkZXY7CiAKLQkvKiBzaW5jZSB0aGUgaXJxIGNvbnRl eHQganVzdCBhZGRzIGVudHJpZXMgdG8gdGhlIGVuZCBvZiB0aGUKLQkgICBsaXN0IGRyb3BwaW5n IHRoZSBsb2NrIHNob3VsZCBiZSBmaW5lLCBhcyBlbnRyeSBpc24ndCBtb2RpZmllZAotCSAgIGlu IHRoZSBvcGVyYXRpb24gY29kZSAqLwotCXNwaW5fbG9ja19pcnFzYXZlKCZxZmJkZXYtPmRlbGF5 ZWRfb3BzX2xvY2ssIGZsYWdzKTsKLQlsaXN0X2Zvcl9lYWNoX2VudHJ5X3NhZmUoZW50cnksIHRt cCwgJnFmYmRldi0+ZGVsYXllZF9vcHMsIGhlYWQpIHsKLQkJc3Bpbl91bmxvY2tfaXJxcmVzdG9y ZSgmcWZiZGV2LT5kZWxheWVkX29wc19sb2NrLCBmbGFncyk7Ci0JCXN3aXRjaCAoZW50cnktPm9w X3R5cGUpIHsKLQkJY2FzZSBRWExfRkJfT1BfRklMTFJFQ1Q6Ci0JCQlxeGxfZmJfZmlsbHJlY3Rf aW50ZXJuYWwocWZiZGV2LT5oZWxwZXIuZmJkZXYsICZlbnRyeS0+b3AuZnIpOwotCQkJYnJlYWs7 Ci0JCWNhc2UgUVhMX0ZCX09QX0NPUFlBUkVBOgotCQkJcXhsX2ZiX2NvcHlhcmVhX2ludGVybmFs KHFmYmRldi0+aGVscGVyLmZiZGV2LCAmZW50cnktPm9wLmNhKTsKLQkJCWJyZWFrOwotCQljYXNl IFFYTF9GQl9PUF9JTUFHRUJMSVQ6Ci0JCQlxeGxfZmJfaW1hZ2VibGl0X2ludGVybmFsKHFmYmRl di0+aGVscGVyLmZiZGV2LCAmZW50cnktPm9wLmliKTsKLQkJCWJyZWFrOwotCQl9Ci0JCXNwaW5f bG9ja19pcnFzYXZlKCZxZmJkZXYtPmRlbGF5ZWRfb3BzX2xvY2ssIGZsYWdzKTsKLQkJbGlzdF9k ZWwoJmVudHJ5LT5oZWFkKTsKLQkJa2ZyZWUoZW50cnkpOwotCX0KLQlzcGluX3VubG9ja19pcnFy ZXN0b3JlKCZxZmJkZXYtPmRlbGF5ZWRfb3BzX2xvY2ssIGZsYWdzKTsKKwlxeGxfZmJfZGlydHlf Zmx1c2gocWZiZGV2LT5oZWxwZXIuZmJkZXYpOwogfQogCiBpbnQgcXhsX2ZiX2luaXQoc3RydWN0 IHF4bF9kZXZpY2UgKnFkZXYpCkBAIC02NzgsNiArNTE2LDcgQEAgaW50IHF4bF9mYmRldl9pbml0 KHN0cnVjdCBxeGxfZGV2aWNlICpxZGV2KQogCXFmYmRldi0+cWRldiA9IHFkZXY7CiAJcWRldi0+ bW9kZV9pbmZvLnFmYmRldiA9IHFmYmRldjsKIAlzcGluX2xvY2tfaW5pdCgmcWZiZGV2LT5kZWxh eWVkX29wc19sb2NrKTsKKwlzcGluX2xvY2tfaW5pdCgmcWZiZGV2LT5kaXJ0eS5sb2NrKTsKIAlJ TklUX0xJU1RfSEVBRCgmcWZiZGV2LT5kZWxheWVkX29wcyk7CiAKIAlkcm1fZmJfaGVscGVyX3By ZXBhcmUocWRldi0+ZGRldiwgJnFmYmRldi0+aGVscGVyLAotLSAKMS44LjMuMQoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcg bGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK