From: Maarten Lankhorst Subject: [PATCH 1/9] drm/i915: Pass intel_crtc_state to needs_modeset() Date: Thu, 20 Jun 2019 23:46:05 +0200 Message-ID: <20190620214613.14481-2-maarten.lankhorst@linux.intel.com> References: <20190620214613.14481-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id CA00D6E7EF for ; Thu, 20 Jun 2019 21:46:16 +0000 (UTC) In-Reply-To: <20190620214613.14481-1-maarten.lankhorst@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 U2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4 LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2ludGVsX2Rpc3Bs YXkuYyB8IDY4ICsrKysrKysrKystLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzQgaW5zZXJ0 aW9ucygrKSwgMzQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5 L2ludGVsX2Rpc3BsYXkuYwppbmRleCA4NTkyYTdkNDIyZGUuLjAyNTY1ZTk3OTk1YSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvZGlzcGxheS9pbnRlbF9kaXNwbGF5LmMKQEAgLTUxNSw5ICs1 MTUsOSBAQCBpY2xfd2Ffc2NhbGVyY2xrZ2F0aW5nKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwgZW51bSBwaXBlIHBpcGUsCiB9CiAKIHN0YXRpYyBib29sCi1uZWVkc19tb2Rlc2V0 KGNvbnN0IHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqc3RhdGUpCituZWVkc19tb2Rlc2V0KGNvbnN0 IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpzdGF0ZSkKIHsKLQlyZXR1cm4gZHJtX2F0b21pY19j cnRjX25lZWRzX21vZGVzZXQoc3RhdGUpOworCXJldHVybiBkcm1fYXRvbWljX2NydGNfbmVlZHNf bW9kZXNldCgmc3RhdGUtPmJhc2UpOwogfQogCiAvKgpAQCAtNTc5Niw3ICs1Nzk2LDcgQEAgc3Rh dGljIGJvb2wgaHN3X3ByZV91cGRhdGVfZGlzYWJsZV9pcHMoY29uc3Qgc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKm9sZF9jcnRjX3MKIAlpZiAoIW9sZF9jcnRjX3N0YXRlLT5pcHNfZW5hYmxlZCkK IAkJcmV0dXJuIGZhbHNlOwogCi0JaWYgKG5lZWRzX21vZGVzZXQoJm5ld19jcnRjX3N0YXRlLT5i YXNlKSkKKwlpZiAobmVlZHNfbW9kZXNldChuZXdfY3J0Y19zdGF0ZSkpCiAJCXJldHVybiB0cnVl OwogCiAJLyoKQEAgLTU4MjMsNyArNTgyMyw3IEBAIHN0YXRpYyBib29sIGhzd19wb3N0X3VwZGF0 ZV9lbmFibGVfaXBzKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zCiAJ aWYgKCFuZXdfY3J0Y19zdGF0ZS0+aXBzX2VuYWJsZWQpCiAJCXJldHVybiBmYWxzZTsKIAotCWlm IChuZWVkc19tb2Rlc2V0KCZuZXdfY3J0Y19zdGF0ZS0+YmFzZSkpCisJaWYgKG5lZWRzX21vZGVz ZXQobmV3X2NydGNfc3RhdGUpKQogCQlyZXR1cm4gdHJ1ZTsKIAogCS8qCkBAIC01OTAwLDcgKzU5 MDAsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wb3N0X3BsYW5lX3VwZGF0ZShzdHJ1Y3QgaW50ZWxf Y3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUpCiAJCWludGVsX2ZiY19wb3N0X3VwZGF0ZShjcnRj KTsKIAogCQlpZiAobmV3X3ByaW1hcnlfc3RhdGUtPnZpc2libGUgJiYKLQkJICAgIChuZWVkc19t b2Rlc2V0KCZwaXBlX2NvbmZpZy0+YmFzZSkgfHwKKwkJICAgIChuZWVkc19tb2Rlc2V0KHBpcGVf Y29uZmlnKSB8fAogCQkgICAgICFvbGRfcHJpbWFyeV9zdGF0ZS0+dmlzaWJsZSkpCiAJCQlpbnRl bF9wb3N0X2VuYWJsZV9wcmltYXJ5KCZjcnRjLT5iYXNlLCBwaXBlX2NvbmZpZyk7CiAJfQpAQCAt NTkyNCw3ICs1OTI0LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfcHJlX3BsYW5lX3VwZGF0ZShzdHJ1 Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUsCiAJc3RydWN0IGRybV9wbGFuZSAq cHJpbWFyeSA9IGNydGMtPmJhc2UucHJpbWFyeTsKIAlzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpv bGRfcHJpbWFyeV9zdGF0ZSA9CiAJCWRybV9hdG9taWNfZ2V0X29sZF9wbGFuZV9zdGF0ZShvbGRf c3RhdGUsIHByaW1hcnkpOwotCWJvb2wgbW9kZXNldCA9IG5lZWRzX21vZGVzZXQoJnBpcGVfY29u ZmlnLT5iYXNlKTsKKwlib29sIG1vZGVzZXQgPSBuZWVkc19tb2Rlc2V0KHBpcGVfY29uZmlnKTsK IAlzdHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpvbGRfaW50ZWxfc3RhdGUgPQogCQl0b19pbnRl bF9hdG9taWNfc3RhdGUob2xkX3N0YXRlKTsKIApAQCAtNTk4NCw3ICs1OTg0LDcgQEAgc3RhdGlj IHZvaWQgaW50ZWxfcHJlX3BsYW5lX3VwZGF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xk X2NydGNfc3RhdGUsCiAJICogSWYgd2UncmUgZG9pbmcgYSBtb2Rlc2V0LCB3ZSdyZSBkb25lLiAg Tm8gbmVlZCB0byBkbyBhbnkgcHJlLXZibGFuawogCSAqIHdhdGVybWFyayBwcm9ncmFtbWluZyBo ZXJlLgogCSAqLwotCWlmIChuZWVkc19tb2Rlc2V0KCZwaXBlX2NvbmZpZy0+YmFzZSkpCisJaWYg KG5lZWRzX21vZGVzZXQocGlwZV9jb25maWcpKQogCQlyZXR1cm47CiAKIAkvKgpAQCAtMTEzMzks NyArMTEzMzksNyBAQCBpbnQgaW50ZWxfcGxhbmVfYXRvbWljX2NhbGNfY2hhbmdlcyhjb25zdCBz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdAogCXN0cnVjdCBpbnRlbF9wbGFu ZSAqcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZV9zdGF0ZS0+cGxhbmUpOwogCXN0cnVjdCBk cm1fZGV2aWNlICpkZXYgPSBjcnRjLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2ID0gdG9faTkxNShkZXYpOwotCWJvb2wgbW9kZV9jaGFuZ2VkID0gbmVlZHNfbW9kZXNl dChjcnRjX3N0YXRlKTsKKwlib29sIG1vZGVfY2hhbmdlZCA9IG5lZWRzX21vZGVzZXQocGlwZV9j b25maWcpOwogCWJvb2wgd2FzX2NydGNfZW5hYmxlZCA9IG9sZF9jcnRjX3N0YXRlLT5iYXNlLmFj dGl2ZTsKIAlib29sIGlzX2NydGNfZW5hYmxlZCA9IGNydGNfc3RhdGUtPmFjdGl2ZTsKIAlib29s IHR1cm5fb2ZmLCB0dXJuX29uLCB2aXNpYmxlLCB3YXNfdmlzaWJsZTsKQEAgLTExNjA4LDcgKzEx NjA4LDcgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX2F0b21pY19jaGVjayhzdHJ1Y3QgZHJtX2Ny dGMgKmNydGMsCiAJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnID0KIAkJdG9f aW50ZWxfY3J0Y19zdGF0ZShjcnRjX3N0YXRlKTsKIAlpbnQgcmV0OwotCWJvb2wgbW9kZV9jaGFu Z2VkID0gbmVlZHNfbW9kZXNldChjcnRjX3N0YXRlKTsKKwlib29sIG1vZGVfY2hhbmdlZCA9IG5l ZWRzX21vZGVzZXQocGlwZV9jb25maWcpOwogCiAJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPCA1 ICYmICFJU19HNFgoZGV2X3ByaXYpICYmCiAJICAgIG1vZGVfY2hhbmdlZCAmJiAhY3J0Y19zdGF0 ZS0+YWN0aXZlKQpAQCAtMTMwODgsNyArMTMwODgsNyBAQCBpbnRlbF9tb2Rlc2V0X3ZlcmlmeV9j cnRjKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJCSAgc3RydWN0IGRybV9jcnRjX3N0YXRlICpv bGRfc3RhdGUsCiAJCQkgIHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqbmV3X3N0YXRlKQogewotCWlm ICghbmVlZHNfbW9kZXNldChuZXdfc3RhdGUpICYmCisJaWYgKCFuZWVkc19tb2Rlc2V0KHRvX2lu dGVsX2NydGNfc3RhdGUobmV3X3N0YXRlKSkgJiYKIAkgICAgIXRvX2ludGVsX2NydGNfc3RhdGUo bmV3X3N0YXRlKS0+dXBkYXRlX3BpcGUpCiAJCXJldHVybjsKIApAQCAtMTMxODAsNyArMTMxODAs NyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X2NsZWFyX3BsbHMoc3RydWN0IGludGVsX2F0 b21pY19zdGF0ZSAqc3RhdGUpCiAJCXN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqb2xkX2RwbGwg PQogCQkJb2xkX2NydGNfc3RhdGUtPnNoYXJlZF9kcGxsOwogCi0JCWlmICghbmVlZHNfbW9kZXNl dCgmbmV3X2NydGNfc3RhdGUtPmJhc2UpKQorCQlpZiAoIW5lZWRzX21vZGVzZXQobmV3X2NydGNf c3RhdGUpKQogCQkJY29udGludWU7CiAKIAkJbmV3X2NydGNfc3RhdGUtPnNoYXJlZF9kcGxsID0g TlVMTDsKQEAgLTEzMjEwLDcgKzEzMjEwLDcgQEAgc3RhdGljIGludCBoYXN3ZWxsX21vZGVfc2V0 X3BsYW5lc193b3JrYXJvdW5kKHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlKQogCS8q IGxvb2sgYXQgYWxsIGNydGMncyB0aGF0IGFyZSBnb2luZyB0byBiZSBlbmFibGVkIGluIGR1cmlu ZyBtb2Rlc2V0ICovCiAJZm9yX2VhY2hfbmV3X2ludGVsX2NydGNfaW5fc3RhdGUoc3RhdGUsIGNy dGMsIGNydGNfc3RhdGUsIGkpIHsKIAkJaWYgKCFjcnRjX3N0YXRlLT5iYXNlLmFjdGl2ZSB8fAot CQkgICAgIW5lZWRzX21vZGVzZXQoJmNydGNfc3RhdGUtPmJhc2UpKQorCQkgICAgIW5lZWRzX21v ZGVzZXQoY3J0Y19zdGF0ZSkpCiAJCQljb250aW51ZTsKIAogCQlpZiAoZmlyc3RfY3J0Y19zdGF0 ZSkgewpAQCAtMTMyMzUsNyArMTMyMzUsNyBAQCBzdGF0aWMgaW50IGhhc3dlbGxfbW9kZV9zZXRf cGxhbmVzX3dvcmthcm91bmQoc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUpCiAJCWNy dGNfc3RhdGUtPmhzd193b3JrYXJvdW5kX3BpcGUgPSBJTlZBTElEX1BJUEU7CiAKIAkJaWYgKCFj cnRjX3N0YXRlLT5iYXNlLmFjdGl2ZSB8fAotCQkgICAgbmVlZHNfbW9kZXNldCgmY3J0Y19zdGF0 ZS0+YmFzZSkpCisJCSAgICBuZWVkc19tb2Rlc2V0KGNydGNfc3RhdGUpKQogCQkJY29udGludWU7 CiAKIAkJLyogMiBvciBtb3JlIGVuYWJsZWQgY3J0Y3MgbWVhbnMgbm8gbmVlZCBmb3Igdy9hICov CkBAIC0xMzI4NSw3ICsxMzI4NSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfbW9kZXNldF9hbGxfcGlw ZXMoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCQlpZiAoSVNfRVJSKGNydGNfc3Rh dGUpKQogCQkJcmV0dXJuIFBUUl9FUlIoY3J0Y19zdGF0ZSk7CiAKLQkJaWYgKCFjcnRjX3N0YXRl LT5hY3RpdmUgfHwgbmVlZHNfbW9kZXNldChjcnRjX3N0YXRlKSkKKwkJaWYgKCFjcnRjX3N0YXRl LT5hY3RpdmUgfHwgbmVlZHNfbW9kZXNldCh0b19pbnRlbF9jcnRjX3N0YXRlKGNydGNfc3RhdGUp KSkKIAkJCWNvbnRpbnVlOwogCiAJCWNydGNfc3RhdGUtPm1vZGVfY2hhbmdlZCA9IHRydWU7CkBA IC0xMzM2MiwxMiArMTMzNjIsMTIgQEAgc3RhdGljIGludCBpbnRlbF9tb2Rlc2V0X2NoZWNrcyhz dHJ1Y3QgaW50ZWxfYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJfQogCiAJCWlmIChpc19wb3dlcl9v Zl8yKHN0YXRlLT5hY3RpdmVfY3J0Y3MpKSB7Ci0JCQlzdHJ1Y3QgZHJtX2NydGMgKmNydGM7Ci0J CQlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGU7CisJCQlzdHJ1Y3QgaW50ZWxfY3J0 YyAqY3J0YzsKKwkJCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlOwogCiAJCQlw aXBlID0gaWxvZzIoc3RhdGUtPmFjdGl2ZV9jcnRjcyk7Ci0JCQljcnRjID0gJmludGVsX2dldF9j cnRjX2Zvcl9waXBlKGRldl9wcml2LCBwaXBlKS0+YmFzZTsKLQkJCWNydGNfc3RhdGUgPSBkcm1f YXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZSgmc3RhdGUtPmJhc2UsIGNydGMpOworCQkJY3J0YyA9 IGludGVsX2dldF9jcnRjX2Zvcl9waXBlKGRldl9wcml2LCBwaXBlKTsKKwkJCWNydGNfc3RhdGUg PSBpbnRlbF9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKIAkJCWlmIChj cnRjX3N0YXRlICYmIG5lZWRzX21vZGVzZXQoY3J0Y19zdGF0ZSkpCiAJCQkJcGlwZSA9IElOVkFM SURfUElQRTsKIAkJfSBlbHNlIHsKQEAgLTEzNDc4LDcgKzEzNDc4LDcgQEAgc3RhdGljIGludCBp bnRlbF9hdG9taWNfY2hlY2soc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAogCWZvcl9lYWNoX29s ZG5ld19pbnRlbF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBvbGRfY3J0Y19zdGF0ZSwKIAkJ CQkJICAgIG5ld19jcnRjX3N0YXRlLCBpKSB7Ci0JCWlmICghbmVlZHNfbW9kZXNldCgmbmV3X2Ny dGNfc3RhdGUtPmJhc2UpKQorCQlpZiAoIW5lZWRzX21vZGVzZXQobmV3X2NydGNfc3RhdGUpKQog CQkJY29udGludWU7CiAKIAkJaWYgKCFuZXdfY3J0Y19zdGF0ZS0+YmFzZS5lbmFibGUpIHsKQEAg LTEzNDkyLDcgKzEzNDkyLDcgQEAgc3RhdGljIGludCBpbnRlbF9hdG9taWNfY2hlY2soc3RydWN0 IGRybV9kZXZpY2UgKmRldiwKIAogCQlpbnRlbF9jcnRjX2NoZWNrX2Zhc3RzZXQob2xkX2NydGNf c3RhdGUsIG5ld19jcnRjX3N0YXRlKTsKIAotCQlpZiAobmVlZHNfbW9kZXNldCgmbmV3X2NydGNf c3RhdGUtPmJhc2UpKQorCQlpZiAobmVlZHNfbW9kZXNldChuZXdfY3J0Y19zdGF0ZSkpCiAJCQlh bnlfbXMgPSB0cnVlOwogCX0KIApAQCAtMTM1MjcsMTIgKzEzNTI3LDEyIEBAIHN0YXRpYyBpbnQg aW50ZWxfYXRvbWljX2NoZWNrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAKIAlmb3JfZWFjaF9v bGRuZXdfaW50ZWxfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0Yywgb2xkX2NydGNfc3RhdGUsCiAJ CQkJCSAgICBuZXdfY3J0Y19zdGF0ZSwgaSkgewotCQlpZiAoIW5lZWRzX21vZGVzZXQoJm5ld19j cnRjX3N0YXRlLT5iYXNlKSAmJgorCQlpZiAoIW5lZWRzX21vZGVzZXQobmV3X2NydGNfc3RhdGUp ICYmCiAJCSAgICAhbmV3X2NydGNfc3RhdGUtPnVwZGF0ZV9waXBlKQogCQkJY29udGludWU7CiAK IAkJaW50ZWxfZHVtcF9waXBlX2NvbmZpZyhuZXdfY3J0Y19zdGF0ZSwgc3RhdGUsCi0JCQkJICAg ICAgIG5lZWRzX21vZGVzZXQoJm5ld19jcnRjX3N0YXRlLT5iYXNlKSA/CisJCQkJICAgICAgIG5l ZWRzX21vZGVzZXQobmV3X2NydGNfc3RhdGUpID8KIAkJCQkgICAgICAgIlttb2Rlc2V0XSIgOiAi W2Zhc3RzZXRdIik7CiAJfQogCkBAIC0xMzU3OSw3ICsxMzU3OSw3IEBAIHN0YXRpYyB2b2lkIGlu dGVsX3VwZGF0ZV9jcnRjKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7CiAJc3RydWN0IGludGVsX2NydGMgKmlu dGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOwogCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRl ICpwaXBlX2NvbmZpZyA9IHRvX2ludGVsX2NydGNfc3RhdGUobmV3X2NydGNfc3RhdGUpOwotCWJv b2wgbW9kZXNldCA9IG5lZWRzX21vZGVzZXQobmV3X2NydGNfc3RhdGUpOworCWJvb2wgbW9kZXNl dCA9IG5lZWRzX21vZGVzZXQocGlwZV9jb25maWcpOwogCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0 ZSAqbmV3X3BsYW5lX3N0YXRlID0KIAkJaW50ZWxfYXRvbWljX2dldF9uZXdfcGxhbmVfc3RhdGUo dG9faW50ZWxfYXRvbWljX3N0YXRlKHN0YXRlKSwKIAkJCQkJCSB0b19pbnRlbF9wbGFuZShjcnRj LT5wcmltYXJ5KSk7CkBAIC0xMzc4OCwxNSArMTM3ODgsMTUgQEAgc3RhdGljIHZvaWQgaW50ZWxf YXRvbWljX2NvbW1pdF90YWlsKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJbmV3 X2ludGVsX2NydGNfc3RhdGUgPSB0b19pbnRlbF9jcnRjX3N0YXRlKG5ld19jcnRjX3N0YXRlKTsK IAkJaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3J0Yyk7CiAKLQkJaWYgKG5lZWRzX21vZGVz ZXQobmV3X2NydGNfc3RhdGUpIHx8Ci0JCSAgICB0b19pbnRlbF9jcnRjX3N0YXRlKG5ld19jcnRj X3N0YXRlKS0+dXBkYXRlX3BpcGUpIHsKKwkJaWYgKG5lZWRzX21vZGVzZXQobmV3X2ludGVsX2Ny dGNfc3RhdGUpIHx8CisJCSAgICBuZXdfaW50ZWxfY3J0Y19zdGF0ZS0+dXBkYXRlX3BpcGUpIHsK IAogCQkJcHV0X2RvbWFpbnNbaW50ZWxfY3J0Yy0+cGlwZV0gPQogCQkJCW1vZGVzZXRfZ2V0X2Ny dGNfcG93ZXJfZG9tYWlucyhjcnRjLAogCQkJCQluZXdfaW50ZWxfY3J0Y19zdGF0ZSk7CiAJCX0K IAotCQlpZiAoIW5lZWRzX21vZGVzZXQobmV3X2NydGNfc3RhdGUpKQorCQlpZiAoIW5lZWRzX21v ZGVzZXQobmV3X2ludGVsX2NydGNfc3RhdGUpKQogCQkJY29udGludWU7CiAKIAkJaW50ZWxfcHJl X3BsYW5lX3VwZGF0ZShvbGRfaW50ZWxfY3J0Y19zdGF0ZSwgbmV3X2ludGVsX2NydGNfc3RhdGUp OwpAQCAtMTM4NTUsNyArMTM4NTUsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9hdG9taWNfY29tbWl0 X3RhaWwoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCiAJLyogQ29tcGxldGUgdGhl IGV2ZW50cyBmb3IgcGlwZXMgdGhhdCBoYXZlIG5vdyBiZWVuIGRpc2FibGVkICovCiAJZm9yX2Vh Y2hfbmV3X2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIG5ld19jcnRjX3N0YXRlLCBpKSB7Ci0J CWJvb2wgbW9kZXNldCA9IG5lZWRzX21vZGVzZXQobmV3X2NydGNfc3RhdGUpOworCQlib29sIG1v ZGVzZXQgPSBuZWVkc19tb2Rlc2V0KHRvX2ludGVsX2NydGNfc3RhdGUobmV3X2NydGNfc3RhdGUp KTsKIAogCQkvKiBDb21wbGV0ZSBldmVudHMgZm9yIG5vdyBkaXNhYmxlIHBpcGVzIGhlcmUuICov CiAJCWlmIChtb2Rlc2V0ICYmICFuZXdfY3J0Y19zdGF0ZS0+YWN0aXZlICYmIG5ld19jcnRjX3N0 YXRlLT5ldmVudCkgewpAQCAtMTM4OTEsNyArMTM4OTEsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9h dG9taWNfY29tbWl0X3RhaWwoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCQluZXdf aW50ZWxfY3J0Y19zdGF0ZSA9IHRvX2ludGVsX2NydGNfc3RhdGUobmV3X2NydGNfc3RhdGUpOwog CiAJCWlmIChuZXdfY3J0Y19zdGF0ZS0+YWN0aXZlICYmCi0JCSAgICAhbmVlZHNfbW9kZXNldChu ZXdfY3J0Y19zdGF0ZSkgJiYKKwkJICAgICFuZWVkc19tb2Rlc2V0KHRvX2ludGVsX2NydGNfc3Rh dGUobmV3X2NydGNfc3RhdGUpKSAmJgogCQkgICAgKG5ld19pbnRlbF9jcnRjX3N0YXRlLT5iYXNl LmNvbG9yX21nbXRfY2hhbmdlZCB8fAogCQkgICAgIG5ld19pbnRlbF9jcnRjX3N0YXRlLT51cGRh dGVfcGlwZSkpCiAJCQlpbnRlbF9jb2xvcl9sb2FkX2x1dHMobmV3X2ludGVsX2NydGNfc3RhdGUp OwpAQCAtMTQyNTAsOSArMTQyNTAsOSBAQCBpbnRlbF9wcmVwYXJlX3BsYW5lX2ZiKHN0cnVjdCBk cm1fcGxhbmUgKnBsYW5lLAogCWludCByZXQ7CiAKIAlpZiAob2xkX29iaikgewotCQlzdHJ1Y3Qg ZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUgPQotCQkJZHJtX2F0b21pY19nZXRfbmV3X2NydGNf c3RhdGUobmV3X3N0YXRlLT5zdGF0ZSwKLQkJCQkJCSAgICAgIHBsYW5lLT5zdGF0ZS0+Y3J0Yyk7 CisJCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlID0KKwkJCWludGVsX2F0b21p Y19nZXRfbmV3X2NydGNfc3RhdGUoaW50ZWxfc3RhdGUsCisJCQkJCQkJdG9faW50ZWxfY3J0Yyhw bGFuZS0+c3RhdGUtPmNydGMpKTsKIAogCQkvKiBCaWcgSGFtbWVyLCB3ZSBhbHNvIG5lZWQgdG8g ZW5zdXJlIHRoYXQgYW55IHBlbmRpbmcKIAkJICogTUlfV0FJVF9GT1JfRVZFTlQgaW5zaWRlIGEg dXNlciBiYXRjaCBidWZmZXIgb24gdGhlCkBAIC0xNDQxMyw3ICsxNDQxMyw3IEBAIHN0YXRpYyB2 b2lkIGludGVsX2JlZ2luX2NydGNfY29tbWl0KHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0 YXRlLAogCQlpbnRlbF9hdG9taWNfZ2V0X29sZF9jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKIAlz dHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqbmV3X2NydGNfc3RhdGUgPQogCQlpbnRlbF9hdG9taWNf Z2V0X25ld19jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKLQlib29sIG1vZGVzZXQgPSBuZWVkc19t b2Rlc2V0KCZuZXdfY3J0Y19zdGF0ZS0+YmFzZSk7CisJYm9vbCBtb2Rlc2V0ID0gbmVlZHNfbW9k ZXNldChuZXdfY3J0Y19zdGF0ZSk7CiAKIAkvKiBQZXJmb3JtIHZibGFuayBldmFzaW9uIGFyb3Vu ZCBjb21taXQgb3BlcmF0aW9uICovCiAJaW50ZWxfcGlwZV91cGRhdGVfc3RhcnQobmV3X2NydGNf c3RhdGUpOwpAQCAtMTQ0NjYsNyArMTQ0NjYsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9maW5pc2hf Y3J0Y19jb21taXQoc3RydWN0IGludGVsX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJaW50ZWxfcGlw ZV91cGRhdGVfZW5kKG5ld19jcnRjX3N0YXRlKTsKIAogCWlmIChuZXdfY3J0Y19zdGF0ZS0+dXBk YXRlX3BpcGUgJiYKLQkgICAgIW5lZWRzX21vZGVzZXQoJm5ld19jcnRjX3N0YXRlLT5iYXNlKSAm JgorCSAgICAhbmVlZHNfbW9kZXNldChuZXdfY3J0Y19zdGF0ZSkgJiYKIAkgICAgb2xkX2NydGNf c3RhdGUtPmJhc2UubW9kZS5wcml2YXRlX2ZsYWdzICYgSTkxNV9NT0RFX0ZMQUdfSU5IRVJJVEVE KQogCQlpbnRlbF9jcnRjX2FybV9maWZvX3VuZGVycnVuKGNydGMsIG5ld19jcnRjX3N0YXRlKTsK IH0KQEAgLTE0NTgwLDcgKzE0NTgwLDcgQEAgaW50ZWxfbGVnYWN5X2N1cnNvcl91cGRhdGUoc3Ry dWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJICogV2hlbiBjcnRjIGlzIGluYWN0aXZlIG9yIHRoZXJl IGlzIGEgbW9kZXNldCBwZW5kaW5nLAogCSAqIHdhaXQgZm9yIGl0IHRvIGNvbXBsZXRlIGluIHRo ZSBzbG93cGF0aAogCSAqLwotCWlmICghY3J0Y19zdGF0ZS0+YmFzZS5hY3RpdmUgfHwgbmVlZHNf bW9kZXNldCgmY3J0Y19zdGF0ZS0+YmFzZSkgfHwKKwlpZiAoIWNydGNfc3RhdGUtPmJhc2UuYWN0 aXZlIHx8IG5lZWRzX21vZGVzZXQoY3J0Y19zdGF0ZSkgfHwKIAkgICAgY3J0Y19zdGF0ZS0+dXBk YXRlX3BpcGUpCiAJCWdvdG8gc2xvdzsKIAotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZng=