From: Sonika Jindal Subject: [PATCH 2/2] drm/i915/skl: Support for 90/270 rotation Date: Mon, 30 Mar 2015 14:04:57 +0530 Message-ID: <1427704497-28344-2-git-send-email-sonika.jindal@intel.com> References: <1427704497-28344-1-git-send-email-sonika.jindal@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id A39846E379 for ; Mon, 30 Mar 2015 01:43:28 -0700 (PDT) In-Reply-To: <1427704497-28344-1-git-send-email-sonika.jindal@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 VHZydGtvJ3Mgc2VyaWVzIG1lcmdlZCkKClNpZ25lZC1vZmYtYnk6IFNvbmlrYSBKaW5kYWwgPHNv bmlrYS5qaW5kYWxAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVn LmggICAgICB8ICAgIDIgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwg IDEwMyArKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgICA2ICsrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9zcHJpdGUuYyAgfCAgIDUyICsrKysrKysrKysrKy0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDEy OSBpbnNlcnRpb25zKCspLCAzNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X3JlZy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaApp bmRleCBiNTIyZWI2Li41NjRiYmQ1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3JlZy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKQEAgLTQ4NTQs NyArNDg1NCw5IEBAIGVudW0gc2tsX2Rpc3BfcG93ZXJfd2VsbHMgewogI2RlZmluZSAgIFBMQU5F X0NUTF9BTFBIQV9IV19QUkVNVUxUSVBMWQkoICAzIDw8IDQpCiAjZGVmaW5lICAgUExBTkVfQ1RM X1JPVEFURV9NQVNLCQkJMHgzCiAjZGVmaW5lICAgUExBTkVfQ1RMX1JPVEFURV8wCQkJMHgwCisj ZGVmaW5lICAgUExBTkVfQ1RMX1JPVEFURV85MAkJCTB4MQogI2RlZmluZSAgIFBMQU5FX0NUTF9S T1RBVEVfMTgwCQkJMHgyCisjZGVmaW5lICAgUExBTkVfQ1RMX1JPVEFURV8yNzAJCQkweDMKICNk ZWZpbmUgX1BMQU5FX1NUUklERV8xX0EJCQkweDcwMTg4CiAjZGVmaW5lIF9QTEFORV9TVFJJREVf Ml9BCQkJMHg3MDI4OAogI2RlZmluZSBfUExBTkVfU1RSSURFXzNfQQkJCTB4NzAzODgKZGlmZiAt LWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCBmMGJiYzIyLi44NmVlMGYwIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0yMzE4LDYgKzIzMTgsMjggQEAgaW50ZWxf ZmlsbF9mYl9nZ3R0X3ZpZXcoc3RydWN0IGk5MTVfZ2d0dF92aWV3ICp2aWV3LCBzdHJ1Y3QgZHJt X2ZyYW1lYnVmZmVyICpmYiwKIAkJcmV0dXJuIC1FSU5WQUw7CiAJfQogCisJc3dpdGNoIChmYi0+ cGl4ZWxfZm9ybWF0KSB7CisJY2FzZSBEUk1fRk9STUFUX1hSR0I4ODg4OgorCWNhc2UgRFJNX0ZP Uk1BVF9BUkdCODg4ODoKKwljYXNlIERSTV9GT1JNQVRfWEJHUjg4ODg6CisJY2FzZSBEUk1fRk9S TUFUX0FCR1I4ODg4OgorCWNhc2UgRFJNX0ZPUk1BVF9YUkdCMjEwMTAxMDoKKwljYXNlIERSTV9G T1JNQVRfQVJHQjIxMDEwMTA6CisJY2FzZSBEUk1fRk9STUFUX1hCR1IyMTAxMDEwOgorCWNhc2Ug RFJNX0ZPUk1BVF9BQkdSMjEwMTAxMDoKKwljYXNlIERSTV9GT1JNQVRfWVVZVjoKKwljYXNlIERS TV9GT1JNQVRfWVZZVToKKwljYXNlIERSTV9GT1JNQVRfVVlWWToKKwljYXNlIERSTV9GT1JNQVRf VllVWToKKwljYXNlIERSTV9GT1JNQVRfTlYxMjoKKwkJYnJlYWs7CisKKwlkZWZhdWx0OgorCQlE Uk1fREVCVUdfS01TKCJVbnN1cHBvcnRlZCBwaXhlbCBmb3JtYXQ6JWQgZm9yIDkwLzI3MCByb3Rh dGlvbiFcbiIsCisJCSAgICAgIGZiLT5waXhlbF9mb3JtYXQpOworCQlyZXR1cm4gLUVJTlZBTDsK Kwl9CisKIAlyZXR1cm4gMDsKIH0KIApAQCAtMjkxOSw4ICsyOTQxLDEyIEBAIHN0YXRpYyB2b2lk IHNreWxha2VfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCXN0 cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50ZWxfY3J0YyhjcnRjKTsKIAlzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOwogCWludCBwaXBlID0gaW50ZWxfY3J0Yy0+cGlw ZTsKLQl1MzIgcGxhbmVfY3RsLCBzdHJpZGVfZGl2OworCXUzMiBwbGFuZV9jdGwsIHN0cmlkZV9k aXYsIHN0cmlkZTsKKwl1MzIgdGlsZV9oZWlnaHQsIHBsYW5lX29mZnNldCwgcGxhbmVfc2l6ZTsK Kwl1bnNpZ25lZCBpbnQgcm90YXRpb247CisJaW50IHhfb2Zmc2V0LCB5X29mZnNldDsKIAl1bnNp Z25lZCBsb25nIHN1cmZfYWRkcjsKKwlzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZTsKIAogCWlmICgh aW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVkKSB7CiAJCUk5MTVfV1JJVEUoUExBTkVfQ1RMKHBp cGUsIDApLCAwKTsKQEAgLTI5ODEsMjEgKzMwMDcsNTEgQEAgc3RhdGljIHZvaWQgc2t5bGFrZV91 cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJfQogCiAJcGxhbmVf Y3RsIHw9IFBMQU5FX0NUTF9QTEFORV9HQU1NQV9ESVNBQkxFOwotCWlmIChjcnRjLT5wcmltYXJ5 LT5zdGF0ZS0+cm90YXRpb24gPT0gQklUKERSTV9ST1RBVEVfMTgwKSkKKworCXBsYW5lID0gY3J0 Yy0+cHJpbWFyeTsKKwlyb3RhdGlvbiA9IHBsYW5lLT5zdGF0ZS0+cm90YXRpb247CisJc3dpdGNo IChyb3RhdGlvbikgeworCWNhc2UgQklUKERSTV9ST1RBVEVfOTApOgorCQlwbGFuZV9jdGwgfD0g UExBTkVfQ1RMX1JPVEFURV85MDsKKwkJYnJlYWs7CisKKwljYXNlIEJJVChEUk1fUk9UQVRFXzE4 MCk6CiAJCXBsYW5lX2N0bCB8PSBQTEFORV9DVExfUk9UQVRFXzE4MDsKKwkJYnJlYWs7CisKKwlj YXNlIEJJVChEUk1fUk9UQVRFXzI3MCk6CisJCXBsYW5lX2N0bCB8PSBQTEFORV9DVExfUk9UQVRF XzI3MDsKKwkJYnJlYWs7CisJfQogCiAJb2JqID0gaW50ZWxfZmJfb2JqKGZiKTsKIAlzdHJpZGVf ZGl2ID0gaW50ZWxfZmJfc3RyaWRlX2FsaWdubWVudChkZXYsIGZiLT5tb2RpZmllclswXSwKIAkJ CQkJICAgICAgIGZiLT5waXhlbF9mb3JtYXQpOwotCXN1cmZfYWRkciA9IGludGVsX3BsYW5lX29i al9vZmZzZXQodG9faW50ZWxfcGxhbmUoY3J0Yy0+cHJpbWFyeSksIG9iaik7CisJc3VyZl9hZGRy ID0gaW50ZWxfcGxhbmVfb2JqX29mZnNldCh0b19pbnRlbF9wbGFuZShwbGFuZSksIG9iaik7CisK KwlpZiAocm90YXRpb24gJiAoQklUKERSTV9ST1RBVEVfOTApIHwgQklUKERSTV9ST1RBVEVfMjcw KSkpIHsKKwkJLyogc3RyaWRlID0gU3VyZmFjZSBoZWlnaHQgaW4gdGlsZXMgKi8KKwkJdGlsZV9o ZWlnaHQgPSBpbnRlbF90aWxlX2hlaWdodChkZXYsIGZiLT5iaXRzX3Blcl9waXhlbCwKKwkJCQkJ CWZiLT5tb2RpZmllclswXSk7CisJCXN0cmlkZSA9IERJVl9ST1VORF9VUChmYi0+aGVpZ2h0LCB0 aWxlX2hlaWdodCk7CisJCXhfb2Zmc2V0ID0gc3RyaWRlICogdGlsZV9oZWlnaHQgLSB5IC0gKHBs YW5lLT5zdGF0ZS0+c3JjX2ggPj4gMTYpOworCQl5X29mZnNldCA9IHg7CisJCXBsYW5lX3NpemUg PSAoKHBsYW5lLT5zdGF0ZS0+c3JjX3cgPj4gMTYpIC0gMSkgPDwgMTYgfAorCQkJCQkoKHBsYW5l LT5zdGF0ZS0+c3JjX2ggPj4gMTYpIC0gMSk7CisJfSBlbHNlIHsKKwkJc3RyaWRlID0gZmItPnBp dGNoZXNbMF0gLyBzdHJpZGVfZGl2OworCQl4X29mZnNldCA9IHg7CisJCXlfb2Zmc2V0ID0geTsK KwkJcGxhbmVfc2l6ZSA9ICgocGxhbmUtPnN0YXRlLT5zcmNfaCA+PiAxNikgLSAxKSA8PCAxNiB8 CisJCQkoKHBsYW5lLT5zdGF0ZS0+c3JjX3cgPj4gMTYpIC0gMSk7CisJfQorCXBsYW5lX29mZnNl dCA9IHlfb2Zmc2V0IDw8IDE2IHwgeF9vZmZzZXQ7CiAKIAlJOTE1X1dSSVRFKFBMQU5FX0NUTChw aXBlLCAwKSwgcGxhbmVfY3RsKTsKIAlJOTE1X1dSSVRFKFBMQU5FX1BPUyhwaXBlLCAwKSwgMCk7 Ci0JSTkxNV9XUklURShQTEFORV9PRkZTRVQocGlwZSwgMCksICh5IDw8IDE2KSB8IHgpOwotCUk5 MTVfV1JJVEUoUExBTkVfU0laRShwaXBlLCAwKSwKLQkJICAgKGludGVsX2NydGMtPmNvbmZpZy0+ cGlwZV9zcmNfaCAtIDEpIDw8IDE2IHwKLQkJICAgKGludGVsX2NydGMtPmNvbmZpZy0+cGlwZV9z cmNfdyAtIDEpKTsKLQlJOTE1X1dSSVRFKFBMQU5FX1NUUklERShwaXBlLCAwKSwgZmItPnBpdGNo ZXNbMF0gLyBzdHJpZGVfZGl2KTsKKwlJOTE1X1dSSVRFKFBMQU5FX09GRlNFVChwaXBlLCAwKSwg cGxhbmVfb2Zmc2V0KTsKKwlJOTE1X1dSSVRFKFBMQU5FX1NJWkUocGlwZSwgMCksIHBsYW5lX3Np emUpOworCUk5MTVfV1JJVEUoUExBTkVfU1RSSURFKHBpcGUsIDApLCBzdHJpZGUpOwogCUk5MTVf V1JJVEUoUExBTkVfU1VSRihwaXBlLCAwKSwgc3VyZl9hZGRyKTsKIAogCVBPU1RJTkdfUkVBRChQ TEFORV9TVVJGKHBpcGUsIDApKTsKQEAgLTEyNDA2LDIzICsxMjQ2MiwzMiBAQCBzdGF0aWMgc3Ry dWN0IGRybV9wbGFuZSAqaW50ZWxfcHJpbWFyeV9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9kZXZp Y2UgKmRldiwKIAkJCQkgaW50ZWxfcHJpbWFyeV9mb3JtYXRzLCBudW1fZm9ybWF0cywKIAkJCQkg RFJNX1BMQU5FX1RZUEVfUFJJTUFSWSk7CiAKLQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0g NCkgewotCQlpZiAoIWRldi0+bW9kZV9jb25maWcucm90YXRpb25fcHJvcGVydHkpCi0JCQlkZXYt Pm1vZGVfY29uZmlnLnJvdGF0aW9uX3Byb3BlcnR5ID0KLQkJCQlkcm1fbW9kZV9jcmVhdGVfcm90 YXRpb25fcHJvcGVydHkoZGV2LAotCQkJCQkJCUJJVChEUk1fUk9UQVRFXzApIHwKLQkJCQkJCQlC SVQoRFJNX1JPVEFURV8xODApKTsKLQkJaWYgKGRldi0+bW9kZV9jb25maWcucm90YXRpb25fcHJv cGVydHkpCi0JCQlkcm1fb2JqZWN0X2F0dGFjaF9wcm9wZXJ0eSgmcHJpbWFyeS0+YmFzZS5iYXNl LAotCQkJCWRldi0+bW9kZV9jb25maWcucm90YXRpb25fcHJvcGVydHksCi0JCQkJc3RhdGUtPmJh c2Uucm90YXRpb24pOwotCX0KKwlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNCkKKwkJaW50 ZWxfY3JlYXRlX3JvdGF0aW9uX3Byb3BlcnR5KGRldiwgcHJpbWFyeSk7CiAKIAlkcm1fcGxhbmVf aGVscGVyX2FkZCgmcHJpbWFyeS0+YmFzZSwgJmludGVsX3BsYW5lX2hlbHBlcl9mdW5jcyk7CiAK IAlyZXR1cm4gJnByaW1hcnktPmJhc2U7CiB9CiAKK3ZvaWQgaW50ZWxfY3JlYXRlX3JvdGF0aW9u X3Byb3BlcnR5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxh bmUpCit7CisJaWYgKCFkZXYtPm1vZGVfY29uZmlnLnJvdGF0aW9uX3Byb3BlcnR5KSB7CisJCXVu c2lnbmVkIGxvbmcgZmxhZ3MgPSBCSVQoRFJNX1JPVEFURV8wKSB8CisJCQlCSVQoRFJNX1JPVEFU RV8xODApOworCisJCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA5KQorCQkJZmxhZ3MgfD0g QklUKERSTV9ST1RBVEVfOTApIHwgQklUKERSTV9ST1RBVEVfMjcwKTsKKworCQlkZXYtPm1vZGVf Y29uZmlnLnJvdGF0aW9uX3Byb3BlcnR5ID0KKwkJCWRybV9tb2RlX2NyZWF0ZV9yb3RhdGlvbl9w cm9wZXJ0eShkZXYsIGZsYWdzKTsKKwl9CisJaWYgKGRldi0+bW9kZV9jb25maWcucm90YXRpb25f cHJvcGVydHkpCisJCWRybV9vYmplY3RfYXR0YWNoX3Byb3BlcnR5KCZwbGFuZS0+YmFzZS5iYXNl LAorCQkJCWRldi0+bW9kZV9jb25maWcucm90YXRpb25fcHJvcGVydHksCisJCQkJcGxhbmUtPmJh c2Uuc3RhdGUtPnJvdGF0aW9uKTsKK30KKwogc3RhdGljIGludAogaW50ZWxfY2hlY2tfY3Vyc29y X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJIHN0cnVjdCBpbnRlbF9wbGFuZV9z dGF0ZSAqc3RhdGUpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYu aCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDgxMWExZGIuLmQzMjAy NWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC05OTUsNiArOTk1LDEyIEBAIGludGVs X3JvdGF0aW9uXzkwX29yXzI3MCh1bnNpZ25lZCBpbnQgcm90YXRpb24pCiAJcmV0dXJuIHJvdGF0 aW9uICYgKEJJVChEUk1fUk9UQVRFXzkwKSB8IEJJVChEUk1fUk9UQVRFXzI3MCkpOwogfQogCit1 bnNpZ25lZCBpbnQKK2ludGVsX3RpbGVfaGVpZ2h0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVp bnQzMl90IGJpdHNfcGVyX3BpeGVsLAorCQkgIHVpbnQ2NF90IGZiX21vZGlmaWVyKTsKK3ZvaWQg aW50ZWxfY3JlYXRlX3JvdGF0aW9uX3Byb3BlcnR5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCisJ CQkJCXN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUpOworCiBib29sIGludGVsX3dtX25lZWRfdXBk YXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQkJICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRl ICpzdGF0ZSk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0 ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggZjQxZTg3Mi4u NjVlYjE0NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTE5MCwxMCArMTkw LDEzIEBAIHNrbF91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHJtX3BsYW5lLCBzdHJ1 Y3QgZHJtX2NydGMgKmNydGMsCiAJc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiA9IGlu dGVsX2ZiX29iaihmYik7CiAJY29uc3QgaW50IHBpcGUgPSBpbnRlbF9wbGFuZS0+cGlwZTsKIAlj b25zdCBpbnQgcGxhbmUgPSBpbnRlbF9wbGFuZS0+cGxhbmUgKyAxOwotCXUzMiBwbGFuZV9jdGws IHN0cmlkZV9kaXY7CisJdTMyIHBsYW5lX2N0bCwgc3RyaWRlX2Rpdiwgc3RyaWRlOwogCWludCBw aXhlbF9zaXplID0gZHJtX2Zvcm1hdF9wbGFuZV9jcHAoZmItPnBpeGVsX2Zvcm1hdCwgMCk7CiAJ Y29uc3Qgc3RydWN0IGRybV9pbnRlbF9zcHJpdGVfY29sb3JrZXkgKmtleSA9ICZpbnRlbF9wbGFu ZS0+Y2tleTsKIAl1bnNpZ25lZCBsb25nIHN1cmZfYWRkcjsKKwl1MzIgdGlsZV9oZWlnaHQsIHBs YW5lX29mZnNldCwgcGxhbmVfc2l6ZTsKKwl1bnNpZ25lZCBpbnQgcm90YXRpb247CisJaW50IHhf b2Zmc2V0LCB5X29mZnNldDsKIAogCXBsYW5lX2N0bCA9IFBMQU5FX0NUTF9FTkFCTEUgfAogCQlQ TEFORV9DVExfUElQRV9DU0NfRU5BQkxFOwpAQCAtMjU0LDggKzI1NywyMCBAQCBza2xfdXBkYXRl X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKmRybV9wbGFuZSwgc3RydWN0IGRybV9jcnRjICpjcnRj LAogCQlNSVNTSU5HX0NBU0UoZmItPm1vZGlmaWVyWzBdKTsKIAl9CiAKLQlpZiAoZHJtX3BsYW5l LT5zdGF0ZS0+cm90YXRpb24gPT0gQklUKERSTV9ST1RBVEVfMTgwKSkKKwlyb3RhdGlvbiA9IGRy bV9wbGFuZS0+c3RhdGUtPnJvdGF0aW9uOworCXN3aXRjaCAocm90YXRpb24pIHsKKwljYXNlIEJJ VChEUk1fUk9UQVRFXzkwKToKKwkJcGxhbmVfY3RsIHw9IFBMQU5FX0NUTF9ST1RBVEVfOTA7CisJ CWJyZWFrOworCisJY2FzZSBCSVQoRFJNX1JPVEFURV8xODApOgogCQlwbGFuZV9jdGwgfD0gUExB TkVfQ1RMX1JPVEFURV8xODA7CisJCWJyZWFrOworCisJY2FzZSBCSVQoRFJNX1JPVEFURV8yNzAp OgorCQlwbGFuZV9jdGwgfD0gUExBTkVfQ1RMX1JPVEFURV8yNzA7CisJCWJyZWFrOworCX0KIAog CWludGVsX3VwZGF0ZV9zcHJpdGVfd2F0ZXJtYXJrcyhkcm1fcGxhbmUsIGNydGMsIHNyY193LCBz cmNfaCwKIAkJCQkgICAgICAgcGl4ZWxfc2l6ZSwgdHJ1ZSwKQEAgLTI4MywxMCArMjk4LDI2IEBA IHNrbF91cGRhdGVfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqZHJtX3BsYW5lLCBzdHJ1Y3QgZHJt X2NydGMgKmNydGMsCiAKIAlzdXJmX2FkZHIgPSBpbnRlbF9wbGFuZV9vYmpfb2Zmc2V0KGludGVs X3BsYW5lLCBvYmopOwogCi0JSTkxNV9XUklURShQTEFORV9PRkZTRVQocGlwZSwgcGxhbmUpLCAo eSA8PCAxNikgfCB4KTsKLQlJOTE1X1dSSVRFKFBMQU5FX1NUUklERShwaXBlLCBwbGFuZSksIGZi LT5waXRjaGVzWzBdIC8gc3RyaWRlX2Rpdik7CisJaWYgKHJvdGF0aW9uICYgKEJJVChEUk1fUk9U QVRFXzkwKSB8IEJJVChEUk1fUk9UQVRFXzI3MCkpKSB7CisJCS8qIHN0cmlkZTogU3VyZmFjZSBo ZWlnaHQgaW4gdGlsZXMgKi8KKwkJdGlsZV9oZWlnaHQgPSBpbnRlbF90aWxlX2hlaWdodChkZXYs IGZiLT5iaXRzX3Blcl9waXhlbCwKKwkJCQkJCQlmYi0+bW9kaWZpZXJbMF0pOworCQlzdHJpZGUg PSBESVZfUk9VTkRfVVAoZmItPmhlaWdodCwgdGlsZV9oZWlnaHQpOworCQlwbGFuZV9zaXplID0g KHNyY193IDw8IDE2KSB8IHNyY19oOworCQl4X29mZnNldCA9IHN0cmlkZSAqIHRpbGVfaGVpZ2h0 IC0geSAtIChzcmNfaCArIDEpOworCQl5X29mZnNldCA9IHg7CisJfSBlbHNlIHsKKwkJc3RyaWRl ID0gZmItPnBpdGNoZXNbMF0gLyBzdHJpZGVfZGl2OworCQlwbGFuZV9zaXplID0gKHNyY19oIDw8 IDE2KSB8IHNyY193OworCQl4X29mZnNldCA9IHg7CisJCXlfb2Zmc2V0ID0geTsKKwl9CisJcGxh bmVfb2Zmc2V0ID0geV9vZmZzZXQgPDwgMTYgfCB4X29mZnNldDsKKworCUk5MTVfV1JJVEUoUExB TkVfT0ZGU0VUKHBpcGUsIHBsYW5lKSwgcGxhbmVfb2Zmc2V0KTsKKwlJOTE1X1dSSVRFKFBMQU5F X1NUUklERShwaXBlLCBwbGFuZSksIHN0cmlkZSk7CiAJSTkxNV9XUklURShQTEFORV9QT1MocGlw ZSwgcGxhbmUpLCAoY3J0Y195IDw8IDE2KSB8IGNydGNfeCk7Ci0JSTkxNV9XUklURShQTEFORV9T SVpFKHBpcGUsIHBsYW5lKSwgKGNydGNfaCA8PCAxNikgfCBjcnRjX3cpOworCUk5MTVfV1JJVEUo UExBTkVfU0laRShwaXBlLCBwbGFuZSksIHBsYW5lX3NpemUpOwogCUk5MTVfV1JJVEUoUExBTkVf Q1RMKHBpcGUsIHBsYW5lKSwgcGxhbmVfY3RsKTsKIAlJOTE1X1dSSVRFKFBMQU5FX1NVUkYocGlw ZSwgcGxhbmUpLCBzdXJmX2FkZHIpOwogCVBPU1RJTkdfUkVBRChQTEFORV9TVVJGKHBpcGUsIHBs YW5lKSk7CkBAIC0xMzEwLDE2ICsxMzQxLDcgQEAgaW50ZWxfcGxhbmVfaW5pdChzdHJ1Y3QgZHJt X2RldmljZSAqZGV2LCBlbnVtIHBpcGUgcGlwZSwgaW50IHBsYW5lKQogCQlnb3RvIG91dDsKIAl9 CiAKLQlpZiAoIWRldi0+bW9kZV9jb25maWcucm90YXRpb25fcHJvcGVydHkpCi0JCWRldi0+bW9k ZV9jb25maWcucm90YXRpb25fcHJvcGVydHkgPQotCQkJZHJtX21vZGVfY3JlYXRlX3JvdGF0aW9u X3Byb3BlcnR5KGRldiwKLQkJCQkJCQkgIEJJVChEUk1fUk9UQVRFXzApIHwKLQkJCQkJCQkgIEJJ VChEUk1fUk9UQVRFXzE4MCkpOwotCi0JaWYgKGRldi0+bW9kZV9jb25maWcucm90YXRpb25fcHJv cGVydHkpCi0JCWRybV9vYmplY3RfYXR0YWNoX3Byb3BlcnR5KCZpbnRlbF9wbGFuZS0+YmFzZS5i YXNlLAotCQkJCQkgICBkZXYtPm1vZGVfY29uZmlnLnJvdGF0aW9uX3Byb3BlcnR5LAotCQkJCQkg ICBzdGF0ZS0+YmFzZS5yb3RhdGlvbik7CisJaW50ZWxfY3JlYXRlX3JvdGF0aW9uX3Byb3BlcnR5 KGRldiwgaW50ZWxfcGxhbmUpOwogCiAJZHJtX3BsYW5lX2hlbHBlcl9hZGQoJmludGVsX3BsYW5l LT5iYXNlLCAmaW50ZWxfcGxhbmVfaGVscGVyX2Z1bmNzKTsKIAotLSAKMS43LjEwLjQKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==