From: Ander Conselvan de Oliveira Subject: [PATCH 3/9] drm/i915: Move dpll crtc_mask and hw_state fields into separate struct Date: Wed, 29 Oct 2014 11:32:32 +0200 Message-ID: <1414575158-28148-4-git-send-email-ander.conselvan.de.oliveira@intel.com> References: <1414575158-28148-1-git-send-email-ander.conselvan.de.oliveira@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 EA2316E4E7 for ; Wed, 29 Oct 2014 02:33:30 -0700 (PDT) In-Reply-To: <1414575158-28148-1-git-send-email-ander.conselvan.de.oliveira@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: Ander Conselvan de Oliveira , ville.syrjala@intel.com, shuang.he@linux.intel.com List-Id: intel-gfx@lists.freedesktop.org VGhlIG5ldyBzdHJ1Y3Qgd2lsbCBiZSB1c2VkIGluIGEgZm9sbG93IHVwIHBhdGNoIHRvIGFsbG93 IGEgY3VycmVudCBhbmQKYSBzdGFnZWQgY29uZmlnIHRvIGV4aXN0IGZvciB0aGUgc2FtZSBzaGFy ZWQgRFBMTC4KCnYyOiBSZWJhc2Ugb24gYnkgbWFza190b19yZWZjb3VudCgpLT5od2VpZ2h0MzIo KSBjaGFuZ2UuIChEYW1pZW4pCgpTaWduZWQtb2ZmLWJ5OiBBbmRlciBDb25zZWx2YW4gZGUgT2xp dmVpcmEgPGFuZGVyLmNvbnNlbHZhbi5kZS5vbGl2ZWlyYUBpbnRlbC5jb20+ClJldmlld2VkLWJ5 OiBEYW1pZW4gTGVzcGlhdSA8ZGFtaWVuLmxlc3BpYXVAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jICB8IDEzICsrKystLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oICAgICAgfCAgOCArKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGRpLmMgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYyB8IDYwICsrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQogNCBmaWxlcyBj aGFuZ2VkLCA0NSBpbnNlcnRpb25zKCspLCAzOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZGVidWdmcy5jCmluZGV4IGNlMzJhZTcuLjBhNjk4MTMgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZGVidWdmcy5jCkBAIC0yNjMxLDEzICsyNjMxLDE0IEBAIHN0YXRpYyBpbnQgaTkxNV9z aGFyZWRfZHBsbHNfaW5mbyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKnVudXNlZCkKIAogCQlz ZXFfcHJpbnRmKG0sICJEUExMJWk6ICVzLCBpZDogJWlcbiIsIGksIHBsbC0+bmFtZSwgcGxsLT5p ZCk7CiAJCXNlcV9wcmludGYobSwgIiBjcnRjX21hc2s6IDB4JTA4eCwgYWN0aXZlOiAlZCwgb246 ICVzXG4iLAotCQkJICAgcGxsLT5jcnRjX21hc2ssIHBsbC0+YWN0aXZlLCB5ZXNubyhwbGwtPm9u KSk7CisJCQkgICBwbGwtPmNvbmZpZy5jcnRjX21hc2ssIHBsbC0+YWN0aXZlLCB5ZXNubyhwbGwt Pm9uKSk7CiAJCXNlcV9wcmludGYobSwgIiB0cmFja2VkIGhhcmR3YXJlIHN0YXRlOlxuIik7Ci0J CXNlcV9wcmludGYobSwgIiBkcGxsOiAgICAweCUwOHhcbiIsIHBsbC0+aHdfc3RhdGUuZHBsbCk7 Ci0JCXNlcV9wcmludGYobSwgIiBkcGxsX21kOiAweCUwOHhcbiIsIHBsbC0+aHdfc3RhdGUuZHBs bF9tZCk7Ci0JCXNlcV9wcmludGYobSwgIiBmcDA6ICAgICAweCUwOHhcbiIsIHBsbC0+aHdfc3Rh dGUuZnAwKTsKLQkJc2VxX3ByaW50ZihtLCAiIGZwMTogICAgIDB4JTA4eFxuIiwgcGxsLT5od19z dGF0ZS5mcDEpOwotCQlzZXFfcHJpbnRmKG0sICIgd3JwbGw6ICAgMHglMDh4XG4iLCBwbGwtPmh3 X3N0YXRlLndycGxsKTsKKwkJc2VxX3ByaW50ZihtLCAiIGRwbGw6ICAgIDB4JTA4eFxuIiwgcGxs LT5jb25maWcuaHdfc3RhdGUuZHBsbCk7CisJCXNlcV9wcmludGYobSwgIiBkcGxsX21kOiAweCUw OHhcbiIsCisJCQkgICBwbGwtPmNvbmZpZy5od19zdGF0ZS5kcGxsX21kKTsKKwkJc2VxX3ByaW50 ZihtLCAiIGZwMDogICAgIDB4JTA4eFxuIiwgcGxsLT5jb25maWcuaHdfc3RhdGUuZnAwKTsKKwkJ c2VxX3ByaW50ZihtLCAiIGZwMTogICAgIDB4JTA4eFxuIiwgcGxsLT5jb25maWcuaHdfc3RhdGUu ZnAxKTsKKwkJc2VxX3ByaW50ZihtLCAiIHdycGxsOiAgIDB4JTA4eFxuIiwgcGxsLT5jb25maWcu aHdfc3RhdGUud3JwbGwpOwogCX0KIAlkcm1fbW9kZXNldF91bmxvY2tfYWxsKGRldik7CiAKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGM1MWY5ZGUuLjRiM2MwMGYgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaApAQCAtMjI2LDE0ICsyMjYsMTggQEAgc3RydWN0IGludGVsX2RwbGxfaHdfc3Rh dGUgewogCXVpbnQzMl90IHdycGxsOwogfTsKIAotc3RydWN0IGludGVsX3NoYXJlZF9kcGxsIHsK K3N0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbF9jb25maWcgewogCXVuc2lnbmVkIGNydGNfbWFzazsg LyogbWFzayBvZiBDUlRDcyBzaGFyaW5nIHRoaXMgUExMICovCisJc3RydWN0IGludGVsX2RwbGxf aHdfc3RhdGUgaHdfc3RhdGU7Cit9OworCitzdHJ1Y3QgaW50ZWxfc2hhcmVkX2RwbGwgeworCXN0 cnVjdCBpbnRlbF9zaGFyZWRfZHBsbF9jb25maWcgY29uZmlnOwogCWludCBhY3RpdmU7IC8qIGNv dW50IG9mIG51bWJlciBvZiBhY3RpdmUgQ1JUQ3MgKGkuZS4gRFBNUyBvbikgKi8KIAlib29sIG9u OyAvKiBpcyB0aGUgUExMIGFjdHVhbGx5IGFjdGl2ZT8gRGlzYWJsZWQgZHVyaW5nIG1vZGVzZXQg Ki8KIAljb25zdCBjaGFyICpuYW1lOwogCS8qIHNob3VsZCBtYXRjaCB0aGUgaW5kZXggaW4gdGhl IGRldl9wcml2LT5zaGFyZWRfZHBsbHMgYXJyYXkgKi8KIAllbnVtIGludGVsX2RwbGxfaWQgaWQ7 Ci0Jc3RydWN0IGludGVsX2RwbGxfaHdfc3RhdGUgaHdfc3RhdGU7CiAJLyogVGhlIG1vZGVfc2V0 IGhvb2sgaXMgb3B0aW9uYWwgYW5kIHNob3VsZCBiZSB1c2VkIHRvZ2V0aGVyIHdpdGggdGhlCiAJ ICogaW50ZWxfcHJlcGFyZV9zaGFyZWRfZHBsbCBmdW5jdGlvbi4gKi8KIAl2b2lkICgqbW9kZV9z ZXQpKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGRpLmMKaW5kZXggYzYxM2NlZS4uMGE5ODhkZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGRpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMK QEAgLTEzMzMsNyArMTMzMyw3IEBAIGludCBpbnRlbF9kZGlfZ2V0X2NkY2xrX2ZyZXEoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogc3RhdGljIHZvaWQgaHN3X2RkaV9wbGxfZW5h YmxlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCSAgICAgICBzdHJ1Y3Qg aW50ZWxfc2hhcmVkX2RwbGwgKnBsbCkKIHsKLQlJOTE1X1dSSVRFKFdSUExMX0NUTChwbGwtPmlk KSwgcGxsLT5od19zdGF0ZS53cnBsbCk7CisJSTkxNV9XUklURShXUlBMTF9DVEwocGxsLT5pZCks IHBsbC0+Y29uZmlnLmh3X3N0YXRlLndycGxsKTsKIAlQT1NUSU5HX1JFQUQoV1JQTExfQ1RMKHBs bC0+aWQpKTsKIAl1ZGVsYXkoMjApOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CmluZGV4IDE4YTFiODMuLmFmZjlhYTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKQEAgLTE3NzksNyArMTc3OSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3ByZXBhcmVfc2hhcmVk X2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJaWYgKFdBUk5fT04ocGxsID09IE5VTEwp KQogCQlyZXR1cm47CiAKLQlXQVJOX09OKCFwbGwtPmNydGNfbWFzayk7CisJV0FSTl9PTighcGxs LT5jb25maWcuY3J0Y19tYXNrKTsKIAlpZiAocGxsLT5hY3RpdmUgPT0gMCkgewogCQlEUk1fREVC VUdfRFJJVkVSKCJzZXR0aW5nIHVwICVzXG4iLCBwbGwtPm5hbWUpOwogCQlXQVJOX09OKHBsbC0+ b24pOwpAQCAtMTgwNiw3ICsxODA2LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZW5hYmxlX3NoYXJl ZF9kcGxsKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCWlmIChXQVJOX09OKHBsbCA9PSBOVUxM KSkKIAkJcmV0dXJuOwogCi0JaWYgKFdBUk5fT04ocGxsLT5jcnRjX21hc2sgPT0gMCkpCisJaWYg KFdBUk5fT04ocGxsLT5jb25maWcuY3J0Y19tYXNrID09IDApKQogCQlyZXR1cm47CiAKIAlEUk1f REVCVUdfS01TKCJlbmFibGUgJXMgKGFjdGl2ZSAlZCwgb24/ICVkKSBmb3IgY3J0YyAlZFxuIiwK QEAgLTE4MzgsNyArMTgzOCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2Rpc2FibGVfc2hhcmVkX2Rw bGwoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJaWYgKFdBUk5fT04ocGxsID09IE5VTEwpKQog CSAgICAgICByZXR1cm47CiAKLQlpZiAoV0FSTl9PTihwbGwtPmNydGNfbWFzayA9PSAwKSkKKwlp ZiAoV0FSTl9PTihwbGwtPmNvbmZpZy5jcnRjX21hc2sgPT0gMCkpCiAJCXJldHVybjsKIAogCURS TV9ERUJVR19LTVMoImRpc2FibGUgJXMgKGFjdGl2ZSAlZCwgb24/ICVkKSBmb3IgY3J0YyAlZFxu IiwKQEAgLTM4NDIsMTMgKzM4NDIsMTMgQEAgdm9pZCBpbnRlbF9wdXRfc2hhcmVkX2RwbGwoc3Ry dWN0IGludGVsX2NydGMgKmNydGMpCiAJaWYgKHBsbCA9PSBOVUxMKQogCQlyZXR1cm47CiAKLQlp ZiAoIShwbGwtPmNydGNfbWFzayAmICgxIDw8IGNydGMtPnBpcGUpKSkgeworCWlmICghKHBsbC0+ Y29uZmlnLmNydGNfbWFzayAmICgxIDw8IGNydGMtPnBpcGUpKSkgewogCQlXQVJOKDEsICJiYWQg JXMgY3J0YyBtYXNrXG4iLCBwbGwtPm5hbWUpOwogCQlyZXR1cm47CiAJfQogCi0JcGxsLT5jcnRj X21hc2sgJj0gfigxIDw8IGNydGMtPnBpcGUpOwotCWlmIChwbGwtPmNydGNfbWFzayA9PSAwKSB7 CisJcGxsLT5jb25maWcuY3J0Y19tYXNrICY9IH4oMSA8PCBjcnRjLT5waXBlKTsKKwlpZiAocGxs LT5jb25maWcuY3J0Y19tYXNrID09IDApIHsKIAkJV0FSTl9PTihwbGwtPm9uKTsKIAkJV0FSTl9P TihwbGwtPmFjdGl2ZSk7CiAJfQpAQCAtMzg3Niw3ICszODc2LDcgQEAgc3RydWN0IGludGVsX3No YXJlZF9kcGxsICppbnRlbF9nZXRfc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMp CiAJCURSTV9ERUJVR19LTVMoIkNSVEM6JWQgdXNpbmcgcHJlLWFsbG9jYXRlZCAlc1xuIiwKIAkJ CSAgICAgIGNydGMtPmJhc2UuYmFzZS5pZCwgcGxsLT5uYW1lKTsKIAotCQlXQVJOX09OKHBsbC0+ Y3J0Y19tYXNrKTsKKwkJV0FSTl9PTihwbGwtPmNvbmZpZy5jcnRjX21hc2spOwogCiAJCWdvdG8g Zm91bmQ7CiAJfQpAQCAtMzg4NSwxNSArMzg4NSwxNiBAQCBzdHJ1Y3QgaW50ZWxfc2hhcmVkX2Rw bGwgKmludGVsX2dldF9zaGFyZWRfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkJcGxs ID0gJmRldl9wcml2LT5zaGFyZWRfZHBsbHNbaV07CiAKIAkJLyogT25seSB3YW50IHRvIGNoZWNr IGVuYWJsZWQgdGltaW5ncyBmaXJzdCAqLwotCQlpZiAocGxsLT5jcnRjX21hc2sgPT0gMCkKKwkJ aWYgKHBsbC0+Y29uZmlnLmNydGNfbWFzayA9PSAwKQogCQkJY29udGludWU7CiAKLQkJaWYgKG1l bWNtcCgmY3J0Yy0+Y29uZmlnLmRwbGxfaHdfc3RhdGUsICZwbGwtPmh3X3N0YXRlLAotCQkJICAg c2l6ZW9mKHBsbC0+aHdfc3RhdGUpKSA9PSAwKSB7CisJCWlmIChtZW1jbXAoJmNydGMtPmNvbmZp Zy5kcGxsX2h3X3N0YXRlLAorCQkJICAgJnBsbC0+Y29uZmlnLmh3X3N0YXRlLAorCQkJICAgc2l6 ZW9mKHBsbC0+Y29uZmlnLmh3X3N0YXRlKSkgPT0gMCkgewogCQkJRFJNX0RFQlVHX0tNUygiQ1JU QzolZCBzaGFyaW5nIGV4aXN0aW5nICVzICIKIAkJCQkgICAgICAiKGNydGNfbWFzayAweCUwOHgs IGFjdGl2ZSAlZClcbiIsCiAJCQkJICAgICAgY3J0Yy0+YmFzZS5iYXNlLmlkLCBwbGwtPm5hbWUs Ci0JCQkJICAgICAgcGxsLT5jcnRjX21hc2ssIHBsbC0+YWN0aXZlKTsKKwkJCQkgICAgICBwbGwt PmNvbmZpZy5jcnRjX21hc2ssIHBsbC0+YWN0aXZlKTsKIAogCQkJZ290byBmb3VuZDsKIAkJfQpA QCAtMzkwMiw3ICszOTAzLDcgQEAgc3RydWN0IGludGVsX3NoYXJlZF9kcGxsICppbnRlbF9nZXRf c2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJLyogT2sgbm8gbWF0Y2hpbmcg dGltaW5ncywgbWF5YmUgdGhlcmUncyBhIGZyZWUgb25lPyAqLwogCWZvciAoaSA9IDA7IGkgPCBk ZXZfcHJpdi0+bnVtX3NoYXJlZF9kcGxsOyBpKyspIHsKIAkJcGxsID0gJmRldl9wcml2LT5zaGFy ZWRfZHBsbHNbaV07Ci0JCWlmIChwbGwtPmNydGNfbWFzayA9PSAwKSB7CisJCWlmIChwbGwtPmNv bmZpZy5jcnRjX21hc2sgPT0gMCkgewogCQkJRFJNX0RFQlVHX0tNUygiQ1JUQzolZCBhbGxvY2F0 ZWQgJXNcbiIsCiAJCQkJICAgICAgY3J0Yy0+YmFzZS5iYXNlLmlkLCBwbGwtPm5hbWUpOwogCQkJ Z290byBmb3VuZDsKQEAgLTM5MTIsMTQgKzM5MTMsMTQgQEAgc3RydWN0IGludGVsX3NoYXJlZF9k cGxsICppbnRlbF9nZXRfc2hhcmVkX2RwbGwoc3RydWN0IGludGVsX2NydGMgKmNydGMpCiAJcmV0 dXJuIE5VTEw7CiAKIGZvdW5kOgotCWlmIChwbGwtPmNydGNfbWFzayA9PSAwKQotCQlwbGwtPmh3 X3N0YXRlID0gY3J0Yy0+Y29uZmlnLmRwbGxfaHdfc3RhdGU7CisJaWYgKHBsbC0+Y29uZmlnLmNy dGNfbWFzayA9PSAwKQorCQlwbGwtPmNvbmZpZy5od19zdGF0ZSA9IGNydGMtPmNvbmZpZy5kcGxs X2h3X3N0YXRlOwogCiAJY3J0Yy0+Y29uZmlnLnNoYXJlZF9kcGxsID0gaTsKIAlEUk1fREVCVUdf RFJJVkVSKCJ1c2luZyAlcyBmb3IgcGlwZSAlY1xuIiwgcGxsLT5uYW1lLAogCQkJIHBpcGVfbmFt ZShjcnRjLT5waXBlKSk7CiAKLQlwbGwtPmNydGNfbWFzayB8PSAxIDw8IGNydGMtPnBpcGU7CisJ cGxsLT5jb25maWcuY3J0Y19tYXNrIHw9IDEgPDwgY3J0Yy0+cGlwZTsKIAogCXJldHVybiBwbGw7 CiB9CkBAIC0xMDU5Niw5ICsxMDU5Nyw5IEBAIGNoZWNrX3NoYXJlZF9kcGxsX3N0YXRlKHN0cnVj dCBkcm1fZGV2aWNlICpkZXYpCiAKIAkJYWN0aXZlID0gcGxsLT5nZXRfaHdfc3RhdGUoZGV2X3By aXYsIHBsbCwgJmRwbGxfaHdfc3RhdGUpOwogCi0JCVdBUk4ocGxsLT5hY3RpdmUgPiBod2VpZ2h0 MzIocGxsLT5jcnRjX21hc2spLAorCQlXQVJOKHBsbC0+YWN0aXZlID4gaHdlaWdodDMyKHBsbC0+ Y29uZmlnLmNydGNfbWFzayksCiAJCSAgICAgIm1vcmUgYWN0aXZlIHBsbCB1c2VycyB0aGFuIHJl ZmVyZW5jZXM6ICVpIHZzICVpXG4iLAotCQkgICAgIHBsbC0+YWN0aXZlLCBod2VpZ2h0MzIocGxs LT5jcnRjX21hc2spKTsKKwkJICAgICBwbGwtPmFjdGl2ZSwgaHdlaWdodDMyKHBsbC0+Y29uZmln LmNydGNfbWFzaykpOwogCQlXQVJOKHBsbC0+YWN0aXZlICYmICFwbGwtPm9uLAogCQkgICAgICJw bGwgaW4gYWN0aXZlIHVzZSBidXQgbm90IG9uIGluIHN3IHRyYWNraW5nXG4iKTsKIAkJV0FSTihw bGwtPm9uICYmICFwbGwtPmFjdGl2ZSwKQEAgLTEwNjE2LDExICsxMDYxNywxMSBAQCBjaGVja19z aGFyZWRfZHBsbF9zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlXQVJOKHBsbC0+YWN0 aXZlICE9IGFjdGl2ZV9jcnRjcywKIAkJICAgICAicGxsIGFjdGl2ZSBjcnRjcyBtaXNtYXRjaCAo ZXhwZWN0ZWQgJWksIGZvdW5kICVpKVxuIiwKIAkJICAgICBwbGwtPmFjdGl2ZSwgYWN0aXZlX2Ny dGNzKTsKLQkJV0FSTihod2VpZ2h0MzIocGxsLT5jcnRjX21hc2spICE9IGVuYWJsZWRfY3J0Y3Ms CisJCVdBUk4oaHdlaWdodDMyKHBsbC0+Y29uZmlnLmNydGNfbWFzaykgIT0gZW5hYmxlZF9jcnRj cywKIAkJICAgICAicGxsIGVuYWJsZWQgY3J0Y3MgbWlzbWF0Y2ggKGV4cGVjdGVkICVpLCBmb3Vu ZCAlaSlcbiIsCi0JCSAgICAgaHdlaWdodDMyKHBsbC0+Y3J0Y19tYXNrKSwgZW5hYmxlZF9jcnRj cyk7CisJCSAgICAgaHdlaWdodDMyKHBsbC0+Y29uZmlnLmNydGNfbWFzayksIGVuYWJsZWRfY3J0 Y3MpOwogCi0JCVdBUk4ocGxsLT5vbiAmJiBtZW1jbXAoJnBsbC0+aHdfc3RhdGUsICZkcGxsX2h3 X3N0YXRlLAorCQlXQVJOKHBsbC0+b24gJiYgbWVtY21wKCZwbGwtPmNvbmZpZy5od19zdGF0ZSwg JmRwbGxfaHdfc3RhdGUsCiAJCQkJICAgICAgIHNpemVvZihkcGxsX2h3X3N0YXRlKSksCiAJCSAg ICAgInBsbCBodyBzdGF0ZSBtaXNtYXRjaFxuIik7CiAJfQpAQCAtMTEyOTUsOCArMTEyOTYsOCBA QCBzdGF0aWMgYm9vbCBpYnhfcGNoX2RwbGxfZ2V0X2h3X3N0YXRlKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwKIHN0YXRpYyB2b2lkIGlieF9wY2hfZHBsbF9tb2RlX3NldChzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQkJICBzdHJ1Y3QgaW50ZWxfc2hhcmVk X2RwbGwgKnBsbCkKIHsKLQlJOTE1X1dSSVRFKFBDSF9GUDAocGxsLT5pZCksIHBsbC0+aHdfc3Rh dGUuZnAwKTsKLQlJOTE1X1dSSVRFKFBDSF9GUDEocGxsLT5pZCksIHBsbC0+aHdfc3RhdGUuZnAx KTsKKwlJOTE1X1dSSVRFKFBDSF9GUDAocGxsLT5pZCksIHBsbC0+Y29uZmlnLmh3X3N0YXRlLmZw MCk7CisJSTkxNV9XUklURShQQ0hfRlAxKHBsbC0+aWQpLCBwbGwtPmNvbmZpZy5od19zdGF0ZS5m cDEpOwogfQogCiBzdGF0aWMgdm9pZCBpYnhfcGNoX2RwbGxfZW5hYmxlKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKQEAgLTExMzA1LDcgKzExMzA2LDcgQEAgc3RhdGljIHZvaWQg aWJ4X3BjaF9kcGxsX2VuYWJsZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJ LyogUENIIHJlZmNsb2NrIG11c3QgYmUgZW5hYmxlZCBmaXJzdCAqLwogCWlieF9hc3NlcnRfcGNo X3JlZmNsa19lbmFibGVkKGRldl9wcml2KTsKIAotCUk5MTVfV1JJVEUoUENIX0RQTEwocGxsLT5p ZCksIHBsbC0+aHdfc3RhdGUuZHBsbCk7CisJSTkxNV9XUklURShQQ0hfRFBMTChwbGwtPmlkKSwg cGxsLT5jb25maWcuaHdfc3RhdGUuZHBsbCk7CiAKIAkvKiBXYWl0IGZvciB0aGUgY2xvY2tzIHRv IHN0YWJpbGl6ZS4gKi8KIAlQT1NUSU5HX1JFQUQoUENIX0RQTEwocGxsLT5pZCkpOwpAQCAtMTEz MTYsNyArMTEzMTcsNyBAQCBzdGF0aWMgdm9pZCBpYnhfcGNoX2RwbGxfZW5hYmxlKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkgKgogCSAqIFNvIHdyaXRlIGl0IGFnYWluLgog CSAqLwotCUk5MTVfV1JJVEUoUENIX0RQTEwocGxsLT5pZCksIHBsbC0+aHdfc3RhdGUuZHBsbCk7 CisJSTkxNV9XUklURShQQ0hfRFBMTChwbGwtPmlkKSwgcGxsLT5jb25maWcuaHdfc3RhdGUuZHBs bCk7CiAJUE9TVElOR19SRUFEKFBDSF9EUExMKHBsbC0+aWQpKTsKIAl1ZGVsYXkoMjAwKTsKIH0K QEAgLTEzMDY3LDIwICsxMzA2OCwyMSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X3JlYWRv dXRfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlmb3IgKGkgPSAwOyBpIDwgZGV2 X3ByaXYtPm51bV9zaGFyZWRfZHBsbDsgaSsrKSB7CiAJCXN0cnVjdCBpbnRlbF9zaGFyZWRfZHBs bCAqcGxsID0gJmRldl9wcml2LT5zaGFyZWRfZHBsbHNbaV07CiAKLQkJcGxsLT5vbiA9IHBsbC0+ Z2V0X2h3X3N0YXRlKGRldl9wcml2LCBwbGwsICZwbGwtPmh3X3N0YXRlKTsKKwkJcGxsLT5vbiA9 IHBsbC0+Z2V0X2h3X3N0YXRlKGRldl9wcml2LCBwbGwsCisJCQkJCSAgICAmcGxsLT5jb25maWcu aHdfc3RhdGUpOwogCQlwbGwtPmFjdGl2ZSA9IDA7Ci0JCXBsbC0+Y3J0Y19tYXNrID0gMDsKKwkJ cGxsLT5jb25maWcuY3J0Y19tYXNrID0gMDsKIAkJZm9yX2VhY2hfaW50ZWxfY3J0YyhkZXYsIGNy dGMpIHsKIAkJCWlmIChjcnRjLT5hY3RpdmUgJiYgaW50ZWxfY3J0Y190b19zaGFyZWRfZHBsbChj cnRjKSA9PSBwbGwpIHsKIAkJCQlwbGwtPmFjdGl2ZSsrOwotCQkJCXBsbC0+Y3J0Y19tYXNrIHw9 IDEgPDwgY3J0Yy0+cGlwZTsKKwkJCQlwbGwtPmNvbmZpZy5jcnRjX21hc2sgfD0gMSA8PCBjcnRj LT5waXBlOwogCQkJfQogCQl9CiAKIAkJRFJNX0RFQlVHX0tNUygiJXMgaHcgc3RhdGUgcmVhZG91 dDogY3J0Y19tYXNrIDB4JTA4eCwgb24gJWlcbiIsCi0JCQkgICAgICBwbGwtPm5hbWUsIHBsbC0+ Y3J0Y19tYXNrLCBwbGwtPm9uKTsKKwkJCSAgICAgIHBsbC0+bmFtZSwgcGxsLT5jb25maWcuY3J0 Y19tYXNrLCBwbGwtPm9uKTsKIAotCQlpZiAocGxsLT5jcnRjX21hc2spCisJCWlmIChwbGwtPmNv bmZpZy5jcnRjX21hc2spCiAJCQlpbnRlbF9kaXNwbGF5X3Bvd2VyX2dldChkZXZfcHJpdiwgUE9X RVJfRE9NQUlOX1BMTFMpOwogCX0KIAotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==