From: Tvrtko Ursulin Subject: [CI 3/3] drm/i915: Move dev_priv->pm_i{m, e}r into intel_gt Date: Wed, 3 Jul 2019 10:45:18 +0100 Message-ID: <20190703094518.20201-3-tvrtko.ursulin@linux.intel.com> References: <20190703094518.20201-1-tvrtko.ursulin@linux.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 ESMTPS id B541E6E108 for ; Wed, 3 Jul 2019 09:45:21 +0000 (UTC) In-Reply-To: <20190703094518.20201-1-tvrtko.ursulin@linux.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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClBNIGludGVy cnVwdHMgYmVsb25nIHRvIHRoZSBHVCBzbyBtb3ZlIHRoZSB2YXJpYWJsZXMgdG8gYmUgaW5zaWRl CnN0cnVjdCBpbnRlbF9ndC4KClNpZ25lZC1vZmYtYnk6IFBhdWxvIFphbm9uaSA8cGF1bG8uci56 YW5vbmlAaW50ZWwuY29tPgpDby1kZXZlbG9wZWQtYnk6IFBhdWxvIFphbm9uaSA8cGF1bG8uci56 YW5vbmlAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVy c3VsaW5AaW50ZWwuY29tPgpDYzogRGFuaWVsZSBDZXJhb2xvIFNwdXJpbyA8ZGFuaWVsZS5jZXJh b2xvc3B1cmlvQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hy aXMtd2lsc29uLmNvLnVrPgpBY2tlZC1ieTogRGFuaWVsZSBDZXJhb2xvIFNwdXJpbyA8ZGFuaWVs ZS5jZXJhb2xvc3B1cmlvQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9p bnRlbF9ndF90eXBlcy5oICAgfCAgIDMgKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvZ3QvaW50ZWxf cmluZ2J1ZmZlci5jIHwgICA0ICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAg ICAgICAgICAgfCAgIDIgLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyAgICAgICAg ICAgIHwgMTIxICsrKysrKysrKysrLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9pcnEuaCAgICAgICAgICAgIHwgICA0ICstCiA1IGZpbGVzIGNoYW5nZWQsIDcxIGluc2VydGlv bnMoKyksIDYzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2d0L2ludGVsX2d0X3R5cGVzLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRlbF9ndF90 eXBlcy5oCmluZGV4IGMwM2U1NjYyOGVlMi4uMzdkYTQyOGJlZjYyIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRlbF9ndF90eXBlcy5oCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2d0L2ludGVsX2d0X3R5cGVzLmgKQEAgLTU1LDYgKzU1LDkgQEAgc3RydWN0IGludGVs X2d0IHsKIAlrdGltZV90IGxhc3RfaW5pdF90aW1lOwogCiAJc3RydWN0IGk5MTVfdm1hICpzY3Jh dGNoOworCisJdTMyIHBtX2ltcjsKKwl1MzIgcG1faWVyOwogfTsKIAogI2VuZGlmIC8qIF9fSU5U RUxfR1RfVFlQRVNfSF9fICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9p bnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9ndC9pbnRlbF9yaW5nYnVm ZmVyLmMKaW5kZXggODFmOWIwNDIyZTZhLi5kOTIyNmFkYTAxM2YgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2d0L2ludGVsX3JpbmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9ndC9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTEwNDEsMTQgKzEwNDEsMTQgQEAgaHN3 X3ZlYm94X2lycV9lbmFibGUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCS8qIEZs dXNoL2RlbGF5IHRvIGVuc3VyZSB0aGUgUklOR19JTVIgaXMgYWN0aXZlIGJlZm9yZSB0aGUgR1Qg SU1SICovCiAJRU5HSU5FX1BPU1RJTkdfUkVBRChlbmdpbmUsIFJJTkdfSU1SKTsKIAotCWdlbjZf dW5tYXNrX3BtX2lycShlbmdpbmUtPmk5MTUsIGVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrKTsKKwln ZW42X3VubWFza19wbV9pcnEoZW5naW5lLT5ndCwgZW5naW5lLT5pcnFfZW5hYmxlX21hc2spOwog fQogCiBzdGF0aWMgdm9pZAogaHN3X3ZlYm94X2lycV9kaXNhYmxlKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKmVuZ2luZSkKIHsKIAlFTkdJTkVfV1JJVEUoZW5naW5lLCBSSU5HX0lNUiwgfjApOwot CWdlbjZfbWFza19wbV9pcnEoZW5naW5lLT5pOTE1LCBlbmdpbmUtPmlycV9lbmFibGVfbWFzayk7 CisJZ2VuNl9tYXNrX3BtX2lycShlbmdpbmUtPmd0LCBlbmdpbmUtPmlycV9lbmFibGVfbWFzayk7 CiB9CiAKIHN0YXRpYyBpbnQKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDA5ZTA5ZDI2ZTY3 ZC4uNzVjNDQ5MzcyZDI1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTE0MDMsOCArMTQw Myw2IEBAIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlIHsKIAkJdTMyIGRlX2lycV9tYXNrW0k5MTVf TUFYX1BJUEVTXTsKIAl9OwogCXUzMiBndF9pcnFfbWFzazsKLQl1MzIgcG1faW1yOwotCXUzMiBw bV9pZXI7CiAJdTMyIHBtX3Jwc19ldmVudHM7CiAJdTMyIHBtX2d1Y19ldmVudHM7CiAJdTMyIHBp cGVzdGF0X2lycV9tYXNrW0k5MTVfTUFYX1BJUEVTXTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCmlu ZGV4IDgxN2RlZmYyMGJkZC4uYmRmZGQ4ODQzNjI3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2lycS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMK QEAgLTQwOSw1MCArNDA5LDU0IEBAIHN0YXRpYyBpOTE1X3JlZ190IGdlbjZfcG1faWlyKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlyZXR1cm4gSU5URUxfR0VOKGRldl9wcml2 KSA+PSA4ID8gR0VOOF9HVF9JSVIoMikgOiBHRU42X1BNSUlSOwogfQogCi1zdGF0aWMgdm9pZCB3 cml0ZV9wbV9pbXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQorc3RhdGljIHZv aWQgd3JpdGVfcG1faW1yKHN0cnVjdCBpbnRlbF9ndCAqZ3QpCiB7CisJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmk5MTUgPSBndC0+aTkxNTsKKwlzdHJ1Y3QgaW50ZWxfdW5jb3JlICp1bmNvcmUg PSBndC0+dW5jb3JlOworCXUzMiBtYXNrID0gZ3QtPnBtX2ltcjsKIAlpOTE1X3JlZ190IHJlZzsK LQl1MzIgbWFzayA9IGRldl9wcml2LT5wbV9pbXI7CiAKLQlpZiAoSU5URUxfR0VOKGRldl9wcml2 KSA+PSAxMSkgeworCWlmIChJTlRFTF9HRU4oaTkxNSkgPj0gMTEpIHsKIAkJcmVnID0gR0VOMTFf R1BNX1dHQk9YUEVSRl9JTlRSX01BU0s7CiAJCS8qIHBtIGlzIGluIHVwcGVyIGhhbGYgKi8KIAkJ bWFzayA9IG1hc2sgPDwgMTY7Ci0JfSBlbHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDgp IHsKKwl9IGVsc2UgaWYgKElOVEVMX0dFTihpOTE1KSA+PSA4KSB7CiAJCXJlZyA9IEdFTjhfR1Rf SU1SKDIpOwogCX0gZWxzZSB7CiAJCXJlZyA9IEdFTjZfUE1JTVI7CiAJfQogCi0JSTkxNV9XUklU RShyZWcsIG1hc2spOwotCVBPU1RJTkdfUkVBRChyZWcpOworCWludGVsX3VuY29yZV93cml0ZSh1 bmNvcmUsIHJlZywgbWFzayk7CisJaW50ZWxfdW5jb3JlX3Bvc3RpbmdfcmVhZCh1bmNvcmUsIHJl Zyk7CiB9CiAKLXN0YXRpYyB2b2lkIHdyaXRlX3BtX2llcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpCitzdGF0aWMgdm9pZCB3cml0ZV9wbV9pZXIoc3RydWN0IGludGVsX2d0ICpn dCkKIHsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSA9IGd0LT5pOTE1OworCXN0cnVj dCBpbnRlbF91bmNvcmUgKnVuY29yZSA9IGd0LT51bmNvcmU7CisJdTMyIG1hc2sgPSBndC0+cG1f aWVyOwogCWk5MTVfcmVnX3QgcmVnOwotCXUzMiBtYXNrID0gZGV2X3ByaXYtPnBtX2llcjsKIAot CWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDExKSB7CisJaWYgKElOVEVMX0dFTihpOTE1KSA+ PSAxMSkgewogCQlyZWcgPSBHRU4xMV9HUE1fV0dCT1hQRVJGX0lOVFJfRU5BQkxFOwogCQkvKiBw bSBpcyBpbiB1cHBlciBoYWxmICovCiAJCW1hc2sgPSBtYXNrIDw8IDE2OwotCX0gZWxzZSBpZiAo SU5URUxfR0VOKGRldl9wcml2KSA+PSA4KSB7CisJfSBlbHNlIGlmIChJTlRFTF9HRU4oaTkxNSkg Pj0gOCkgewogCQlyZWcgPSBHRU44X0dUX0lFUigyKTsKIAl9IGVsc2UgewogCQlyZWcgPSBHRU42 X1BNSUVSOwogCX0KIAotCUk5MTVfV1JJVEUocmVnLCBtYXNrKTsKKwlpbnRlbF91bmNvcmVfd3Jp dGUodW5jb3JlLCByZWcsIG1hc2spOwogfQogCiAvKioKICAqIHNuYl91cGRhdGVfcG1faXJxIC0g dXBkYXRlIEdFTjZfUE1JTVIKLSAqIEBkZXZfcHJpdjogZHJpdmVyIHByaXZhdGUKKyAqIEBndDog Z3QgZm9yIHRoZSBpbnRlcnJ1cHRzCiAgKiBAaW50ZXJydXB0X21hc2s6IG1hc2sgb2YgaW50ZXJy dXB0IGJpdHMgdG8gdXBkYXRlCiAgKiBAZW5hYmxlZF9pcnFfbWFzazogbWFzayBvZiBpbnRlcnJ1 cHQgYml0cyB0byBlbmFibGUKICAqLwotc3RhdGljIHZvaWQgc25iX3VwZGF0ZV9wbV9pcnEoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAorc3RhdGljIHZvaWQgc25iX3VwZGF0ZV9w bV9pcnEoc3RydWN0IGludGVsX2d0ICpndCwKIAkJCSAgICAgIHUzMiBpbnRlcnJ1cHRfbWFzaywK IAkJCSAgICAgIHUzMiBlbmFibGVkX2lycV9tYXNrKQogewpAQCAtNDYwLDM3ICs0NjQsMzcgQEAg c3RhdGljIHZvaWQgc25iX3VwZGF0ZV9wbV9pcnEoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2LAogCiAJV0FSTl9PTihlbmFibGVkX2lycV9tYXNrICYgfmludGVycnVwdF9tYXNrKTsK IAotCWxvY2tkZXBfYXNzZXJ0X2hlbGQoJmRldl9wcml2LT5pcnFfbG9jayk7CisJbG9ja2RlcF9h c3NlcnRfaGVsZCgmZ3QtPmk5MTUtPmlycV9sb2NrKTsKIAotCW5ld192YWwgPSBkZXZfcHJpdi0+ cG1faW1yOworCW5ld192YWwgPSBndC0+cG1faW1yOwogCW5ld192YWwgJj0gfmludGVycnVwdF9t YXNrOwogCW5ld192YWwgfD0gKH5lbmFibGVkX2lycV9tYXNrICYgaW50ZXJydXB0X21hc2spOwog Ci0JaWYgKG5ld192YWwgIT0gZGV2X3ByaXYtPnBtX2ltcikgewotCQlkZXZfcHJpdi0+cG1faW1y ID0gbmV3X3ZhbDsKLQkJd3JpdGVfcG1faW1yKGRldl9wcml2KTsKKwlpZiAobmV3X3ZhbCAhPSBn dC0+cG1faW1yKSB7CisJCWd0LT5wbV9pbXIgPSBuZXdfdmFsOworCQl3cml0ZV9wbV9pbXIoZ3Qp OwogCX0KIH0KIAotdm9pZCBnZW42X3VubWFza19wbV9pcnEoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2LCB1MzIgbWFzaykKK3ZvaWQgZ2VuNl91bm1hc2tfcG1faXJxKHN0cnVjdCBp bnRlbF9ndCAqZ3QsIHUzMiBtYXNrKQogewotCWlmIChXQVJOX09OKCFpbnRlbF9pcnFzX2VuYWJs ZWQoZGV2X3ByaXYpKSkKKwlpZiAoV0FSTl9PTighaW50ZWxfaXJxc19lbmFibGVkKGd0LT5pOTE1 KSkpCiAJCXJldHVybjsKIAotCXNuYl91cGRhdGVfcG1faXJxKGRldl9wcml2LCBtYXNrLCBtYXNr KTsKKwlzbmJfdXBkYXRlX3BtX2lycShndCwgbWFzaywgbWFzayk7CiB9CiAKLXN0YXRpYyB2b2lk IF9fZ2VuNl9tYXNrX3BtX2lycShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHUz MiBtYXNrKQorc3RhdGljIHZvaWQgX19nZW42X21hc2tfcG1faXJxKHN0cnVjdCBpbnRlbF9ndCAq Z3QsIHUzMiBtYXNrKQogewotCXNuYl91cGRhdGVfcG1faXJxKGRldl9wcml2LCBtYXNrLCAwKTsK KwlzbmJfdXBkYXRlX3BtX2lycShndCwgbWFzaywgMCk7CiB9CiAKLXZvaWQgZ2VuNl9tYXNrX3Bt X2lycShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHUzMiBtYXNrKQordm9pZCBn ZW42X21hc2tfcG1faXJxKHN0cnVjdCBpbnRlbF9ndCAqZ3QsIHUzMiBtYXNrKQogewotCWlmIChX QVJOX09OKCFpbnRlbF9pcnFzX2VuYWJsZWQoZGV2X3ByaXYpKSkKKwlpZiAoV0FSTl9PTighaW50 ZWxfaXJxc19lbmFibGVkKGd0LT5pOTE1KSkpCiAJCXJldHVybjsKIAotCV9fZ2VuNl9tYXNrX3Bt X2lycShkZXZfcHJpdiwgbWFzayk7CisJX19nZW42X21hc2tfcG1faXJxKGd0LCBtYXNrKTsKIH0K IAogc3RhdGljIHZvaWQgZ2VuNl9yZXNldF9wbV9paXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LCB1MzIgcmVzZXRfbWFzaykKQEAgLTUwNCwyMyArNTA4LDIzIEBAIHN0YXRpYyB2 b2lkIGdlbjZfcmVzZXRfcG1faWlyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwg dTMyIHJlc2V0X21hc2spCiAJUE9TVElOR19SRUFEKHJlZyk7CiB9CiAKLXN0YXRpYyB2b2lkIGdl bjZfZW5hYmxlX3BtX2lycShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHUzMiBl bmFibGVfbWFzaykKK3N0YXRpYyB2b2lkIGdlbjZfZW5hYmxlX3BtX2lycShzdHJ1Y3QgaW50ZWxf Z3QgKmd0LCB1MzIgZW5hYmxlX21hc2spCiB7Ci0JbG9ja2RlcF9hc3NlcnRfaGVsZCgmZGV2X3By aXYtPmlycV9sb2NrKTsKKwlsb2NrZGVwX2Fzc2VydF9oZWxkKCZndC0+aTkxNS0+aXJxX2xvY2sp OwogCi0JZGV2X3ByaXYtPnBtX2llciB8PSBlbmFibGVfbWFzazsKLQl3cml0ZV9wbV9pZXIoZGV2 X3ByaXYpOwotCWdlbjZfdW5tYXNrX3BtX2lycShkZXZfcHJpdiwgZW5hYmxlX21hc2spOworCWd0 LT5wbV9pZXIgfD0gZW5hYmxlX21hc2s7CisJd3JpdGVfcG1faWVyKGd0KTsKKwlnZW42X3VubWFz a19wbV9pcnEoZ3QsIGVuYWJsZV9tYXNrKTsKIAkvKiB1bm1hc2tfcG1faXJxIHByb3ZpZGVzIGFu IGltcGxpY2l0IGJhcnJpZXIgKFBPU1RJTkdfUkVBRCkgKi8KIH0KIAotc3RhdGljIHZvaWQgZ2Vu Nl9kaXNhYmxlX3BtX2lycShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHUzMiBk aXNhYmxlX21hc2spCitzdGF0aWMgdm9pZCBnZW42X2Rpc2FibGVfcG1faXJxKHN0cnVjdCBpbnRl bF9ndCAqZ3QsIHUzMiBkaXNhYmxlX21hc2spCiB7Ci0JbG9ja2RlcF9hc3NlcnRfaGVsZCgmZGV2 X3ByaXYtPmlycV9sb2NrKTsKKwlsb2NrZGVwX2Fzc2VydF9oZWxkKCZndC0+aTkxNS0+aXJxX2xv Y2spOwogCi0JZGV2X3ByaXYtPnBtX2llciAmPSB+ZGlzYWJsZV9tYXNrOwotCV9fZ2VuNl9tYXNr X3BtX2lycShkZXZfcHJpdiwgZGlzYWJsZV9tYXNrKTsKLQl3cml0ZV9wbV9pZXIoZGV2X3ByaXYp OworCWd0LT5wbV9pZXIgJj0gfmRpc2FibGVfbWFzazsKKwlfX2dlbjZfbWFza19wbV9pcnEoZ3Qs IGRpc2FibGVfbWFzayk7CisJd3JpdGVfcG1faWVyKGd0KTsKIAkvKiB0aG91Z2ggYSBiYXJyaWVy IGlzIG1pc3NpbmcgaGVyZSwgYnV0IGRvbid0IHJlYWxseSBuZWVkIGEgb25lICovCiB9CiAKQEAg LTU0Niw2ICs1NTAsNyBAQCB2b2lkIGdlbjZfcmVzZXRfcnBzX2ludGVycnVwdHMoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiB2b2lkIGdlbjZfZW5hYmxlX3Jwc19pbnRlcnJ1 cHRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIHsKKwlzdHJ1Y3QgaW50ZWxf Z3QgKmd0ID0gJmRldl9wcml2LT5ndDsKIAlzdHJ1Y3QgaW50ZWxfcnBzICpycHMgPSAmZGV2X3By aXYtPmd0X3BtLnJwczsKIAogCWlmIChSRUFEX09OQ0UocnBzLT5pbnRlcnJ1cHRzX2VuYWJsZWQp KQpAQCAtNTU1LDEyICs1NjAsMTIgQEAgdm9pZCBnZW42X2VuYWJsZV9ycHNfaW50ZXJydXB0cyhz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJV0FSTl9PTl9PTkNFKHJwcy0+cG1f aWlyKTsKIAogCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDExKQotCQlXQVJOX09OX09OQ0Uo Z2VuMTFfcmVzZXRfb25lX2lpcigmZGV2X3ByaXYtPmd0LCAwLCBHRU4xMV9HVFBNKSk7CisJCVdB Uk5fT05fT05DRShnZW4xMV9yZXNldF9vbmVfaWlyKGd0LCAwLCBHRU4xMV9HVFBNKSk7CiAJZWxz ZQogCQlXQVJOX09OX09OQ0UoSTkxNV9SRUFEKGdlbjZfcG1faWlyKGRldl9wcml2KSkgJiBkZXZf cHJpdi0+cG1fcnBzX2V2ZW50cyk7CiAKIAlycHMtPmludGVycnVwdHNfZW5hYmxlZCA9IHRydWU7 Ci0JZ2VuNl9lbmFibGVfcG1faXJxKGRldl9wcml2LCBkZXZfcHJpdi0+cG1fcnBzX2V2ZW50cyk7 CisJZ2VuNl9lbmFibGVfcG1faXJxKGd0LCBkZXZfcHJpdi0+cG1fcnBzX2V2ZW50cyk7CiAKIAlz cGluX3VubG9ja19pcnEoJmRldl9wcml2LT5pcnFfbG9jayk7CiB9CkBAIC01NzcsNyArNTgyLDcg QEAgdm9pZCBnZW42X2Rpc2FibGVfcnBzX2ludGVycnVwdHMoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQogCiAJSTkxNV9XUklURShHRU42X1BNSU5UUk1TSywgZ2VuNl9zYW5pdGl6 ZV9ycHNfcG1fbWFzayhkZXZfcHJpdiwgfjB1KSk7CiAKLQlnZW42X2Rpc2FibGVfcG1faXJxKGRl dl9wcml2LCBHRU42X1BNX1JQU19FVkVOVFMpOworCWdlbjZfZGlzYWJsZV9wbV9pcnEoJmRldl9w cml2LT5ndCwgR0VONl9QTV9SUFNfRVZFTlRTKTsKIAogCXNwaW5fdW5sb2NrX2lycSgmZGV2X3By aXYtPmlycV9sb2NrKTsKIAlzeW5jaHJvbml6ZV9pcnEoZGV2X3ByaXYtPmRybS5pcnEpOwpAQCAt NjEyLDcgKzYxNyw3IEBAIHZvaWQgZ2VuOV9lbmFibGVfZ3VjX2ludGVycnVwdHMoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQlXQVJOX09OX09OQ0UoSTkxNV9SRUFEKGdlbjZf cG1faWlyKGRldl9wcml2KSkgJgogCQkJCSAgICAgICBkZXZfcHJpdi0+cG1fZ3VjX2V2ZW50cyk7 CiAJCWRldl9wcml2LT5ndWMuaW50ZXJydXB0cy5lbmFibGVkID0gdHJ1ZTsKLQkJZ2VuNl9lbmFi bGVfcG1faXJxKGRldl9wcml2LCBkZXZfcHJpdi0+cG1fZ3VjX2V2ZW50cyk7CisJCWdlbjZfZW5h YmxlX3BtX2lycSgmZGV2X3ByaXYtPmd0LCBkZXZfcHJpdi0+cG1fZ3VjX2V2ZW50cyk7CiAJfQog CXNwaW5fdW5sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKIH0KQEAgLTYyNCw3ICs2Mjks NyBAQCB2b2lkIGdlbjlfZGlzYWJsZV9ndWNfaW50ZXJydXB0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiAJc3Bpbl9sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKIAlk ZXZfcHJpdi0+Z3VjLmludGVycnVwdHMuZW5hYmxlZCA9IGZhbHNlOwogCi0JZ2VuNl9kaXNhYmxl X3BtX2lycShkZXZfcHJpdiwgZGV2X3ByaXYtPnBtX2d1Y19ldmVudHMpOworCWdlbjZfZGlzYWJs ZV9wbV9pcnEoJmRldl9wcml2LT5ndCwgZGV2X3ByaXYtPnBtX2d1Y19ldmVudHMpOwogCiAJc3Bp bl91bmxvY2tfaXJxKCZkZXZfcHJpdi0+aXJxX2xvY2spOwogCXN5bmNocm9uaXplX2lycShkZXZf cHJpdi0+ZHJtLmlycSk7CkBAIC0xNDI2LDcgKzE0MzEsNyBAQCBzdGF0aWMgdm9pZCBnZW42X3Bt X3Jwc193b3JrKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIAkvKiBNYWtlIHN1cmUgbm90IHRv IGNvcnJ1cHQgUE1JTVIgc3RhdGUgdXNlZCBieSByaW5nYnVmZmVyIG9uIEdFTjYgKi8KIAlzcGlu X2xvY2tfaXJxKCZkZXZfcHJpdi0+aXJxX2xvY2spOwogCWlmIChycHMtPmludGVycnVwdHNfZW5h YmxlZCkKLQkJZ2VuNl91bm1hc2tfcG1faXJxKGRldl9wcml2LCBkZXZfcHJpdi0+cG1fcnBzX2V2 ZW50cyk7CisJCWdlbjZfdW5tYXNrX3BtX2lycSgmZGV2X3ByaXYtPmd0LCBkZXZfcHJpdi0+cG1f cnBzX2V2ZW50cyk7CiAJc3Bpbl91bmxvY2tfaXJxKCZkZXZfcHJpdi0+aXJxX2xvY2spOwogfQog CkBAIC0xODkzLDggKzE4OTgsOSBAQCBzdGF0aWMgdm9pZCBpOXh4X3BpcGVfY3JjX2lycV9oYW5k bGVyKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIC8qIFRoZSBSUFMgZXZlbnRz IG5lZWQgZm9yY2V3YWtlLCBzbyB3ZSBhZGQgdGhlbSB0byBhIHdvcmsgcXVldWUgYW5kIG1hc2sg dGhlaXIKICAqIElNUiBiaXRzIHVudGlsIHRoZSB3b3JrIGlzIGRvbmUuIE90aGVyIGludGVycnVw dHMgY2FuIGJlIHByb2Nlc3NlZCB3aXRob3V0CiAgKiB0aGUgd29yayBxdWV1ZS4gKi8KLXN0YXRp YyB2b2lkIGdlbjExX3Jwc19pcnFfaGFuZGxlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkx NSwgdTMyIHBtX2lpcikKK3N0YXRpYyB2b2lkIGdlbjExX3Jwc19pcnFfaGFuZGxlcihzdHJ1Y3Qg aW50ZWxfZ3QgKmd0LCB1MzIgcG1faWlyKQogeworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpp OTE1ID0gZ3QtPmk5MTU7CiAJc3RydWN0IGludGVsX3JwcyAqcnBzID0gJmk5MTUtPmd0X3BtLnJw czsKIAljb25zdCB1MzIgZXZlbnRzID0gaTkxNS0+cG1fcnBzX2V2ZW50cyAmIHBtX2lpcjsKIApA QCAtMTkwMyw3ICsxOTA5LDcgQEAgc3RhdGljIHZvaWQgZ2VuMTFfcnBzX2lycV9oYW5kbGVyKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LCB1MzIgcG1faWlyKQogCWlmICh1bmxpa2VseSgh ZXZlbnRzKSkKIAkJcmV0dXJuOwogCi0JZ2VuNl9tYXNrX3BtX2lycShpOTE1LCBldmVudHMpOwor CWdlbjZfbWFza19wbV9pcnEoZ3QsIGV2ZW50cyk7CiAKIAlpZiAoIXJwcy0+aW50ZXJydXB0c19l bmFibGVkKQogCQlyZXR1cm47CkBAIC0xOTE4LDcgKzE5MjQsOCBAQCBzdGF0aWMgdm9pZCBnZW42 X3Jwc19pcnFfaGFuZGxlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHUzMiBw bV9paXIpCiAKIAlpZiAocG1faWlyICYgZGV2X3ByaXYtPnBtX3Jwc19ldmVudHMpIHsKIAkJc3Bp bl9sb2NrKCZkZXZfcHJpdi0+aXJxX2xvY2spOwotCQlnZW42X21hc2tfcG1faXJxKGRldl9wcml2 LCBwbV9paXIgJiBkZXZfcHJpdi0+cG1fcnBzX2V2ZW50cyk7CisJCWdlbjZfbWFza19wbV9pcnEo JmRldl9wcml2LT5ndCwKKwkJCQkgcG1faWlyICYgZGV2X3ByaXYtPnBtX3Jwc19ldmVudHMpOwog CQlpZiAocnBzLT5pbnRlcnJ1cHRzX2VuYWJsZWQpIHsKIAkJCXJwcy0+cG1faWlyIHw9IHBtX2lp ciAmIGRldl9wcml2LT5wbV9ycHNfZXZlbnRzOwogCQkJc2NoZWR1bGVfd29yaygmcnBzLT53b3Jr KTsKQEAgLTMwNzYsNyArMzA4Myw3IEBAIGdlbjExX290aGVyX2lycV9oYW5kbGVyKHN0cnVjdCBp bnRlbF9ndCAqZ3QsIGNvbnN0IHU4IGluc3RhbmNlLAogCQlyZXR1cm4gZ2VuMTFfZ3VjX2lycV9o YW5kbGVyKGk5MTUsIGlpcik7CiAKIAlpZiAoaW5zdGFuY2UgPT0gT1RIRVJfR1RQTV9JTlNUQU5D RSkKLQkJcmV0dXJuIGdlbjExX3Jwc19pcnFfaGFuZGxlcihpOTE1LCBpaXIpOworCQlyZXR1cm4g Z2VuMTFfcnBzX2lycV9oYW5kbGVyKGd0LCBpaXIpOwogCiAJV0FSTl9PTkNFKDEsICJ1bmhhbmRs ZWQgb3RoZXIgaW50ZXJydXB0IGluc3RhbmNlPTB4JXgsIGlpcj0weCV4XG4iLAogCQkgIGluc3Rh bmNlLCBpaXIpOwpAQCAtNDAwNiwxMSArNDAxMywxMSBAQCBzdGF0aWMgdm9pZCBnZW41X2d0X2ly cV9wb3N0aW5zdGFsbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCSAqLwog CQlpZiAoSEFTX0VOR0lORShkZXZfcHJpdiwgVkVDUzApKSB7CiAJCQlwbV9pcnFzIHw9IFBNX1ZF Qk9YX1VTRVJfSU5URVJSVVBUOwotCQkJZGV2X3ByaXYtPnBtX2llciB8PSBQTV9WRUJPWF9VU0VS X0lOVEVSUlVQVDsKKwkJCWRldl9wcml2LT5ndC5wbV9pZXIgfD0gUE1fVkVCT1hfVVNFUl9JTlRF UlJVUFQ7CiAJCX0KIAotCQlkZXZfcHJpdi0+cG1faW1yID0gMHhmZmZmZmZmZjsKLQkJR0VOM19J UlFfSU5JVCh1bmNvcmUsIEdFTjZfUE0sIGRldl9wcml2LT5wbV9pbXIsIHBtX2lycXMpOworCQlk ZXZfcHJpdi0+Z3QucG1faW1yID0gMHhmZmZmZmZmZjsKKwkJR0VOM19JUlFfSU5JVCh1bmNvcmUs IEdFTjZfUE0sIGRldl9wcml2LT5ndC5wbV9pbXIsIHBtX2lycXMpOwogCX0KIH0KIApAQCAtNDEw Nyw5ICs0MTE0LDEwIEBAIHN0YXRpYyB2b2lkIHZhbGxleXZpZXdfaXJxX3Bvc3RpbnN0YWxsKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlQT1NUSU5HX1JFQUQoVkxWX01BU1RF Ul9JRVIpOwogfQogCi1zdGF0aWMgdm9pZCBnZW44X2d0X2lycV9wb3N0aW5zdGFsbChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCitzdGF0aWMgdm9pZCBnZW44X2d0X2lycV9wb3N0 aW5zdGFsbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIHsKLQlzdHJ1Y3QgaW50ZWxf dW5jb3JlICp1bmNvcmUgPSAmZGV2X3ByaXYtPnVuY29yZTsKKwlzdHJ1Y3QgaW50ZWxfZ3QgKmd0 ID0gJmk5MTUtPmd0OworCXN0cnVjdCBpbnRlbF91bmNvcmUgKnVuY29yZSA9IGd0LT51bmNvcmU7 CiAKIAkvKiBUaGVzZSBhcmUgaW50ZXJydXB0cyB3ZSdsbCB0b2dnbGUgd2l0aCB0aGUgcmluZyBt YXNrIHJlZ2lzdGVyICovCiAJdTMyIGd0X2ludGVycnVwdHNbXSA9IHsKQEAgLTQxMjksMTUgKzQx MzcsMTUgQEAgc3RhdGljIHZvaWQgZ2VuOF9ndF9pcnFfcG9zdGluc3RhbGwoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQkgR1RfQ09OVEVYVF9TV0lUQ0hfSU5URVJSVVBUIDw8 IEdFTjhfVkVDU19JUlFfU0hJRlQpCiAJfTsKIAotCWRldl9wcml2LT5wbV9pZXIgPSAweDA7Ci0J ZGV2X3ByaXYtPnBtX2ltciA9IH5kZXZfcHJpdi0+cG1faWVyOworCWd0LT5wbV9pZXIgPSAweDA7 CisJZ3QtPnBtX2ltciA9IH5ndC0+cG1faWVyOwogCUdFTjhfSVJRX0lOSVRfTkRYKHVuY29yZSwg R1QsIDAsIH5ndF9pbnRlcnJ1cHRzWzBdLCBndF9pbnRlcnJ1cHRzWzBdKTsKIAlHRU44X0lSUV9J TklUX05EWCh1bmNvcmUsIEdULCAxLCB+Z3RfaW50ZXJydXB0c1sxXSwgZ3RfaW50ZXJydXB0c1sx XSk7CiAJLyoKIAkgKiBSUFMgaW50ZXJydXB0cyB3aWxsIGdldCBlbmFibGVkL2Rpc2FibGVkIG9u IGRlbWFuZCB3aGVuIFJQUyBpdHNlbGYKIAkgKiBpcyBlbmFibGVkL2Rpc2FibGVkLiBTYW1lIHdp bCBiZSB0aGUgY2FzZSBmb3IgR3VDIGludGVycnVwdHMuCiAJICovCi0JR0VOOF9JUlFfSU5JVF9O RFgodW5jb3JlLCBHVCwgMiwgZGV2X3ByaXYtPnBtX2ltciwgZGV2X3ByaXYtPnBtX2llcik7CisJ R0VOOF9JUlFfSU5JVF9ORFgodW5jb3JlLCBHVCwgMiwgZ3QtPnBtX2ltciwgZ3QtPnBtX2llcik7 CiAJR0VOOF9JUlFfSU5JVF9ORFgodW5jb3JlLCBHVCwgMywgfmd0X2ludGVycnVwdHNbM10sIGd0 X2ludGVycnVwdHNbM10pOwogfQogCkBAIC00MjI4LDcgKzQyMzYsNiBAQCBzdGF0aWMgdm9pZCBn ZW44X2lycV9wb3N0aW5zdGFsbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiBz dGF0aWMgdm9pZCBnZW4xMV9ndF9pcnFfcG9zdGluc3RhbGwoc3RydWN0IGludGVsX2d0ICpndCkK IHsKIAljb25zdCB1MzIgaXJxcyA9IEdUX1JFTkRFUl9VU0VSX0lOVEVSUlVQVCB8IEdUX0NPTlRF WFRfU1dJVENIX0lOVEVSUlVQVDsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSBndC0+aTkxNTsKIAlzdHJ1Y3QgaW50ZWxfdW5jb3JlICp1bmNvcmUgPSBndC0+dW5jb3JlOwog CWNvbnN0IHUzMiBkbWFzayA9IGlycXMgPDwgMTYgfCBpcnFzOwogCWNvbnN0IHUzMiBzbWFzayA9 IGlycXMgPDwgMTY7CkBAIC00MjUwLDggKzQyNTcsOCBAQCBzdGF0aWMgdm9pZCBnZW4xMV9ndF9p cnFfcG9zdGluc3RhbGwoc3RydWN0IGludGVsX2d0ICpndCkKIAkgKiBSUFMgaW50ZXJydXB0cyB3 aWxsIGdldCBlbmFibGVkL2Rpc2FibGVkIG9uIGRlbWFuZCB3aGVuIFJQUyBpdHNlbGYKIAkgKiBp cyBlbmFibGVkL2Rpc2FibGVkLgogCSAqLwotCWRldl9wcml2LT5wbV9pZXIgPSAweDA7Ci0JZGV2 X3ByaXYtPnBtX2ltciA9IH5kZXZfcHJpdi0+cG1faWVyOworCWd0LT5wbV9pZXIgPSAweDA7CisJ Z3QtPnBtX2ltciA9IH5ndC0+cG1faWVyOwogCWludGVsX3VuY29yZV93cml0ZSh1bmNvcmUsIEdF TjExX0dQTV9XR0JPWFBFUkZfSU5UUl9FTkFCTEUsIDApOwogCWludGVsX3VuY29yZV93cml0ZSh1 bmNvcmUsIEdFTjExX0dQTV9XR0JPWFBFUkZfSU5UUl9NQVNLLCAgfjApOwogCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9pcnEuaAppbmRleCA1YWY1NjU0ZjgwMWQuLjJkZDVkNTI1OWRiZSAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2lycS5oCkBAIC03Nyw4ICs3Nyw4IEBAIGlieF9kaXNhYmxlX2Rpc3BsYXlfaW50ZXJy dXB0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdTMyIGJpdHMpCiAKIHZvaWQg Z2VuNV9lbmFibGVfZ3RfaXJxKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdTMy IG1hc2spOwogdm9pZCBnZW41X2Rpc2FibGVfZ3RfaXJxKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdiwgdTMyIG1hc2spOwotdm9pZCBnZW42X21hc2tfcG1faXJxKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdTMyIG1hc2spOwotdm9pZCBnZW42X3VubWFza19wbV9p cnEoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1MzIgbWFzayk7Cit2b2lkIGdl bjZfbWFza19wbV9pcnEoc3RydWN0IGludGVsX2d0ICpndCwgdTMyIG1hc2spOwordm9pZCBnZW42 X3VubWFza19wbV9pcnEoc3RydWN0IGludGVsX2d0ICpndCwgdTMyIG1hc2spOwogdm9pZCBnZW4x MV9yZXNldF9ycHNfaW50ZXJydXB0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYp Owogdm9pZCBnZW42X3Jlc2V0X3Jwc19pbnRlcnJ1cHRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdik7CiB2b2lkIGdlbjZfZW5hYmxlX3Jwc19pbnRlcnJ1cHRzKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdik7Ci0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA==