From: Sonika Jindal Subject: [PATCH] drm/i915/skl: Support for 90/270 rotation Date: Tue, 7 Apr 2015 13:56:28 +0530 Message-ID: <1428395188-12201-1-git-send-email-sonika.jindal@intel.com> References: <552393E0.1070906@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id 5746B6E41D for ; Tue, 7 Apr 2015 01:34:54 -0700 (PDT) In-Reply-To: <552393E0.1070906@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 List-Id: intel-gfx@lists.freedesktop.org djI6IE1vdmluZyBjcmVhdGlvbiBvZiBwcm9wZXJ0eSBpbiBhIGZ1bmN0aW9uLCBjaGVja2luZyBm b3IgOTAvMjcwCnJvdGF0aW9uIHNpbXVsdGFuZW91c2x5IChDaHJpcykKTGV0dGluZyBwcmltYXJ5 IHBsYW5lIHRvIGJlIHBvc2l0aW9uZWQKdjM6IEFkZGluZyBpZi9lbHNlIGZvciA5MC8yNzAgYW5k IHJlc3QgcGFyYW1zIHByb2dyYW1taW5nLCBhZGRpbmcgY2hlY2sgZm9yCnBpeGVsX2Zvcm1hdCwg c29tZSBjbGVhbnVwIChyZXZpZXcgY29tbWVudHMpCnY0OiBBZGRpbmcgcmlnaHQgcGl4ZWxfZm9y bWF0cywgdXNpbmcgc3JjXyogcGFyYW1zIGluc3RlYWQgb2YgY3J0Y18qIGZvciBvZmZzZXQKYW5k IHNpemUgcHJvZ3JhbW1pbmcgKFZpbGxlKQp2NTogUmViYXNlZCBvbiAtbmlnaHRseSBhbmQgVHZy dGtvJ3Mgc2VyaWVzIGZvciBndHQgcmVtYXBwaW5nLgp2NjogUmViYXNlZCBvbiAtbmlnaHRseSAo VHZydGtvJ3Mgc2VyaWVzIG1lcmdlZCkKdjc6IE1vdmluZyBwaXhlbF9mb3JtYXQgY2hlY2sgdG8g aW50ZWxfYXRvbWljX3BsYW5lX2NoZWNrIChNYXR0KQoKU2lnbmVkLW9mZi1ieTogU29uaWthIEpp bmRhbCA8c29uaWthLmppbmRhbEBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9yZWcuaCAgICAgICAgICAgfCAgICAyICsKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2F0b21pY19wbGFuZS5jIHwgICAyMyArKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jICAgICAgfCAgIDg4ICsrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgICAgICB8ICAgIDYgKysKIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICAgICAgIHwgICA1MiArKysrKysrKysrKyst LS0tLQogNSBmaWxlcyBjaGFuZ2VkLCAxMzAgaW5zZXJ0aW9ucygrKSwgNDEgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKaW5kZXggYjUyMmViNi4uNTY0YmJkNSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X3JlZy5oCkBAIC00ODU0LDcgKzQ4NTQsOSBAQCBlbnVtIHNrbF9kaXNwX3Bvd2Vy X3dlbGxzIHsKICNkZWZpbmUgICBQTEFORV9DVExfQUxQSEFfSFdfUFJFTVVMVElQTFkJKCAgMyA8 PCA0KQogI2RlZmluZSAgIFBMQU5FX0NUTF9ST1RBVEVfTUFTSwkJCTB4MwogI2RlZmluZSAgIFBM QU5FX0NUTF9ST1RBVEVfMAkJCTB4MAorI2RlZmluZSAgIFBMQU5FX0NUTF9ST1RBVEVfOTAJCQkw eDEKICNkZWZpbmUgICBQTEFORV9DVExfUk9UQVRFXzE4MAkJCTB4MgorI2RlZmluZSAgIFBMQU5F X0NUTF9ST1RBVEVfMjcwCQkJMHgzCiAjZGVmaW5lIF9QTEFORV9TVFJJREVfMV9BCQkJMHg3MDE4 OAogI2RlZmluZSBfUExBTkVfU1RSSURFXzJfQQkJCTB4NzAyODgKICNkZWZpbmUgX1BMQU5FX1NU UklERV8zX0EJCQkweDcwMzg4CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9hdG9taWNfcGxhbmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pY19wbGFu ZS5jCmluZGV4IDk3NmI4OTEuLmVmOGMyOTEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2F0b21pY19wbGFuZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2F0b21pY19wbGFuZS5jCkBAIC0xNjIsNiArMTYyLDI5IEBAIHN0YXRpYyBpbnQgaW50ZWxfcGxh bmVfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJKDEgPDwgZHJtX3Bs YW5lX2luZGV4KHBsYW5lKSk7CiAJfQogCisJaWYgKHN0YXRlLT5mYiAmJiBpbnRlbF9yb3RhdGlv bl85MF9vcl8yNzAoc3RhdGUtPnJvdGF0aW9uKSkgeworCQlpZiAoIShzdGF0ZS0+ZmItPm1vZGlm aWVyWzBdID09IEk5MTVfRk9STUFUX01PRF9ZX1RJTEVEIHx8CisJCQlzdGF0ZS0+ZmItPm1vZGlm aWVyWzBdID09IEk5MTVfRk9STUFUX01PRF9ZZl9USUxFRCkpIHsKKwkJCURSTV9ERUJVR19LTVMo IlkvWWYgdGlsaW5nIHJlcXVpcmVkIGZvciA5MC8yNzAhXG4iKTsKKwkJCXJldHVybiAtRUlOVkFM OworCQl9CisKKwkJLyoKKwkJICogOTAvMjcwIGlzIG5vdCBhbGxvd2VkIHdpdGggUkdCNjQgMTY6 MTY6MTY6MTYsCisJCSAqIFJHQiAxNi1iaXQgNTo2OjUsIGFuZCBJbmRleGVkIDgtYml0LgorCQkg Ki8KKwkJc3dpdGNoIChzdGF0ZS0+ZmItPnBpeGVsX2Zvcm1hdCkgeworCQljYXNlIERSTV9GT1JN QVRfQzg6CisJCWNhc2UgRFJNX0ZPUk1BVF9SR0I1NjU6CisJCQlEUk1fREVCVUdfS01TKCJVbnN1 cHBvcnRlZCBwaXhlbCBmb3JtYXQgJXMgZm9yIDkwLzI3MCFcbiIsCisJCQkJCWRybV9nZXRfZm9y bWF0X25hbWUoc3RhdGUtPmZiLT5waXhlbF9mb3JtYXQpKTsKKwkJCXJldHVybiAtRUlOVkFMOwor CisJCWRlZmF1bHQ6CisJCQlicmVhazsKKwkJfQorCX0KKwogCXJldHVybiBpbnRlbF9wbGFuZS0+ Y2hlY2tfcGxhbmUocGxhbmUsIGludGVsX3N0YXRlKTsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jCmluZGV4IGYwYmJjMjIuLjRkZTU0NGMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKQEAgLTIzMTEsMTMgKzIzMTEsNiBAQCBpbnRlbF9maWxsX2ZiX2dndHRf dmlldyhzdHJ1Y3QgaTkxNV9nZ3R0X3ZpZXcgKnZpZXcsIHN0cnVjdCBkcm1fZnJhbWVidWZmZXIg KmZiLAogCWluZm8tPnBpdGNoID0gZmItPnBpdGNoZXNbMF07CiAJaW5mby0+ZmJfbW9kaWZpZXIg PSBmYi0+bW9kaWZpZXJbMF07CiAKLQlpZiAoIShpbmZvLT5mYl9tb2RpZmllciA9PSBJOTE1X0ZP Uk1BVF9NT0RfWV9USUxFRCB8fAotCSAgICAgIGluZm8tPmZiX21vZGlmaWVyID09IEk5MTVfRk9S TUFUX01PRF9ZZl9USUxFRCkpIHsKLQkJRFJNX0RFQlVHX0tNUygKLQkJCSAgICAgICJZIG9yIFlm IHRpbGluZyBpcyBuZWVkZWQgZm9yIDkwLzI3MCByb3RhdGlvbiFcbiIpOwotCQlyZXR1cm4gLUVJ TlZBTDsKLQl9Ci0KIAlyZXR1cm4gMDsKIH0KIApAQCAtMjkxOSw4ICsyOTEyLDEyIEBAIHN0YXRp YyB2b2lkIHNreWxha2VfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9jcnRjICpjcnRj LAogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsK IAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOwogCWludCBwaXBlID0gaW50ZWxfY3J0 Yy0+cGlwZTsKLQl1MzIgcGxhbmVfY3RsLCBzdHJpZGVfZGl2OworCXUzMiBwbGFuZV9jdGwsIHN0 cmlkZV9kaXYsIHN0cmlkZTsKKwl1MzIgdGlsZV9oZWlnaHQsIHBsYW5lX29mZnNldCwgcGxhbmVf c2l6ZTsKKwl1bnNpZ25lZCBpbnQgcm90YXRpb247CisJaW50IHhfb2Zmc2V0LCB5X29mZnNldDsK IAl1bnNpZ25lZCBsb25nIHN1cmZfYWRkcjsKKwlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZTsKIAog CWlmICghaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVkKSB7CiAJCUk5MTVfV1JJVEUoUExBTkVf Q1RMKHBpcGUsIDApLCAwKTsKQEAgLTI5ODEsMjEgKzI5NzgsNTEgQEAgc3RhdGljIHZvaWQgc2t5 bGFrZV91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJfQogCiAJ cGxhbmVfY3RsIHw9IFBMQU5FX0NUTF9QTEFORV9HQU1NQV9ESVNBQkxFOwotCWlmIChjcnRjLT5w cmltYXJ5LT5zdGF0ZS0+cm90YXRpb24gPT0gQklUKERSTV9ST1RBVEVfMTgwKSkKKworCXBsYW5l ID0gY3J0Yy0+cHJpbWFyeTsKKwlyb3RhdGlvbiA9IHBsYW5lLT5zdGF0ZS0+cm90YXRpb247CisJ c3dpdGNoIChyb3RhdGlvbikgeworCWNhc2UgQklUKERSTV9ST1RBVEVfOTApOgorCQlwbGFuZV9j dGwgfD0gUExBTkVfQ1RMX1JPVEFURV85MDsKKwkJYnJlYWs7CisKKwljYXNlIEJJVChEUk1fUk9U QVRFXzE4MCk6CiAJCXBsYW5lX2N0bCB8PSBQTEFORV9DVExfUk9UQVRFXzE4MDsKKwkJYnJlYWs7 CisKKwljYXNlIEJJVChEUk1fUk9UQVRFXzI3MCk6CisJCXBsYW5lX2N0bCB8PSBQTEFORV9DVExf Uk9UQVRFXzI3MDsKKwkJYnJlYWs7CisJfQogCiAJb2JqID0gaW50ZWxfZmJfb2JqKGZiKTsKIAlz dHJpZGVfZGl2ID0gaW50ZWxfZmJfc3RyaWRlX2FsaWdubWVudChkZXYsIGZiLT5tb2RpZmllclsw XSwKIAkJCQkJICAgICAgIGZiLT5waXhlbF9mb3JtYXQpOwotCXN1cmZfYWRkciA9IGludGVsX3Bs YW5lX29ial9vZmZzZXQodG9faW50ZWxfcGxhbmUoY3J0Yy0+cHJpbWFyeSksIG9iaik7CisJc3Vy Zl9hZGRyID0gaW50ZWxfcGxhbmVfb2JqX29mZnNldCh0b19pbnRlbF9wbGFuZShwbGFuZSksIG9i aik7CisKKwlpZiAoaW50ZWxfcm90YXRpb25fOTBfb3JfMjcwKHJvdGF0aW9uKSkgeworCQkvKiBz dHJpZGUgPSBTdXJmYWNlIGhlaWdodCBpbiB0aWxlcyAqLworCQl0aWxlX2hlaWdodCA9IGludGVs X3RpbGVfaGVpZ2h0KGRldiwgZmItPmJpdHNfcGVyX3BpeGVsLAorCQkJCQkJZmItPm1vZGlmaWVy WzBdKTsKKwkJc3RyaWRlID0gRElWX1JPVU5EX1VQKGZiLT5oZWlnaHQsIHRpbGVfaGVpZ2h0KTsK KwkJeF9vZmZzZXQgPSBzdHJpZGUgKiB0aWxlX2hlaWdodCAtIHkgLSAocGxhbmUtPnN0YXRlLT5z cmNfaCA+PiAxNik7CisJCXlfb2Zmc2V0ID0geDsKKwkJcGxhbmVfc2l6ZSA9ICgocGxhbmUtPnN0 YXRlLT5zcmNfdyA+PiAxNikgLSAxKSA8PCAxNiB8CisJCQkJCSgocGxhbmUtPnN0YXRlLT5zcmNf aCA+PiAxNikgLSAxKTsKKwl9IGVsc2UgeworCQlzdHJpZGUgPSBmYi0+cGl0Y2hlc1swXSAvIHN0 cmlkZV9kaXY7CisJCXhfb2Zmc2V0ID0geDsKKwkJeV9vZmZzZXQgPSB5OworCQlwbGFuZV9zaXpl ID0gKChwbGFuZS0+c3RhdGUtPnNyY19oID4+IDE2KSAtIDEpIDw8IDE2IHwKKwkJCSgocGxhbmUt PnN0YXRlLT5zcmNfdyA+PiAxNikgLSAxKTsKKwl9CisJcGxhbmVfb2Zmc2V0ID0geV9vZmZzZXQg PDwgMTYgfCB4X29mZnNldDsKIAogCUk5MTVfV1JJVEUoUExBTkVfQ1RMKHBpcGUsIDApLCBwbGFu ZV9jdGwpOwogCUk5MTVfV1JJVEUoUExBTkVfUE9TKHBpcGUsIDApLCAwKTsKLQlJOTE1X1dSSVRF KFBMQU5FX09GRlNFVChwaXBlLCAwKSwgKHkgPDwgMTYpIHwgeCk7Ci0JSTkxNV9XUklURShQTEFO RV9TSVpFKHBpcGUsIDApLAotCQkgICAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5waXBlX3NyY19oIC0g MSkgPDwgMTYgfAotCQkgICAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5waXBlX3NyY193IC0gMSkpOwot CUk5MTVfV1JJVEUoUExBTkVfU1RSSURFKHBpcGUsIDApLCBmYi0+cGl0Y2hlc1swXSAvIHN0cmlk ZV9kaXYpOworCUk5MTVfV1JJVEUoUExBTkVfT0ZGU0VUKHBpcGUsIDApLCBwbGFuZV9vZmZzZXQp OworCUk5MTVfV1JJVEUoUExBTkVfU0laRShwaXBlLCAwKSwgcGxhbmVfc2l6ZSk7CisJSTkxNV9X UklURShQTEFORV9TVFJJREUocGlwZSwgMCksIHN0cmlkZSk7CiAJSTkxNV9XUklURShQTEFORV9T VVJGKHBpcGUsIDApLCBzdXJmX2FkZHIpOwogCiAJUE9TVElOR19SRUFEKFBMQU5FX1NVUkYocGlw ZSwgMCkpOwpAQCAtMTI0MDYsMjMgKzEyNDMzLDMyIEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX3BsYW5l ICppbnRlbF9wcmltYXJ5X3BsYW5lX2NyZWF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJ CSBpbnRlbF9wcmltYXJ5X2Zvcm1hdHMsIG51bV9mb3JtYXRzLAogCQkJCSBEUk1fUExBTkVfVFlQ RV9QUklNQVJZKTsKIAotCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA0KSB7Ci0JCWlmICgh ZGV2LT5tb2RlX2NvbmZpZy5yb3RhdGlvbl9wcm9wZXJ0eSkKLQkJCWRldi0+bW9kZV9jb25maWcu cm90YXRpb25fcHJvcGVydHkgPQotCQkJCWRybV9tb2RlX2NyZWF0ZV9yb3RhdGlvbl9wcm9wZXJ0 eShkZXYsCi0JCQkJCQkJQklUKERSTV9ST1RBVEVfMCkgfAotCQkJCQkJCUJJVChEUk1fUk9UQVRF XzE4MCkpOwotCQlpZiAoZGV2LT5tb2RlX2NvbmZpZy5yb3RhdGlvbl9wcm9wZXJ0eSkKLQkJCWRy bV9vYmplY3RfYXR0YWNoX3Byb3BlcnR5KCZwcmltYXJ5LT5iYXNlLmJhc2UsCi0JCQkJZGV2LT5t b2RlX2NvbmZpZy5yb3RhdGlvbl9wcm9wZXJ0eSwKLQkJCQlzdGF0ZS0+YmFzZS5yb3RhdGlvbik7 Ci0JfQorCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA0KQorCQlpbnRlbF9jcmVhdGVfcm90 YXRpb25fcHJvcGVydHkoZGV2LCBwcmltYXJ5KTsKIAogCWRybV9wbGFuZV9oZWxwZXJfYWRkKCZw cmltYXJ5LT5iYXNlLCAmaW50ZWxfcGxhbmVfaGVscGVyX2Z1bmNzKTsKIAogCXJldHVybiAmcHJp bWFyeS0+YmFzZTsKIH0KIAordm9pZCBpbnRlbF9jcmVhdGVfcm90YXRpb25fcHJvcGVydHkoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSkKK3sKKwlpZiAo IWRldi0+bW9kZV9jb25maWcucm90YXRpb25fcHJvcGVydHkpIHsKKwkJdW5zaWduZWQgbG9uZyBm bGFncyA9IEJJVChEUk1fUk9UQVRFXzApIHwKKwkJCUJJVChEUk1fUk9UQVRFXzE4MCk7CisKKwkJ aWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDkpCisJCQlmbGFncyB8PSBCSVQoRFJNX1JPVEFU RV85MCkgfCBCSVQoRFJNX1JPVEFURV8yNzApOworCisJCWRldi0+bW9kZV9jb25maWcucm90YXRp b25fcHJvcGVydHkgPQorCQkJZHJtX21vZGVfY3JlYXRlX3JvdGF0aW9uX3Byb3BlcnR5KGRldiwg ZmxhZ3MpOworCX0KKwlpZiAoZGV2LT5tb2RlX2NvbmZpZy5yb3RhdGlvbl9wcm9wZXJ0eSkKKwkJ ZHJtX29iamVjdF9hdHRhY2hfcHJvcGVydHkoJnBsYW5lLT5iYXNlLmJhc2UsCisJCQkJZGV2LT5t b2RlX2NvbmZpZy5yb3RhdGlvbl9wcm9wZXJ0eSwKKwkJCQlwbGFuZS0+YmFzZS5zdGF0ZS0+cm90 YXRpb24pOworfQorCiBzdGF0aWMgaW50CiBpbnRlbF9jaGVja19jdXJzb3JfcGxhbmUoc3RydWN0 IGRybV9wbGFuZSAqcGxhbmUsCiAJCQkgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpzdGF0ZSkK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggODExYTFkYi4uZDMyMDI1YSAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTk5NSw2ICs5OTUsMTIgQEAgaW50ZWxfcm90YXRpb25fOTBf b3JfMjcwKHVuc2lnbmVkIGludCByb3RhdGlvbikKIAlyZXR1cm4gcm90YXRpb24gJiAoQklUKERS TV9ST1RBVEVfOTApIHwgQklUKERSTV9ST1RBVEVfMjcwKSk7CiB9CiAKK3Vuc2lnbmVkIGludAor aW50ZWxfdGlsZV9oZWlnaHQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdWludDMyX3QgYml0c19w ZXJfcGl4ZWwsCisJCSAgdWludDY0X3QgZmJfbW9kaWZpZXIpOwordm9pZCBpbnRlbF9jcmVhdGVf cm90YXRpb25fcHJvcGVydHkoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKKwkJCQkJc3RydWN0IGlu dGVsX3BsYW5lICpwbGFuZSk7CisKIGJvb2wgaW50ZWxfd21fbmVlZF91cGRhdGUoc3RydWN0IGRy bV9wbGFuZSAqcGxhbmUsCiAJCQkgIHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnN0YXRlKTsKIApk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCBmNDFlODcyLi44M2FkYzliIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtMTkwLDEwICsxOTAsMTMgQEAgc2tsX3Vw ZGF0ZV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcm1fcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAq Y3J0YywKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqID0gaW50ZWxfZmJfb2JqKGZi KTsKIAljb25zdCBpbnQgcGlwZSA9IGludGVsX3BsYW5lLT5waXBlOwogCWNvbnN0IGludCBwbGFu ZSA9IGludGVsX3BsYW5lLT5wbGFuZSArIDE7Ci0JdTMyIHBsYW5lX2N0bCwgc3RyaWRlX2RpdjsK Kwl1MzIgcGxhbmVfY3RsLCBzdHJpZGVfZGl2LCBzdHJpZGU7CiAJaW50IHBpeGVsX3NpemUgPSBk cm1fZm9ybWF0X3BsYW5lX2NwcChmYi0+cGl4ZWxfZm9ybWF0LCAwKTsKIAljb25zdCBzdHJ1Y3Qg ZHJtX2ludGVsX3Nwcml0ZV9jb2xvcmtleSAqa2V5ID0gJmludGVsX3BsYW5lLT5ja2V5OwogCXVu c2lnbmVkIGxvbmcgc3VyZl9hZGRyOworCXUzMiB0aWxlX2hlaWdodCwgcGxhbmVfb2Zmc2V0LCBw bGFuZV9zaXplOworCXVuc2lnbmVkIGludCByb3RhdGlvbjsKKwlpbnQgeF9vZmZzZXQsIHlfb2Zm c2V0OwogCiAJcGxhbmVfY3RsID0gUExBTkVfQ1RMX0VOQUJMRSB8CiAJCVBMQU5FX0NUTF9QSVBF X0NTQ19FTkFCTEU7CkBAIC0yNTQsOCArMjU3LDIwIEBAIHNrbF91cGRhdGVfcGxhbmUoc3RydWN0 IGRybV9wbGFuZSAqZHJtX3BsYW5lLCBzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCU1JU1NJTkdf Q0FTRShmYi0+bW9kaWZpZXJbMF0pOwogCX0KIAotCWlmIChkcm1fcGxhbmUtPnN0YXRlLT5yb3Rh dGlvbiA9PSBCSVQoRFJNX1JPVEFURV8xODApKQorCXJvdGF0aW9uID0gZHJtX3BsYW5lLT5zdGF0 ZS0+cm90YXRpb247CisJc3dpdGNoIChyb3RhdGlvbikgeworCWNhc2UgQklUKERSTV9ST1RBVEVf OTApOgorCQlwbGFuZV9jdGwgfD0gUExBTkVfQ1RMX1JPVEFURV85MDsKKwkJYnJlYWs7CisKKwlj YXNlIEJJVChEUk1fUk9UQVRFXzE4MCk6CiAJCXBsYW5lX2N0bCB8PSBQTEFORV9DVExfUk9UQVRF XzE4MDsKKwkJYnJlYWs7CisKKwljYXNlIEJJVChEUk1fUk9UQVRFXzI3MCk6CisJCXBsYW5lX2N0 bCB8PSBQTEFORV9DVExfUk9UQVRFXzI3MDsKKwkJYnJlYWs7CisJfQogCiAJaW50ZWxfdXBkYXRl X3Nwcml0ZV93YXRlcm1hcmtzKGRybV9wbGFuZSwgY3J0Yywgc3JjX3csIHNyY19oLAogCQkJCSAg ICAgICBwaXhlbF9zaXplLCB0cnVlLApAQCAtMjgzLDEwICsyOTgsMjYgQEAgc2tsX3VwZGF0ZV9w bGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpkcm1fcGxhbmUsIHN0cnVjdCBkcm1fY3J0YyAqY3J0YywK IAogCXN1cmZfYWRkciA9IGludGVsX3BsYW5lX29ial9vZmZzZXQoaW50ZWxfcGxhbmUsIG9iaik7 CiAKLQlJOTE1X1dSSVRFKFBMQU5FX09GRlNFVChwaXBlLCBwbGFuZSksICh5IDw8IDE2KSB8IHgp OwotCUk5MTVfV1JJVEUoUExBTkVfU1RSSURFKHBpcGUsIHBsYW5lKSwgZmItPnBpdGNoZXNbMF0g LyBzdHJpZGVfZGl2KTsKKwlpZiAoaW50ZWxfcm90YXRpb25fOTBfb3JfMjcwKHJvdGF0aW9uKSkg eworCQkvKiBzdHJpZGU6IFN1cmZhY2UgaGVpZ2h0IGluIHRpbGVzICovCisJCXRpbGVfaGVpZ2h0 ID0gaW50ZWxfdGlsZV9oZWlnaHQoZGV2LCBmYi0+Yml0c19wZXJfcGl4ZWwsCisJCQkJCQkJZmIt Pm1vZGlmaWVyWzBdKTsKKwkJc3RyaWRlID0gRElWX1JPVU5EX1VQKGZiLT5oZWlnaHQsIHRpbGVf aGVpZ2h0KTsKKwkJcGxhbmVfc2l6ZSA9IChzcmNfdyA8PCAxNikgfCBzcmNfaDsKKwkJeF9vZmZz ZXQgPSBzdHJpZGUgKiB0aWxlX2hlaWdodCAtIHkgLSAoc3JjX2ggKyAxKTsKKwkJeV9vZmZzZXQg PSB4OworCX0gZWxzZSB7CisJCXN0cmlkZSA9IGZiLT5waXRjaGVzWzBdIC8gc3RyaWRlX2RpdjsK KwkJcGxhbmVfc2l6ZSA9IChzcmNfaCA8PCAxNikgfCBzcmNfdzsKKwkJeF9vZmZzZXQgPSB4Owor CQl5X29mZnNldCA9IHk7CisJfQorCXBsYW5lX29mZnNldCA9IHlfb2Zmc2V0IDw8IDE2IHwgeF9v ZmZzZXQ7CisKKwlJOTE1X1dSSVRFKFBMQU5FX09GRlNFVChwaXBlLCBwbGFuZSksIHBsYW5lX29m ZnNldCk7CisJSTkxNV9XUklURShQTEFORV9TVFJJREUocGlwZSwgcGxhbmUpLCBzdHJpZGUpOwog CUk5MTVfV1JJVEUoUExBTkVfUE9TKHBpcGUsIHBsYW5lKSwgKGNydGNfeSA8PCAxNikgfCBjcnRj X3gpOwotCUk5MTVfV1JJVEUoUExBTkVfU0laRShwaXBlLCBwbGFuZSksIChjcnRjX2ggPDwgMTYp IHwgY3J0Y193KTsKKwlJOTE1X1dSSVRFKFBMQU5FX1NJWkUocGlwZSwgcGxhbmUpLCBwbGFuZV9z aXplKTsKIAlJOTE1X1dSSVRFKFBMQU5FX0NUTChwaXBlLCBwbGFuZSksIHBsYW5lX2N0bCk7CiAJ STkxNV9XUklURShQTEFORV9TVVJGKHBpcGUsIHBsYW5lKSwgc3VyZl9hZGRyKTsKIAlQT1NUSU5H X1JFQUQoUExBTkVfU1VSRihwaXBlLCBwbGFuZSkpOwpAQCAtMTMxMCwxNiArMTM0MSw3IEBAIGlu dGVsX3BsYW5lX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgZW51bSBwaXBlIHBpcGUsIGlu dCBwbGFuZSkKIAkJZ290byBvdXQ7CiAJfQogCi0JaWYgKCFkZXYtPm1vZGVfY29uZmlnLnJvdGF0 aW9uX3Byb3BlcnR5KQotCQlkZXYtPm1vZGVfY29uZmlnLnJvdGF0aW9uX3Byb3BlcnR5ID0KLQkJ CWRybV9tb2RlX2NyZWF0ZV9yb3RhdGlvbl9wcm9wZXJ0eShkZXYsCi0JCQkJCQkJICBCSVQoRFJN X1JPVEFURV8wKSB8Ci0JCQkJCQkJICBCSVQoRFJNX1JPVEFURV8xODApKTsKLQotCWlmIChkZXYt Pm1vZGVfY29uZmlnLnJvdGF0aW9uX3Byb3BlcnR5KQotCQlkcm1fb2JqZWN0X2F0dGFjaF9wcm9w ZXJ0eSgmaW50ZWxfcGxhbmUtPmJhc2UuYmFzZSwKLQkJCQkJICAgZGV2LT5tb2RlX2NvbmZpZy5y b3RhdGlvbl9wcm9wZXJ0eSwKLQkJCQkJICAgc3RhdGUtPmJhc2Uucm90YXRpb24pOworCWludGVs X2NyZWF0ZV9yb3RhdGlvbl9wcm9wZXJ0eShkZXYsIGludGVsX3BsYW5lKTsKIAogCWRybV9wbGFu ZV9oZWxwZXJfYWRkKCZpbnRlbF9wbGFuZS0+YmFzZSwgJmludGVsX3BsYW5lX2hlbHBlcl9mdW5j cyk7CiAKLS0gCjEuNy4xMC40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=