From: Tvrtko Ursulin Subject: [CI 3/3] drm/i915: Move dev_priv->pm_i{m, e}r into intel_gt Date: Thu, 4 Jul 2019 13:17:56 +0100 Message-ID: <20190704121756.27824-3-tvrtko.ursulin@linux.intel.com> References: <20190704121756.27824-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 mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 449976E332 for ; Thu, 4 Jul 2019 12:18:00 +0000 (UTC) In-Reply-To: <20190704121756.27824-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 ZmVyLmMKaW5kZXggZjgwNGVjMzUwMzdkLi5iMzNjZmM1NmY2MjMgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2d0L2ludGVsX3JpbmdidWZmZXIuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9ndC9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTEwNDAsMTQgKzEwNDAsMTQgQEAgaHN3 X3ZlYm94X2lycV9lbmFibGUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCS8qIEZs dXNoL2RlbGF5IHRvIGVuc3VyZSB0aGUgUklOR19JTVIgaXMgYWN0aXZlIGJlZm9yZSB0aGUgR1Qg SU1SICovCiAJRU5HSU5FX1BPU1RJTkdfUkVBRChlbmdpbmUsIFJJTkdfSU1SKTsKIAotCWdlbjZf dW5tYXNrX3BtX2lycShlbmdpbmUtPmk5MTUsIGVuZ2luZS0+aXJxX2VuYWJsZV9tYXNrKTsKKwln ZW42X3VubWFza19wbV9pcnEoZW5naW5lLT5ndCwgZW5naW5lLT5pcnFfZW5hYmxlX21hc2spOwog fQogCiBzdGF0aWMgdm9pZAogaHN3X3ZlYm94X2lycV9kaXNhYmxlKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKmVuZ2luZSkKIHsKIAlFTkdJTkVfV1JJVEUoZW5naW5lLCBSSU5HX0lNUiwgfjApOwot CWdlbjZfbWFza19wbV9pcnEoZW5naW5lLT5pOTE1LCBlbmdpbmUtPmlycV9lbmFibGVfbWFzayk7 CisJZ2VuNl9tYXNrX3BtX2lycShlbmdpbmUtPmd0LCBlbmdpbmUtPmlycV9lbmFibGVfbWFzayk7 CiB9CiAKIHN0YXRpYyBpbnQKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDFhMjU4MTMyOTJj ZC4uMjljOTRjMzhlY2M2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTE0MDMsOCArMTQw Myw2IEBAIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlIHsKIAkJdTMyIGRlX2lycV9tYXNrW0k5MTVf TUFYX1BJUEVTXTsKIAl9OwogCXUzMiBndF9pcnFfbWFzazsKLQl1MzIgcG1faW1yOwotCXUzMiBw bV9pZXI7CiAJdTMyIHBtX3Jwc19ldmVudHM7CiAJdTMyIHBtX2d1Y19ldmVudHM7CiAJdTMyIHBp cGVzdGF0X2lycV9tYXNrW0k5MTVfTUFYX1BJUEVTXTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCmlu ZGV4IDA5ZGY3ZTYxODE1ZS4uN2M1YmE1Y2JlYTM0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k 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 aXYtPmlycV9sb2NrKTsKIAlpbnRlbF9zeW5jaHJvbml6ZV9pcnEoZGV2X3ByaXYpOwpAQCAtNjEy LDcgKzYxNyw3IEBAIHZvaWQgZ2VuOV9lbmFibGVfZ3VjX2ludGVycnVwdHMoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogCQlXQVJOX09OX09OQ0UoSTkxNV9SRUFEKGdlbjZfcG1f aWlyKGRldl9wcml2KSkgJgogCQkJCSAgICAgICBkZXZfcHJpdi0+cG1fZ3VjX2V2ZW50cyk7CiAJ CWRldl9wcml2LT5ndWMuaW50ZXJydXB0cy5lbmFibGVkID0gdHJ1ZTsKLQkJZ2VuNl9lbmFibGVf cG1faXJxKGRldl9wcml2LCBkZXZfcHJpdi0+cG1fZ3VjX2V2ZW50cyk7CisJCWdlbjZfZW5hYmxl X3BtX2lycSgmZGV2X3ByaXYtPmd0LCBkZXZfcHJpdi0+cG1fZ3VjX2V2ZW50cyk7CiAJfQogCXNw aW5fdW5sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKIH0KQEAgLTYyNCw3ICs2MjksNyBA QCB2b2lkIGdlbjlfZGlzYWJsZV9ndWNfaW50ZXJydXB0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpCiAJc3Bpbl9sb2NrX2lycSgmZGV2X3ByaXYtPmlycV9sb2NrKTsKIAlkZXZf cHJpdi0+Z3VjLmludGVycnVwdHMuZW5hYmxlZCA9IGZhbHNlOwogCi0JZ2VuNl9kaXNhYmxlX3Bt X2lycShkZXZfcHJpdiwgZGV2X3ByaXYtPnBtX2d1Y19ldmVudHMpOworCWdlbjZfZGlzYWJsZV9w bV9pcnEoJmRldl9wcml2LT5ndCwgZGV2X3ByaXYtPnBtX2d1Y19ldmVudHMpOwogCiAJc3Bpbl91 bmxvY2tfaXJxKCZkZXZfcHJpdi0+aXJxX2xvY2spOwogCWludGVsX3N5bmNocm9uaXplX2lycShk ZXZfcHJpdik7CkBAIC0xNDI2LDcgKzE0MzEsNyBAQCBzdGF0aWMgdm9pZCBnZW42X3BtX3Jwc193 b3JrKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIAkvKiBNYWtlIHN1cmUgbm90IHRvIGNvcnJ1 cHQgUE1JTVIgc3RhdGUgdXNlZCBieSByaW5nYnVmZmVyIG9uIEdFTjYgKi8KIAlzcGluX2xvY2tf aXJxKCZkZXZfcHJpdi0+aXJxX2xvY2spOwogCWlmIChycHMtPmludGVycnVwdHNfZW5hYmxlZCkK LQkJZ2VuNl91bm1hc2tfcG1faXJxKGRldl9wcml2LCBkZXZfcHJpdi0+cG1fcnBzX2V2ZW50cyk7 CisJCWdlbjZfdW5tYXNrX3BtX2lycSgmZGV2X3ByaXYtPmd0LCBkZXZfcHJpdi0+cG1fcnBzX2V2 ZW50cyk7CiAJc3Bpbl91bmxvY2tfaXJxKCZkZXZfcHJpdi0+aXJxX2xvY2spOwogfQogCkBAIC0x ODkzLDggKzE4OTgsOSBAQCBzdGF0aWMgdm9pZCBpOXh4X3BpcGVfY3JjX2lycV9oYW5kbGVyKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIC8qIFRoZSBSUFMgZXZlbnRzIG5lZWQg Zm9yY2V3YWtlLCBzbyB3ZSBhZGQgdGhlbSB0byBhIHdvcmsgcXVldWUgYW5kIG1hc2sgdGhlaXIK ICAqIElNUiBiaXRzIHVudGlsIHRoZSB3b3JrIGlzIGRvbmUuIE90aGVyIGludGVycnVwdHMgY2Fu IGJlIHByb2Nlc3NlZCB3aXRob3V0CiAgKiB0aGUgd29yayBxdWV1ZS4gKi8KLXN0YXRpYyB2b2lk IGdlbjExX3Jwc19pcnFfaGFuZGxlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwgdTMy IHBtX2lpcikKK3N0YXRpYyB2b2lkIGdlbjExX3Jwc19pcnFfaGFuZGxlcihzdHJ1Y3QgaW50ZWxf Z3QgKmd0LCB1MzIgcG1faWlyKQogeworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1ID0g Z3QtPmk5MTU7CiAJc3RydWN0IGludGVsX3JwcyAqcnBzID0gJmk5MTUtPmd0X3BtLnJwczsKIAlj b25zdCB1MzIgZXZlbnRzID0gaTkxNS0+cG1fcnBzX2V2ZW50cyAmIHBtX2lpcjsKIApAQCAtMTkw Myw3ICsxOTA5LDcgQEAgc3RhdGljIHZvaWQgZ2VuMTFfcnBzX2lycV9oYW5kbGVyKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICppOTE1LCB1MzIgcG1faWlyKQogCWlmICh1bmxpa2VseSghZXZlbnRz KSkKIAkJcmV0dXJuOwogCi0JZ2VuNl9tYXNrX3BtX2lycShpOTE1LCBldmVudHMpOworCWdlbjZf bWFza19wbV9pcnEoZ3QsIGV2ZW50cyk7CiAKIAlpZiAoIXJwcy0+aW50ZXJydXB0c19lbmFibGVk KQogCQlyZXR1cm47CkBAIC0xOTE4LDcgKzE5MjQsOCBAQCBzdGF0aWMgdm9pZCBnZW42X3Jwc19p cnFfaGFuZGxlcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIHUzMiBwbV9paXIp CiAKIAlpZiAocG1faWlyICYgZGV2X3ByaXYtPnBtX3Jwc19ldmVudHMpIHsKIAkJc3Bpbl9sb2Nr KCZkZXZfcHJpdi0+aXJxX2xvY2spOwotCQlnZW42X21hc2tfcG1faXJxKGRldl9wcml2LCBwbV9p aXIgJiBkZXZfcHJpdi0+cG1fcnBzX2V2ZW50cyk7CisJCWdlbjZfbWFza19wbV9pcnEoJmRldl9w cml2LT5ndCwKKwkJCQkgcG1faWlyICYgZGV2X3ByaXYtPnBtX3Jwc19ldmVudHMpOwogCQlpZiAo cnBzLT5pbnRlcnJ1cHRzX2VuYWJsZWQpIHsKIAkJCXJwcy0+cG1faWlyIHw9IHBtX2lpciAmIGRl dl9wcml2LT5wbV9ycHNfZXZlbnRzOwogCQkJc2NoZWR1bGVfd29yaygmcnBzLT53b3JrKTsKQEAg LTMwNzYsNyArMzA4Myw3IEBAIGdlbjExX290aGVyX2lycV9oYW5kbGVyKHN0cnVjdCBpbnRlbF9n dCAqZ3QsIGNvbnN0IHU4IGluc3RhbmNlLAogCQlyZXR1cm4gZ2VuMTFfZ3VjX2lycV9oYW5kbGVy KGk5MTUsIGlpcik7CiAKIAlpZiAoaW5zdGFuY2UgPT0gT1RIRVJfR1RQTV9JTlNUQU5DRSkKLQkJ cmV0dXJuIGdlbjExX3Jwc19pcnFfaGFuZGxlcihpOTE1LCBpaXIpOworCQlyZXR1cm4gZ2VuMTFf cnBzX2lycV9oYW5kbGVyKGd0LCBpaXIpOwogCiAJV0FSTl9PTkNFKDEsICJ1bmhhbmRsZWQgb3Ro ZXIgaW50ZXJydXB0IGluc3RhbmNlPTB4JXgsIGlpcj0weCV4XG4iLAogCQkgIGluc3RhbmNlLCBp aXIpOwpAQCAtNDAwNiwxMSArNDAxMywxMSBAQCBzdGF0aWMgdm9pZCBnZW41X2d0X2lycV9wb3N0 aW5zdGFsbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCSAqLwogCQlpZiAo SEFTX0VOR0lORShkZXZfcHJpdiwgVkVDUzApKSB7CiAJCQlwbV9pcnFzIHw9IFBNX1ZFQk9YX1VT RVJfSU5URVJSVVBUOwotCQkJZGV2X3ByaXYtPnBtX2llciB8PSBQTV9WRUJPWF9VU0VSX0lOVEVS UlVQVDsKKwkJCWRldl9wcml2LT5ndC5wbV9pZXIgfD0gUE1fVkVCT1hfVVNFUl9JTlRFUlJVUFQ7 CiAJCX0KIAotCQlkZXZfcHJpdi0+cG1faW1yID0gMHhmZmZmZmZmZjsKLQkJR0VOM19JUlFfSU5J VCh1bmNvcmUsIEdFTjZfUE0sIGRldl9wcml2LT5wbV9pbXIsIHBtX2lycXMpOworCQlkZXZfcHJp di0+Z3QucG1faW1yID0gMHhmZmZmZmZmZjsKKwkJR0VOM19JUlFfSU5JVCh1bmNvcmUsIEdFTjZf UE0sIGRldl9wcml2LT5ndC5wbV9pbXIsIHBtX2lycXMpOwogCX0KIH0KIApAQCAtNDEwNyw5ICs0 MTE0LDEwIEBAIHN0YXRpYyB2b2lkIHZhbGxleXZpZXdfaXJxX3Bvc3RpbnN0YWxsKHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlQT1NUSU5HX1JFQUQoVkxWX01BU1RFUl9JRVIp OwogfQogCi1zdGF0aWMgdm9pZCBnZW44X2d0X2lycV9wb3N0aW5zdGFsbChzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCitzdGF0aWMgdm9pZCBnZW44X2d0X2lycV9wb3N0aW5zdGFs bChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSkKIHsKLQlzdHJ1Y3QgaW50ZWxfdW5jb3Jl ICp1bmNvcmUgPSAmZGV2X3ByaXYtPnVuY29yZTsKKwlzdHJ1Y3QgaW50ZWxfZ3QgKmd0ID0gJmk5 MTUtPmd0OworCXN0cnVjdCBpbnRlbF91bmNvcmUgKnVuY29yZSA9IGd0LT51bmNvcmU7CiAKIAkv KiBUaGVzZSBhcmUgaW50ZXJydXB0cyB3ZSdsbCB0b2dnbGUgd2l0aCB0aGUgcmluZyBtYXNrIHJl Z2lzdGVyICovCiAJdTMyIGd0X2ludGVycnVwdHNbXSA9IHsKQEAgLTQxMjksMTUgKzQxMzcsMTUg QEAgc3RhdGljIHZvaWQgZ2VuOF9ndF9pcnFfcG9zdGluc3RhbGwoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogCQkgR1RfQ09OVEVYVF9TV0lUQ0hfSU5URVJSVVBUIDw8IEdFTjhf VkVDU19JUlFfU0hJRlQpCiAJfTsKIAotCWRldl9wcml2LT5wbV9pZXIgPSAweDA7Ci0JZGV2X3By aXYtPnBtX2ltciA9IH5kZXZfcHJpdi0+cG1faWVyOworCWd0LT5wbV9pZXIgPSAweDA7CisJZ3Qt PnBtX2ltciA9IH5ndC0+cG1faWVyOwogCUdFTjhfSVJRX0lOSVRfTkRYKHVuY29yZSwgR1QsIDAs IH5ndF9pbnRlcnJ1cHRzWzBdLCBndF9pbnRlcnJ1cHRzWzBdKTsKIAlHRU44X0lSUV9JTklUX05E WCh1bmNvcmUsIEdULCAxLCB+Z3RfaW50ZXJydXB0c1sxXSwgZ3RfaW50ZXJydXB0c1sxXSk7CiAJ LyoKIAkgKiBSUFMgaW50ZXJydXB0cyB3aWxsIGdldCBlbmFibGVkL2Rpc2FibGVkIG9uIGRlbWFu ZCB3aGVuIFJQUyBpdHNlbGYKIAkgKiBpcyBlbmFibGVkL2Rpc2FibGVkLiBTYW1lIHdpbCBiZSB0 aGUgY2FzZSBmb3IgR3VDIGludGVycnVwdHMuCiAJICovCi0JR0VOOF9JUlFfSU5JVF9ORFgodW5j b3JlLCBHVCwgMiwgZGV2X3ByaXYtPnBtX2ltciwgZGV2X3ByaXYtPnBtX2llcik7CisJR0VOOF9J UlFfSU5JVF9ORFgodW5jb3JlLCBHVCwgMiwgZ3QtPnBtX2ltciwgZ3QtPnBtX2llcik7CiAJR0VO OF9JUlFfSU5JVF9ORFgodW5jb3JlLCBHVCwgMywgfmd0X2ludGVycnVwdHNbM10sIGd0X2ludGVy cnVwdHNbM10pOwogfQogCkBAIC00MjI4LDcgKzQyMzYsNiBAQCBzdGF0aWMgdm9pZCBnZW44X2ly cV9wb3N0aW5zdGFsbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiBzdGF0aWMg dm9pZCBnZW4xMV9ndF9pcnFfcG9zdGluc3RhbGwoc3RydWN0IGludGVsX2d0ICpndCkKIHsKIAlj b25zdCB1MzIgaXJxcyA9IEdUX1JFTkRFUl9VU0VSX0lOVEVSUlVQVCB8IEdUX0NPTlRFWFRfU1dJ VENIX0lOVEVSUlVQVDsKLQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBndC0+ aTkxNTsKIAlzdHJ1Y3QgaW50ZWxfdW5jb3JlICp1bmNvcmUgPSBndC0+dW5jb3JlOwogCWNvbnN0 IHUzMiBkbWFzayA9IGlycXMgPDwgMTYgfCBpcnFzOwogCWNvbnN0IHUzMiBzbWFzayA9IGlycXMg PDwgMTY7CkBAIC00MjUwLDggKzQyNTcsOCBAQCBzdGF0aWMgdm9pZCBnZW4xMV9ndF9pcnFfcG9z dGluc3RhbGwoc3RydWN0IGludGVsX2d0ICpndCkKIAkgKiBSUFMgaW50ZXJydXB0cyB3aWxsIGdl dCBlbmFibGVkL2Rpc2FibGVkIG9uIGRlbWFuZCB3aGVuIFJQUyBpdHNlbGYKIAkgKiBpcyBlbmFi bGVkL2Rpc2FibGVkLgogCSAqLwotCWRldl9wcml2LT5wbV9pZXIgPSAweDA7Ci0JZGV2X3ByaXYt PnBtX2ltciA9IH5kZXZfcHJpdi0+cG1faWVyOworCWd0LT5wbV9pZXIgPSAweDA7CisJZ3QtPnBt X2ltciA9IH5ndC0+cG1faWVyOwogCWludGVsX3VuY29yZV93cml0ZSh1bmNvcmUsIEdFTjExX0dQ TV9XR0JPWFBFUkZfSU5UUl9FTkFCTEUsIDApOwogCWludGVsX3VuY29yZV93cml0ZSh1bmNvcmUs IEdFTjExX0dQTV9XR0JPWFBFUkZfSU5UUl9NQVNLLCAgfjApOwogCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9p cnEuaAppbmRleCA0NGQ0ODBkYWIwMzAuLmQ5M2ZhNGU3NTQ0MiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2lycS5oCkBAIC03Nyw4ICs3Nyw4IEBAIGlieF9kaXNhYmxlX2Rpc3BsYXlfaW50ZXJydXB0KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdTMyIGJpdHMpCiAKIHZvaWQgZ2VuNV9l bmFibGVfZ3RfaXJxKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdTMyIG1hc2sp Owogdm9pZCBnZW41X2Rpc2FibGVfZ3RfaXJxKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiwgdTMyIG1hc2spOwotdm9pZCBnZW42X21hc2tfcG1faXJxKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwgdTMyIG1hc2spOwotdm9pZCBnZW42X3VubWFza19wbV9pcnEoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1MzIgbWFzayk7Cit2b2lkIGdlbjZfbWFz a19wbV9pcnEoc3RydWN0IGludGVsX2d0ICpndCwgdTMyIG1hc2spOwordm9pZCBnZW42X3VubWFz a19wbV9pcnEoc3RydWN0IGludGVsX2d0ICpndCwgdTMyIG1hc2spOwogdm9pZCBnZW4xMV9yZXNl dF9ycHNfaW50ZXJydXB0cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwogdm9p ZCBnZW42X3Jlc2V0X3Jwc19pbnRlcnJ1cHRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdik7CiB2b2lkIGdlbjZfZW5hYmxlX3Jwc19pbnRlcnJ1cHRzKHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdik7Ci0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2ludGVsLWdmeA==