From: Matt Roper Subject: [PATCH 2/3] drm/i915: Kill intel_crtc->cursor_{width, height} Date: Fri, 27 Feb 2015 08:54:20 -0800 Message-ID: <1425056061-16292-3-git-send-email-matthew.d.roper@intel.com> References: <1425056061-16292-1-git-send-email-matthew.d.roper@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 2D4D06E2C0 for ; Fri, 27 Feb 2015 08:55:05 -0800 (PST) In-Reply-To: <1425056061-16292-1-git-send-email-matthew.d.roper@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Joe Konno List-Id: intel-gfx@lists.freedesktop.org VGhlIGN1cnNvciBzaXplIGZpZWxkcyBpbiBpbnRlbF9jcnRjIGp1c3QgZHVwbGljYXRlIHRoZSBk YXRhIGZyb20KY3Vyc29yLT5zdGF0ZS5jcnRjX3t3LGh9IHNvIHdlIGRvbid0IG5lZWQgdGhlbSBh bnkgbW9yZS4gIFdvcnNlLCB0aGVpcgp1c2UgaW4gdGhlIHdhdGVybWFyayBjb2RlIGFjdHVhbGx5 IGludHJvZHVjZXMgYSBzdWJ0bGUgYnVnIHNpbmNlIHRoZXkKZG9uJ3QgZ2V0IHVwZGF0ZWQgdG8g bWlycm9yIHRoZSBzdGF0ZSB2YWx1ZXMgdW50aWwgdGhlIHBsYW5lIGNvbW1pdApzdGFnZSwgd2hp Y2ggaXMgKmFmdGVyKiB3ZSd2ZSBhbHJlYWR5IHVzZWQgdGhlbSB0byBjYWxjdWxhdGUgbmV3Cndh dGVybWFyayB2YWx1ZXMuICBUaGlzIGhhcHBlbnMgYmVjYXVzZSB3ZSBoYWQgdG8gbW92ZSB3YXRl cm1hcmsgdXBkYXRlcwpzbGlnaHRseSBlYXJsaWVyIChvdXRzaWRlIHZibGFuayBldmFzaW9uKSBp biBjb21taXQKCiAgICAgICAgY29tbWl0IDMyYjdlZWVjNGQxZTg2MTIzMGIwOWQ0MzdlOTVkNzZj ODZmZjRhNjgKICAgICAgICBBdXRob3I6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRl bC5jb20+CiAgICAgICAgRGF0ZTogICBXZWQgRGVjIDI0IDA3OjU5OjA2IDIwMTQgLTA4MDAKCiAg ICAgICAgICAgIGRybS9pOTE1OiBSZWZhY3RvciB3b3JrIHRoYXQgY2FuIHNsZWVwIG91dCBvZiBj b21taXQgKHY3KQoKRHJvcHBpbmcgdGhlIGludGVsX2NydGMgZmllbGRzIGFuZCBqdXN0IHVzaW5n IHRoZSBzdGF0ZSB2YWx1ZXMgKHdoaWNoCmFyZSBwcm9wZXJseSB1cGRhdGVkIGJ5IHRoZSB0aW1l IHdhdGVybWFyayB1cGRhdGVzIGhhcHBlbikgc2hvdWxkIHNvbHZlCnRoZSBwcm9ibGVtLgoKQXNp ZGUgZnJvbSB0aGUgYWN0dWFsIHJlbW92YWwgb2YgdGhlIHN0cnVjdCBmaWVsZHMgKHdoaWNoIGFy ZSBmb3JtYXR0ZWQKaW4gYSB3YXkgdGhhdCBJIGNvdWxkbid0IGZpZ3VyZSBvdXQgaG93IHRvIG1h dGNoIGluIENvY2NpbmVsbGUpLCB0aGUKcmVzdCBvZiB0aGlzIHBhdGNoIHdhcyBnZW5lcmF0ZWQg dmlhIHRoZSBmb2xsb3dpbmcgc2VtYW50aWMgcGF0Y2g6CgogICAgICAgIC8vIERyb3AgYXNzaWdu bWVudAogICAgICAgIEBACiAgICAgICAgc3RydWN0IGludGVsX2NydGMgKkM7CiAgICAgICAgc3Ry dWN0IGRybV9wbGFuZV9zdGF0ZSBTOwogICAgICAgIEBACiAgICAgICAgKAogICAgICAgIC0gQy0+ Y3Vyc29yX3dpZHRoID0gUy5jcnRjX3c7CiAgICAgICAgfAogICAgICAgIC0gQy0+Y3Vyc29yX2hl aWdodCA9IFMuY3J0Y19oOwogICAgICAgICkKCiAgICAgICAgLy8gUmVwbGFjZSB1c2FnZQogICAg ICAgIEBACiAgICAgICAgc3RydWN0IGludGVsX2NydGMgKkM7CiAgICAgICAgZXhwcmVzc2lvbiBF OwogICAgICAgIEBACiAgICAgICAgKAogICAgICAgIC0gQy0+Y3Vyc29yX3dpZHRoCiAgICAgICAg KyBDLT5iYXNlLmN1cnNvci0+c3RhdGUtPmNydGNfdwogICAgICAgIHwKICAgICAgICAtIEMtPmN1 cnNvcl9oZWlnaHQKICAgICAgICArIEMtPmJhc2UuY3Vyc29yLT5zdGF0ZS0+Y3J0Y19oCiAgICAg ICAgfAogICAgICAgIC0gdG9faW50ZWxfY3J0YyhFKS0+Y3Vyc29yX3dpZHRoCiAgICAgICAgKyBF LT5jdXJzb3ItPnN0YXRlLT5jcnRjX3cKICAgICAgICB8CiAgICAgICAgLSB0b19pbnRlbF9jcnRj KEUpLT5jdXJzb3JfaGVpZ2h0CiAgICAgICAgKyBFLT5jdXJzb3ItPnN0YXRlLT5jcnRjX2gKICAg ICAgICApCgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNv bT4KQ2M6IEpvZSBLb25ubyA8am9lLmtvbm5vQGxpbnV4LmludGVsLmNvbT4KQnVnemlsbGE6IGh0 dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTg5MzQ2ClNpZ25lZC1v ZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+Ci0tLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgIHwgIDMgKystCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAyMCArKysrKysrKystLS0tLS0tLS0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDEgLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfd20uYyAgICAgIHwgMTIgKysrKysrLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDE3IGlu c2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2Zz LmMKaW5kZXggMzkwOTFlMi4uNzg4NjYzYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2Zz LmMKQEAgLTI2NzcsNyArMjY3Nyw4IEBAIHN0YXRpYyBpbnQgaTkxNV9kaXNwbGF5X2luZm8oc3Ry dWN0IHNlcV9maWxlICptLCB2b2lkICp1bnVzZWQpCiAJCQlhY3RpdmUgPSBjdXJzb3JfcG9zaXRp b24oZGV2LCBjcnRjLT5waXBlLCAmeCwgJnkpOwogCQkJc2VxX3ByaW50ZihtLCAiXHRjdXJzb3Ig dmlzaWJsZT8gJXMsIHBvc2l0aW9uICglZCwgJWQpLCBzaXplICVkeCVkLCBhZGRyIDB4JTA4eCwg YWN0aXZlPyAlc1xuIiwKIAkJCQkgICB5ZXNubyhjcnRjLT5jdXJzb3JfYmFzZSksCi0JCQkJICAg eCwgeSwgY3J0Yy0+Y3Vyc29yX3dpZHRoLCBjcnRjLT5jdXJzb3JfaGVpZ2h0LAorCQkJCSAgIHgs IHksIGNydGMtPmJhc2UuY3Vyc29yLT5zdGF0ZS0+Y3J0Y193LAorCQkJCSAgIGNydGMtPmJhc2Uu Y3Vyc29yLT5zdGF0ZS0+Y3J0Y19oLAogCQkJCSAgIGNydGMtPmN1cnNvcl9hZGRyLCB5ZXNubyhh Y3RpdmUpKTsKIAkJfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggMzcw YzE3My4uNDQzM2IxMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtODMz MCw4ICs4MzMwLDggQEAgc3RhdGljIHZvaWQgaTg0NV91cGRhdGVfY3Vyc29yKHN0cnVjdCBkcm1f Y3J0YyAqY3J0YywgdTMyIGJhc2UpCiAJdWludDMyX3QgY250bCA9IDAsIHNpemUgPSAwOwogCiAJ aWYgKGJhc2UpIHsKLQkJdW5zaWduZWQgaW50IHdpZHRoID0gaW50ZWxfY3J0Yy0+Y3Vyc29yX3dp ZHRoOwotCQl1bnNpZ25lZCBpbnQgaGVpZ2h0ID0gaW50ZWxfY3J0Yy0+Y3Vyc29yX2hlaWdodDsK KwkJdW5zaWduZWQgaW50IHdpZHRoID0gaW50ZWxfY3J0Yy0+YmFzZS5jdXJzb3ItPnN0YXRlLT5j cnRjX3c7CisJCXVuc2lnbmVkIGludCBoZWlnaHQgPSBpbnRlbF9jcnRjLT5iYXNlLmN1cnNvci0+ c3RhdGUtPmNydGNfaDsKIAkJdW5zaWduZWQgaW50IHN0cmlkZSA9IHJvdW5kdXBfcG93X29mX3R3 byh3aWR0aCkgKiA0OwogCiAJCXN3aXRjaCAoc3RyaWRlKSB7CkBAIC04Mzk1LDcgKzgzOTUsNyBA QCBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0ZV9jdXJzb3Ioc3RydWN0IGRybV9jcnRjICpjcnRjLCB1 MzIgYmFzZSkKIAljbnRsID0gMDsKIAlpZiAoYmFzZSkgewogCQljbnRsID0gTUNVUlNPUl9HQU1N QV9FTkFCTEU7Ci0JCXN3aXRjaCAoaW50ZWxfY3J0Yy0+Y3Vyc29yX3dpZHRoKSB7CisJCXN3aXRj aCAoaW50ZWxfY3J0Yy0+YmFzZS5jdXJzb3ItPnN0YXRlLT5jcnRjX3cpIHsKIAkJCWNhc2UgNjQ6 CiAJCQkJY250bCB8PSBDVVJTT1JfTU9ERV82NF9BUkdCX0FYOwogCQkJCWJyZWFrOwpAQCAtODQw Niw3ICs4NDA2LDcgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfY3Vyc29yKHN0cnVjdCBkcm1f Y3J0YyAqY3J0YywgdTMyIGJhc2UpCiAJCQkJY250bCB8PSBDVVJTT1JfTU9ERV8yNTZfQVJHQl9B WDsKIAkJCQlicmVhazsKIAkJCWRlZmF1bHQ6Ci0JCQkJTUlTU0lOR19DQVNFKGludGVsX2NydGMt PmN1cnNvcl93aWR0aCk7CisJCQkJTUlTU0lOR19DQVNFKGludGVsX2NydGMtPmJhc2UuY3Vyc29y LT5zdGF0ZS0+Y3J0Y193KTsKIAkJCQlyZXR1cm47CiAJCX0KIAkJY250bCB8PSBwaXBlIDw8IDI4 OyAvKiBDb25uZWN0IHRvIGNvcnJlY3QgcGlwZSAqLwpAQCAtODQ1Myw3ICs4NDUzLDcgQEAgc3Rh dGljIHZvaWQgaW50ZWxfY3J0Y191cGRhdGVfY3Vyc29yKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywK IAkJYmFzZSA9IDA7CiAKIAlpZiAoeCA8IDApIHsKLQkJaWYgKHggKyBpbnRlbF9jcnRjLT5jdXJz b3Jfd2lkdGggPD0gMCkKKwkJaWYgKHggKyBpbnRlbF9jcnRjLT5iYXNlLmN1cnNvci0+c3RhdGUt PmNydGNfdyA8PSAwKQogCQkJYmFzZSA9IDA7CiAKIAkJcG9zIHw9IENVUlNPUl9QT1NfU0lHTiA8 PCBDVVJTT1JfWF9TSElGVDsKQEAgLTg0NjIsNyArODQ2Miw3IEBAIHN0YXRpYyB2b2lkIGludGVs X2NydGNfdXBkYXRlX2N1cnNvcihzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJcG9zIHw9IHggPDwg Q1VSU09SX1hfU0hJRlQ7CiAKIAlpZiAoeSA8IDApIHsKLQkJaWYgKHkgKyBpbnRlbF9jcnRjLT5j dXJzb3JfaGVpZ2h0IDw9IDApCisJCWlmICh5ICsgaW50ZWxfY3J0Yy0+YmFzZS5jdXJzb3ItPnN0 YXRlLT5jcnRjX2ggPD0gMCkKIAkJCWJhc2UgPSAwOwogCiAJCXBvcyB8PSBDVVJTT1JfUE9TX1NJ R04gPDwgQ1VSU09SX1lfU0hJRlQ7CkBAIC04NDc4LDggKzg0NzgsOCBAQCBzdGF0aWMgdm9pZCBp bnRlbF9jcnRjX3VwZGF0ZV9jdXJzb3Ioc3RydWN0IGRybV9jcnRjICpjcnRjLAogCS8qIElMSysg ZG8gdGhpcyBhdXRvbWFnaWNhbGx5ICovCiAJaWYgKEhBU19HTUNIX0RJU1BMQVkoZGV2KSAmJgog CSAgICBjcnRjLT5jdXJzb3ItPnN0YXRlLT5yb3RhdGlvbiA9PSBCSVQoRFJNX1JPVEFURV8xODAp KSB7Ci0JCWJhc2UgKz0gKGludGVsX2NydGMtPmN1cnNvcl9oZWlnaHQgKgotCQkJaW50ZWxfY3J0 Yy0+Y3Vyc29yX3dpZHRoIC0gMSkgKiA0OworCQliYXNlICs9IChpbnRlbF9jcnRjLT5iYXNlLmN1 cnNvci0+c3RhdGUtPmNydGNfaCAqCisJCQlpbnRlbF9jcnRjLT5iYXNlLmN1cnNvci0+c3RhdGUt PmNydGNfdyAtIDEpICogNDsKIAl9CiAKIAlpZiAoSVNfODQ1RyhkZXYpIHx8IElTX0k4NjVHKGRl dikpCkBAIC0xMjIxNCw3ICsxMjIxNCw3IEBAIGludGVsX2NoZWNrX2N1cnNvcl9wbGFuZShzdHJ1 Y3QgZHJtX3BsYW5lICpwbGFuZSwKIAogZmluaXNoOgogCWlmIChpbnRlbF9jcnRjLT5hY3RpdmUp IHsKLQkJaWYgKGludGVsX2NydGMtPmN1cnNvcl93aWR0aCAhPSBzdGF0ZS0+YmFzZS5jcnRjX3cp CisJCWlmIChpbnRlbF9jcnRjLT5iYXNlLmN1cnNvci0+c3RhdGUtPmNydGNfdyAhPSBzdGF0ZS0+ YmFzZS5jcnRjX3cpCiAJCQlpbnRlbF9jcnRjLT5hdG9taWMudXBkYXRlX3dtID0gdHJ1ZTsKIAog CQlpbnRlbF9jcnRjLT5hdG9taWMuZmJfYml0cyB8PQpAQCAtMTIyNTcsOCArMTIyNTcsNiBAQCBp bnRlbF9jb21taXRfY3Vyc29yX3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCWludGVs X2NydGMtPmN1cnNvcl9hZGRyID0gYWRkcjsKIAlpbnRlbF9jcnRjLT5jdXJzb3JfYm8gPSBvYmo7 CiB1cGRhdGU6Ci0JaW50ZWxfY3J0Yy0+Y3Vyc29yX3dpZHRoID0gc3RhdGUtPmJhc2UuY3J0Y193 OwotCWludGVsX2NydGMtPmN1cnNvcl9oZWlnaHQgPSBzdGF0ZS0+YmFzZS5jcnRjX2g7CiAKIAlp ZiAoaW50ZWxfY3J0Yy0+YWN0aXZlKQogCQlpbnRlbF9jcnRjX3VwZGF0ZV9jdXJzb3IoY3J0Yywg c3RhdGUtPnZpc2libGUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCA5OTVkMDMwLi41 NzczOWU5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtNDY0LDcgKzQ2NCw2IEBAIHN0 cnVjdCBpbnRlbF9jcnRjIHsKIAogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdXJzb3Jf Ym87CiAJdWludDMyX3QgY3Vyc29yX2FkZHI7Ci0JaW50MTZfdCBjdXJzb3Jfd2lkdGgsIGN1cnNv cl9oZWlnaHQ7CiAJdWludDMyX3QgY3Vyc29yX2NudGw7CiAJdWludDMyX3QgY3Vyc29yX3NpemU7 CiAJdWludDMyX3QgY3Vyc29yX2Jhc2U7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF93bS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfd20uYwppbmRleCBkNjdm NTI1NS4uZGNjNmEwNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfd20u YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93bS5jCkBAIC01ODcsNyArNTg3LDcg QEAgc3RhdGljIGJvb2wgZzR4X2NvbXB1dGVfd20wKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJ LyogVXNlIHRoZSBsYXJnZSBidWZmZXIgbWV0aG9kIHRvIGNhbGN1bGF0ZSBjdXJzb3Igd2F0ZXJt YXJrICovCiAJbGluZV90aW1lX3VzID0gbWF4KGh0b3RhbCAqIDEwMDAgLyBjbG9jaywgMSk7CiAJ bGluZV9jb3VudCA9IChjdXJzb3JfbGF0ZW5jeV9ucyAvIGxpbmVfdGltZV91cyArIDEwMDApIC8g MTAwMDsKLQllbnRyaWVzID0gbGluZV9jb3VudCAqIHRvX2ludGVsX2NydGMoY3J0YyktPmN1cnNv cl93aWR0aCAqIHBpeGVsX3NpemU7CisJZW50cmllcyA9IGxpbmVfY291bnQgKiBjcnRjLT5jdXJz b3ItPnN0YXRlLT5jcnRjX3cgKiBwaXhlbF9zaXplOwogCXRsYl9taXNzID0gY3Vyc29yLT5maWZv X3NpemUqY3Vyc29yLT5jYWNoZWxpbmVfc2l6ZSAtIGhkaXNwbGF5ICogODsKIAlpZiAodGxiX21p c3MgPiAwKQogCQllbnRyaWVzICs9IHRsYl9taXNzOwpAQCAtNjczLDcgKzY3Myw3IEBAIHN0YXRp YyBib29sIGc0eF9jb21wdXRlX3Nyd20oc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkqZGlzcGxh eV93bSA9IGVudHJpZXMgKyBkaXNwbGF5LT5ndWFyZF9zaXplOwogCiAJLyogY2FsY3VsYXRlIHRo ZSBzZWxmLXJlZnJlc2ggd2F0ZXJtYXJrIGZvciBkaXNwbGF5IGN1cnNvciAqLwotCWVudHJpZXMg PSBsaW5lX2NvdW50ICogcGl4ZWxfc2l6ZSAqIHRvX2ludGVsX2NydGMoY3J0YyktPmN1cnNvcl93 aWR0aDsKKwllbnRyaWVzID0gbGluZV9jb3VudCAqIHBpeGVsX3NpemUgKiBjcnRjLT5jdXJzb3It PnN0YXRlLT5jcnRjX3c7CiAJZW50cmllcyA9IERJVl9ST1VORF9VUChlbnRyaWVzLCBjdXJzb3It PmNhY2hlbGluZV9zaXplKTsKIAkqY3Vyc29yX3dtID0gZW50cmllcyArIGN1cnNvci0+Z3VhcmRf c2l6ZTsKIApAQCAtMTA0MSw3ICsxMDQxLDcgQEAgc3RhdGljIHZvaWQgaTk2NV91cGRhdGVfd20o c3RydWN0IGRybV9jcnRjICp1bnVzZWRfY3J0YykKIAkJCSAgICAgIGVudHJpZXMsIHNyd20pOwog CiAJCWVudHJpZXMgPSAoKChzcl9sYXRlbmN5X25zIC8gbGluZV90aW1lX3VzKSArIDEwMDApIC8g MTAwMCkgKgotCQkJcGl4ZWxfc2l6ZSAqIHRvX2ludGVsX2NydGMoY3J0YyktPmN1cnNvcl93aWR0 aDsKKwkJCXBpeGVsX3NpemUgKiBjcnRjLT5jdXJzb3ItPnN0YXRlLT5jcnRjX3c7CiAJCWVudHJp ZXMgPSBESVZfUk9VTkRfVVAoZW50cmllcywKIAkJCQkJICBpOTY1X2N1cnNvcl93bV9pbmZvLmNh Y2hlbGluZV9zaXplKTsKIAkJY3Vyc29yX3NyID0gaTk2NV9jdXJzb3Jfd21faW5mby5maWZvX3Np emUgLQpAQCAtMTg3Nyw3ICsxODc3LDcgQEAgc3RhdGljIHZvaWQgaWxrX2NvbXB1dGVfd21fcGFy YW1ldGVycyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJcC0+cHJpLmJ5dGVzX3Blcl9waXhlbCA9 IGNydGMtPnByaW1hcnktPmZiLT5iaXRzX3Blcl9waXhlbCAvIDg7CiAJcC0+Y3VyLmJ5dGVzX3Bl cl9waXhlbCA9IDQ7CiAJcC0+cHJpLmhvcml6X3BpeGVscyA9IGludGVsX2NydGMtPmNvbmZpZy0+ cGlwZV9zcmNfdzsKLQlwLT5jdXIuaG9yaXpfcGl4ZWxzID0gaW50ZWxfY3J0Yy0+Y3Vyc29yX3dp ZHRoOworCXAtPmN1ci5ob3Jpel9waXhlbHMgPSBpbnRlbF9jcnRjLT5iYXNlLmN1cnNvci0+c3Rh dGUtPmNydGNfdzsKIAkvKiBUT0RPOiBmb3Igbm93LCBhc3N1bWUgcHJpbWFyeSBhbmQgY3Vyc29y IHBsYW5lcyBhcmUgYWx3YXlzIGVuYWJsZWQuICovCiAJcC0+cHJpLmVuYWJsZWQgPSB0cnVlOwog CXAtPmN1ci5lbmFibGVkID0gdHJ1ZTsKQEAgLTI2MzgsOCArMjYzOCw4IEBAIHN0YXRpYyB2b2lk IHNrbF9jb21wdXRlX3dtX3BpcGVfcGFyYW1ldGVycyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAK IAkJcC0+Y3Vyc29yLmVuYWJsZWQgPSB0cnVlOwogCQlwLT5jdXJzb3IuYnl0ZXNfcGVyX3BpeGVs ID0gNDsKLQkJcC0+Y3Vyc29yLmhvcml6X3BpeGVscyA9IGludGVsX2NydGMtPmN1cnNvcl93aWR0 aCA/Ci0JCQkJCSBpbnRlbF9jcnRjLT5jdXJzb3Jfd2lkdGggOiA2NDsKKwkJcC0+Y3Vyc29yLmhv cml6X3BpeGVscyA9IGludGVsX2NydGMtPmJhc2UuY3Vyc29yLT5zdGF0ZS0+Y3J0Y193ID8KKwkJ CQkJIGludGVsX2NydGMtPmJhc2UuY3Vyc29yLT5zdGF0ZS0+Y3J0Y193IDogNjQ7CiAJfQogCiAJ bGlzdF9mb3JfZWFjaF9lbnRyeShwbGFuZSwgJmRldi0+bW9kZV9jb25maWcucGxhbmVfbGlzdCwg aGVhZCkgewotLSAKMS44LjUuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK