From: Matt Roper Subject: [PATCH 2/3] drm/i915: Kill intel_crtc->cursor_{width, height} (v2) Date: Fri, 27 Feb 2015 10:12:00 -0800 Message-ID: <1425060721-12226-3-git-send-email-matthew.d.roper@intel.com> References: <1425060721-12226-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 mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id AC47B6E2A9 for ; Fri, 27 Feb 2015 10:12:35 -0800 (PST) In-Reply-To: <1425060721-12226-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 ICAgICApCgp2MjogUmViYXNlCgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxp bnV4LmludGVsLmNvbT4KQ2M6IEpvZSBLb25ubyA8am9lLmtvbm5vQGxpbnV4LmludGVsLmNvbT4K QnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTg5 MzQ2ClNpZ25lZC1vZmYtYnk6IE1hdHQgUm9wZXIgPG1hdHRoZXcuZC5yb3BlckBpbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgIHwgIDMgKystCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgfCAyMCArKysrKysrKystLS0tLS0tLS0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDEgLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfd20uYyAgICAgIHwgMTIgKysrKysrLS0tLS0tCiA0IGZpbGVzIGNo YW5nZWQsIDE3IGluc2VydGlvbnMoKyksIDE5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kZWJ1Z2ZzLmMKaW5kZXggOTRiMzk4NC4uZTRkNWY0MSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kZWJ1Z2ZzLmMKQEAgLTI2NzcsNyArMjY3Nyw4IEBAIHN0YXRpYyBpbnQgaTkxNV9kaXNw bGF5X2luZm8oc3RydWN0IHNlcV9maWxlICptLCB2b2lkICp1bnVzZWQpCiAJCQlhY3RpdmUgPSBj dXJzb3JfcG9zaXRpb24oZGV2LCBjcnRjLT5waXBlLCAmeCwgJnkpOwogCQkJc2VxX3ByaW50Ziht LCAiXHRjdXJzb3IgdmlzaWJsZT8gJXMsIHBvc2l0aW9uICglZCwgJWQpLCBzaXplICVkeCVkLCBh ZGRyIDB4JTA4eCwgYWN0aXZlPyAlc1xuIiwKIAkJCQkgICB5ZXNubyhjcnRjLT5jdXJzb3JfYmFz ZSksCi0JCQkJICAgeCwgeSwgY3J0Yy0+Y3Vyc29yX3dpZHRoLCBjcnRjLT5jdXJzb3JfaGVpZ2h0 LAorCQkJCSAgIHgsIHksIGNydGMtPmJhc2UuY3Vyc29yLT5zdGF0ZS0+Y3J0Y193LAorCQkJCSAg IGNydGMtPmJhc2UuY3Vyc29yLT5zdGF0ZS0+Y3J0Y19oLAogCQkJCSAgIGNydGMtPmN1cnNvcl9h ZGRyLCB5ZXNubyhhY3RpdmUpKTsKIAkJfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKaW5kZXggNWEwMmY4YzkuLjkxYWUwMTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKQEAgLTg0MDksOCArODQwOSw4IEBAIHN0YXRpYyB2b2lkIGk4NDVfdXBkYXRlX2N1cnNv cihzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIHUzMiBiYXNlKQogCXVpbnQzMl90IGNudGwgPSAwLCBz aXplID0gMDsKIAogCWlmIChiYXNlKSB7Ci0JCXVuc2lnbmVkIGludCB3aWR0aCA9IGludGVsX2Ny dGMtPmN1cnNvcl93aWR0aDsKLQkJdW5zaWduZWQgaW50IGhlaWdodCA9IGludGVsX2NydGMtPmN1 cnNvcl9oZWlnaHQ7CisJCXVuc2lnbmVkIGludCB3aWR0aCA9IGludGVsX2NydGMtPmJhc2UuY3Vy c29yLT5zdGF0ZS0+Y3J0Y193OworCQl1bnNpZ25lZCBpbnQgaGVpZ2h0ID0gaW50ZWxfY3J0Yy0+ YmFzZS5jdXJzb3ItPnN0YXRlLT5jcnRjX2g7CiAJCXVuc2lnbmVkIGludCBzdHJpZGUgPSByb3Vu ZHVwX3Bvd19vZl90d28od2lkdGgpICogNDsKIAogCQlzd2l0Y2ggKHN0cmlkZSkgewpAQCAtODQ3 NCw3ICs4NDc0LDcgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfY3Vyc29yKHN0cnVjdCBkcm1f Y3J0YyAqY3J0YywgdTMyIGJhc2UpCiAJY250bCA9IDA7CiAJaWYgKGJhc2UpIHsKIAkJY250bCA9 IE1DVVJTT1JfR0FNTUFfRU5BQkxFOwotCQlzd2l0Y2ggKGludGVsX2NydGMtPmN1cnNvcl93aWR0 aCkgeworCQlzd2l0Y2ggKGludGVsX2NydGMtPmJhc2UuY3Vyc29yLT5zdGF0ZS0+Y3J0Y193KSB7 CiAJCQljYXNlIDY0OgogCQkJCWNudGwgfD0gQ1VSU09SX01PREVfNjRfQVJHQl9BWDsKIAkJCQli cmVhazsKQEAgLTg0ODUsNyArODQ4NSw3IEBAIHN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX2N1cnNv cihzdHJ1Y3QgZHJtX2NydGMgKmNydGMsIHUzMiBiYXNlKQogCQkJCWNudGwgfD0gQ1VSU09SX01P REVfMjU2X0FSR0JfQVg7CiAJCQkJYnJlYWs7CiAJCQlkZWZhdWx0OgotCQkJCU1JU1NJTkdfQ0FT RShpbnRlbF9jcnRjLT5jdXJzb3Jfd2lkdGgpOworCQkJCU1JU1NJTkdfQ0FTRShpbnRlbF9jcnRj LT5iYXNlLmN1cnNvci0+c3RhdGUtPmNydGNfdyk7CiAJCQkJcmV0dXJuOwogCQl9CiAJCWNudGwg fD0gcGlwZSA8PCAyODsgLyogQ29ubmVjdCB0byBjb3JyZWN0IHBpcGUgKi8KQEAgLTg1MzIsNyAr ODUzMiw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2NydGNfdXBkYXRlX2N1cnNvcihzdHJ1Y3QgZHJt X2NydGMgKmNydGMsCiAJCWJhc2UgPSAwOwogCiAJaWYgKHggPCAwKSB7Ci0JCWlmICh4ICsgaW50 ZWxfY3J0Yy0+Y3Vyc29yX3dpZHRoIDw9IDApCisJCWlmICh4ICsgaW50ZWxfY3J0Yy0+YmFzZS5j dXJzb3ItPnN0YXRlLT5jcnRjX3cgPD0gMCkKIAkJCWJhc2UgPSAwOwogCiAJCXBvcyB8PSBDVVJT T1JfUE9TX1NJR04gPDwgQ1VSU09SX1hfU0hJRlQ7CkBAIC04NTQxLDcgKzg1NDEsNyBAQCBzdGF0 aWMgdm9pZCBpbnRlbF9jcnRjX3VwZGF0ZV9jdXJzb3Ioc3RydWN0IGRybV9jcnRjICpjcnRjLAog CXBvcyB8PSB4IDw8IENVUlNPUl9YX1NISUZUOwogCiAJaWYgKHkgPCAwKSB7Ci0JCWlmICh5ICsg aW50ZWxfY3J0Yy0+Y3Vyc29yX2hlaWdodCA8PSAwKQorCQlpZiAoeSArIGludGVsX2NydGMtPmJh c2UuY3Vyc29yLT5zdGF0ZS0+Y3J0Y19oIDw9IDApCiAJCQliYXNlID0gMDsKIAogCQlwb3MgfD0g Q1VSU09SX1BPU19TSUdOIDw8IENVUlNPUl9ZX1NISUZUOwpAQCAtODU1Nyw4ICs4NTU3LDggQEAg c3RhdGljIHZvaWQgaW50ZWxfY3J0Y191cGRhdGVfY3Vyc29yKHN0cnVjdCBkcm1fY3J0YyAqY3J0 YywKIAkvKiBJTEsrIGRvIHRoaXMgYXV0b21hZ2ljYWxseSAqLwogCWlmIChIQVNfR01DSF9ESVNQ TEFZKGRldikgJiYKIAkgICAgY3J0Yy0+Y3Vyc29yLT5zdGF0ZS0+cm90YXRpb24gPT0gQklUKERS TV9ST1RBVEVfMTgwKSkgewotCQliYXNlICs9IChpbnRlbF9jcnRjLT5jdXJzb3JfaGVpZ2h0ICoK LQkJCWludGVsX2NydGMtPmN1cnNvcl93aWR0aCAtIDEpICogNDsKKwkJYmFzZSArPSAoaW50ZWxf Y3J0Yy0+YmFzZS5jdXJzb3ItPnN0YXRlLT5jcnRjX2ggKgorCQkJaW50ZWxfY3J0Yy0+YmFzZS5j dXJzb3ItPnN0YXRlLT5jcnRjX3cgLSAxKSAqIDQ7CiAJfQogCiAJaWYgKElTXzg0NUcoZGV2KSB8 fCBJU19JODY1RyhkZXYpKQpAQCAtMTIyOTksNyArMTIyOTksNyBAQCBpbnRlbF9jaGVja19jdXJz b3JfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAKIGZpbmlzaDoKIAlpZiAoaW50ZWxf Y3J0Yy0+YWN0aXZlKSB7Ci0JCWlmIChpbnRlbF9jcnRjLT5jdXJzb3Jfd2lkdGggIT0gc3RhdGUt PmJhc2UuY3J0Y193KQorCQlpZiAoaW50ZWxfY3J0Yy0+YmFzZS5jdXJzb3ItPnN0YXRlLT5jcnRj X3cgIT0gc3RhdGUtPmJhc2UuY3J0Y193KQogCQkJaW50ZWxfY3J0Yy0+YXRvbWljLnVwZGF0ZV93 bSA9IHRydWU7CiAKIAkJaW50ZWxfY3J0Yy0+YXRvbWljLmZiX2JpdHMgfD0KQEAgLTEyMzQyLDgg KzEyMzQyLDYgQEAgaW50ZWxfY29tbWl0X2N1cnNvcl9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpw bGFuZSwKIAlpbnRlbF9jcnRjLT5jdXJzb3JfYWRkciA9IGFkZHI7CiAJaW50ZWxfY3J0Yy0+Y3Vy c29yX2JvID0gb2JqOwogdXBkYXRlOgotCWludGVsX2NydGMtPmN1cnNvcl93aWR0aCA9IHN0YXRl LT5iYXNlLmNydGNfdzsKLQlpbnRlbF9jcnRjLT5jdXJzb3JfaGVpZ2h0ID0gc3RhdGUtPmJhc2Uu Y3J0Y19oOwogCiAJaWYgKGludGVsX2NydGMtPmFjdGl2ZSkKIAkJaW50ZWxfY3J0Y191cGRhdGVf Y3Vyc29yKGNydGMsIHN0YXRlLT52aXNpYmxlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5k ZXggNjZiYzBiNy4uZjg0MDNkMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTQ2NCw3 ICs0NjQsNiBAQCBzdHJ1Y3QgaW50ZWxfY3J0YyB7CiAKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29i amVjdCAqY3Vyc29yX2JvOwogCXVpbnQzMl90IGN1cnNvcl9hZGRyOwotCWludDE2X3QgY3Vyc29y X3dpZHRoLCBjdXJzb3JfaGVpZ2h0OwogCXVpbnQzMl90IGN1cnNvcl9jbnRsOwogCXVpbnQzMl90 IGN1cnNvcl9zaXplOwogCXVpbnQzMl90IGN1cnNvcl9iYXNlOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfd20uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3dt LmMKaW5kZXggNGJjZDdmNC4uNDdhNTE3NSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfd20uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93bS5jCkBAIC01 ODcsNyArNTg3LDcgQEAgc3RhdGljIGJvb2wgZzR4X2NvbXB1dGVfd20wKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsCiAJLyogVXNlIHRoZSBsYXJnZSBidWZmZXIgbWV0aG9kIHRvIGNhbGN1bGF0ZSBj dXJzb3Igd2F0ZXJtYXJrICovCiAJbGluZV90aW1lX3VzID0gbWF4KGh0b3RhbCAqIDEwMDAgLyBj bG9jaywgMSk7CiAJbGluZV9jb3VudCA9IChjdXJzb3JfbGF0ZW5jeV9ucyAvIGxpbmVfdGltZV91 cyArIDEwMDApIC8gMTAwMDsKLQllbnRyaWVzID0gbGluZV9jb3VudCAqIHRvX2ludGVsX2NydGMo Y3J0YyktPmN1cnNvcl93aWR0aCAqIHBpeGVsX3NpemU7CisJZW50cmllcyA9IGxpbmVfY291bnQg KiBjcnRjLT5jdXJzb3ItPnN0YXRlLT5jcnRjX3cgKiBwaXhlbF9zaXplOwogCXRsYl9taXNzID0g Y3Vyc29yLT5maWZvX3NpemUqY3Vyc29yLT5jYWNoZWxpbmVfc2l6ZSAtIGhkaXNwbGF5ICogODsK IAlpZiAodGxiX21pc3MgPiAwKQogCQllbnRyaWVzICs9IHRsYl9taXNzOwpAQCAtNjczLDcgKzY3 Myw3IEBAIHN0YXRpYyBib29sIGc0eF9jb21wdXRlX3Nyd20oc3RydWN0IGRybV9kZXZpY2UgKmRl diwKIAkqZGlzcGxheV93bSA9IGVudHJpZXMgKyBkaXNwbGF5LT5ndWFyZF9zaXplOwogCiAJLyog Y2FsY3VsYXRlIHRoZSBzZWxmLXJlZnJlc2ggd2F0ZXJtYXJrIGZvciBkaXNwbGF5IGN1cnNvciAq LwotCWVudHJpZXMgPSBsaW5lX2NvdW50ICogcGl4ZWxfc2l6ZSAqIHRvX2ludGVsX2NydGMoY3J0 YyktPmN1cnNvcl93aWR0aDsKKwllbnRyaWVzID0gbGluZV9jb3VudCAqIHBpeGVsX3NpemUgKiBj cnRjLT5jdXJzb3ItPnN0YXRlLT5jcnRjX3c7CiAJZW50cmllcyA9IERJVl9ST1VORF9VUChlbnRy aWVzLCBjdXJzb3ItPmNhY2hlbGluZV9zaXplKTsKIAkqY3Vyc29yX3dtID0gZW50cmllcyArIGN1 cnNvci0+Z3VhcmRfc2l6ZTsKIApAQCAtMTA0MSw3ICsxMDQxLDcgQEAgc3RhdGljIHZvaWQgaTk2 NV91cGRhdGVfd20oc3RydWN0IGRybV9jcnRjICp1bnVzZWRfY3J0YykKIAkJCSAgICAgIGVudHJp ZXMsIHNyd20pOwogCiAJCWVudHJpZXMgPSAoKChzcl9sYXRlbmN5X25zIC8gbGluZV90aW1lX3Vz KSArIDEwMDApIC8gMTAwMCkgKgotCQkJcGl4ZWxfc2l6ZSAqIHRvX2ludGVsX2NydGMoY3J0Yykt PmN1cnNvcl93aWR0aDsKKwkJCXBpeGVsX3NpemUgKiBjcnRjLT5jdXJzb3ItPnN0YXRlLT5jcnRj X3c7CiAJCWVudHJpZXMgPSBESVZfUk9VTkRfVVAoZW50cmllcywKIAkJCQkJICBpOTY1X2N1cnNv cl93bV9pbmZvLmNhY2hlbGluZV9zaXplKTsKIAkJY3Vyc29yX3NyID0gaTk2NV9jdXJzb3Jfd21f aW5mby5maWZvX3NpemUgLQpAQCAtMTg3Nyw3ICsxODc3LDcgQEAgc3RhdGljIHZvaWQgaWxrX2Nv bXB1dGVfd21fcGFyYW1ldGVycyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJcC0+cHJpLmJ5dGVz X3Blcl9waXhlbCA9IGNydGMtPnByaW1hcnktPmZiLT5iaXRzX3Blcl9waXhlbCAvIDg7CiAJcC0+ Y3VyLmJ5dGVzX3Blcl9waXhlbCA9IDQ7CiAJcC0+cHJpLmhvcml6X3BpeGVscyA9IGludGVsX2Ny dGMtPmNvbmZpZy0+cGlwZV9zcmNfdzsKLQlwLT5jdXIuaG9yaXpfcGl4ZWxzID0gaW50ZWxfY3J0 Yy0+Y3Vyc29yX3dpZHRoOworCXAtPmN1ci5ob3Jpel9waXhlbHMgPSBpbnRlbF9jcnRjLT5iYXNl LmN1cnNvci0+c3RhdGUtPmNydGNfdzsKIAkvKiBUT0RPOiBmb3Igbm93LCBhc3N1bWUgcHJpbWFy eSBhbmQgY3Vyc29yIHBsYW5lcyBhcmUgYWx3YXlzIGVuYWJsZWQuICovCiAJcC0+cHJpLmVuYWJs ZWQgPSB0cnVlOwogCXAtPmN1ci5lbmFibGVkID0gdHJ1ZTsKQEAgLTI2NzMsOCArMjY3Myw4IEBA IHN0YXRpYyB2b2lkIHNrbF9jb21wdXRlX3dtX3BpcGVfcGFyYW1ldGVycyhzdHJ1Y3QgZHJtX2Ny dGMgKmNydGMsCiAKIAkJcC0+Y3Vyc29yLmVuYWJsZWQgPSB0cnVlOwogCQlwLT5jdXJzb3IuYnl0 ZXNfcGVyX3BpeGVsID0gNDsKLQkJcC0+Y3Vyc29yLmhvcml6X3BpeGVscyA9IGludGVsX2NydGMt PmN1cnNvcl93aWR0aCA/Ci0JCQkJCSBpbnRlbF9jcnRjLT5jdXJzb3Jfd2lkdGggOiA2NDsKKwkJ cC0+Y3Vyc29yLmhvcml6X3BpeGVscyA9IGludGVsX2NydGMtPmJhc2UuY3Vyc29yLT5zdGF0ZS0+ Y3J0Y193ID8KKwkJCQkJIGludGVsX2NydGMtPmJhc2UuY3Vyc29yLT5zdGF0ZS0+Y3J0Y193IDog NjQ7CiAJfQogCiAJbGlzdF9mb3JfZWFjaF9lbnRyeShwbGFuZSwgJmRldi0+bW9kZV9jb25maWcu cGxhbmVfbGlzdCwgaGVhZCkgewotLSAKMS44LjUuMQoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK