From: Tvrtko Ursulin Subject: [CI 17/19] drm/i915: Make IS_VALLEYVIEW only take dev_priv Date: Thu, 13 Oct 2016 11:03:08 +0100 Message-ID: <1476352990-2504-17-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1476352990-2504-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qk0-x242.google.com (mail-qk0-x242.google.com [IPv6:2607:f8b0:400d:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id E1C0E6EA05 for ; Thu, 13 Oct 2016 10:03:34 +0000 (UTC) Received: by mail-qk0-x242.google.com with SMTP id n189so5495218qke.1 for ; Thu, 13 Oct 2016 03:03:34 -0700 (PDT) Received: from localhost.localdomain ([2a02:c7d:9b6d:e300:916a:6cab:ac67:71c2]) by smtp.gmail.com with ESMTPSA id yo1sm21209210wjc.16.2016.10.13.03.03.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Oct 2016 03:03:33 -0700 (PDT) In-Reply-To: <1476352990-2504-1-git-send-email-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNhdmVzIDk0 NCBieXRlcyBvZiAucm9kYXRhIHN0cmluZ3MgYW5kIDEyOCBieXRlcyBvZiAudGV4dC4KCnYyOiBB ZGQgcGFyYW50aGVzZXMgYXJvdW5kIGRldl9wcml2LiAoVmlsbGUgU3lyamFsYSkKClNpZ25lZC1v ZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+ClJldmlld2Vk LWJ5OiBEYXZpZCBXZWluZWhhbGwgPGRhdmlkLndlaW5laGFsbEBsaW51eC5pbnRlbC5jb20+CkFj a2VkLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgpBY2tlZC1ieTog SmFuaSBOaWt1bGEgPGphbmkubmlrdWxhQGxpbnV4LmludGVsLmNvbT4KQWNrZWQtYnk6IENocmlz IFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpBY2tlZC1ieTogTWFhcnRlbiBMYW5r aG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgfCAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9mZW5jZS5jICAgfCAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dw dV9lcnJvci5jICAgfCA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NydC5jICAg ICAgICB8IDYgKysrLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgICAg fCA2ICsrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyAgICAgICAgIHwgOCAr KysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jICAgICAgIHwgMiArLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgICAgICAgIHwgMiArLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jIHwgMyArLS0KIDkgZmlsZXMgY2hhbmdlZCwg MTcgaW5zZXJ0aW9ucygrKSwgMTggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgK aW5kZXggZGIxNDU0NjA2YzYzLi5iMDAxNmVlM2I5MDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu aApAQCAtMjY2Miw3ICsyNjYyLDcgQEAgc3RydWN0IGRybV9pOTE1X2NtZF90YWJsZSB7CiAjZGVm aW5lIElTX0lWQl9HVDEoZGV2X3ByaXYpCShJTlRFTF9ERVZJRChkZXZfcHJpdikgPT0gMHgwMTU2 IHx8IFwKIAkJCQkgSU5URUxfREVWSUQoZGV2X3ByaXYpID09IDB4MDE1MiB8fCBcCiAJCQkJIElO VEVMX0RFVklEKGRldl9wcml2KSA9PSAweDAxNWEpCi0jZGVmaW5lIElTX1ZBTExFWVZJRVcoZGV2 KQkoSU5URUxfSU5GTyhkZXYpLT5pc192YWxsZXl2aWV3KQorI2RlZmluZSBJU19WQUxMRVlWSUVX KGRldl9wcml2KQkoKGRldl9wcml2KS0+aW5mby5pc192YWxsZXl2aWV3KQogI2RlZmluZSBJU19D SEVSUllWSUVXKGRldl9wcml2KQkoKGRldl9wcml2KS0+aW5mby5pc19jaGVycnl2aWV3KQogI2Rl ZmluZSBJU19IQVNXRUxMKGRldl9wcml2KQkoKGRldl9wcml2KS0+aW5mby5pc19oYXN3ZWxsKQog I2RlZmluZSBJU19CUk9BRFdFTEwoZGV2X3ByaXYpCSgoZGV2X3ByaXYpLT5pbmZvLmlzX2Jyb2Fk d2VsbCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2ZlbmNlLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9mZW5jZS5jCmluZGV4IDJjN2JhMGVlMTI3 Yy4uYjY1OTE5NDBhMGE4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9mZW5jZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2ZlbmNlLmMKQEAg LTQ2NSw3ICs0NjUsNyBAQCBpOTE1X2dlbV9kZXRlY3RfYml0XzZfc3dpenpsZShzdHJ1Y3QgZHJt X2RldmljZSAqZGV2KQogCXVpbnQzMl90IHN3aXp6bGVfeCA9IEk5MTVfQklUXzZfU1dJWlpMRV9V TktOT1dOOwogCXVpbnQzMl90IHN3aXp6bGVfeSA9IEk5MTVfQklUXzZfU1dJWlpMRV9VTktOT1dO OwogCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDggfHwgSVNfVkFMTEVZVklFVyhkZXYp KSB7CisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gOCB8fCBJU19WQUxMRVlWSUVXKGRldl9w cml2KSkgewogCQkvKgogCQkgKiBPbiBCRFcrLCBzd2l6emxpbmcgaXMgbm90IHVzZWQuIFdlIGxl YXZlIHRoZSBDUFUgbWVtb3J5CiAJCSAqIGNvbnRyb2xsZXIgaW4gY2hhcmdlIG9mIG9wdGltaXpp bmcgbWVtb3J5IGFjY2Vzc2VzIHdpdGhvdXQKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ3B1X2Vycm9yLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJv ci5jCmluZGV4IDFkZjMxODY5YTQ5ZS4uZmYzMDJiOWNiNjM1IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ3B1X2Vycm9yLmMKQEAgLTEzOTgsNyArMTM5OCw3IEBAIHN0YXRpYyB2b2lkIGk5MTVf Y2FwdHVyZV9yZWdfc3RhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCSAq LwogCiAJLyogMTogUmVnaXN0ZXJzIHNwZWNpZmljIHRvIGEgc2luZ2xlIGdlbmVyYXRpb24gKi8K LQlpZiAoSVNfVkFMTEVZVklFVyhkZXYpKSB7CisJaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYp KSB7CiAJCWVycm9yLT5ndGllclswXSA9IEk5MTVfUkVBRChHVElFUik7CiAJCWVycm9yLT5pZXIg PSBJOTE1X1JFQUQoVkxWX0lFUik7CiAJCWVycm9yLT5mb3JjZXdha2UgPSBJOTE1X1JFQURfRlco Rk9SQ0VXQUtFX1ZMVik7CkBAIC0xNDQ3LDcgKzE0NDcsNyBAQCBzdGF0aWMgdm9pZCBpOTE1X2Nh cHR1cmVfcmVnX3N0YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJZXJy b3ItPmd0aWVyWzBdID0gSTkxNV9SRUFEKEdUSUVSKTsKIAl9IGVsc2UgaWYgKElTX0dFTjIoZGV2 KSkgewogCQllcnJvci0+aWVyID0gSTkxNV9SRUFEMTYoSUVSKTsKLQl9IGVsc2UgaWYgKCFJU19W QUxMRVlWSUVXKGRldikpIHsKKwl9IGVsc2UgaWYgKCFJU19WQUxMRVlWSUVXKGRldl9wcml2KSkg ewogCQllcnJvci0+aWVyID0gSTkxNV9SRUFEKElFUik7CiAJfQogCWVycm9yLT5laXIgPSBJOTE1 X1JFQUQoRUlSKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NydC5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3J0LmMKaW5kZXggZDQ1Njc4NmY1ODEzLi5k OTJjM2VkZjEwZmYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NydC5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NydC5jCkBAIC0yNTMsNyArMjUzLDcg QEAgaW50ZWxfY3J0X21vZGVfdmFsaWQoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwK IAogCWlmIChIQVNfUENIX0xQVChkZXZfcHJpdikpCiAJCW1heF9jbG9jayA9IDE4MDAwMDsKLQll bHNlIGlmIChJU19WQUxMRVlWSUVXKGRldikpCisJZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZf cHJpdikpCiAJCS8qCiAJCSAqIDI3MCBNSHogZHVlIHRvIGN1cnJlbnQgRFBMTCBsaW1pdHMsCiAJ CSAqIERBQyBsaW1pdCBzdXBwb3NlZGx5IDM1NSBNSHouCkBAIC00MjMsNyArNDIzLDcgQEAgc3Rh dGljIGJvb2wgaW50ZWxfY3J0X2RldGVjdF9ob3RwbHVnKHN0cnVjdCBkcm1fY29ubmVjdG9yICpj b25uZWN0b3IpCiAJaWYgKEhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpKQogCQlyZXR1cm4gaW50ZWxf aXJvbmxha2VfY3J0X2RldGVjdF9ob3RwbHVnKGNvbm5lY3Rvcik7CiAKLQlpZiAoSVNfVkFMTEVZ VklFVyhkZXYpKQorCWlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSkKIAkJcmV0dXJuIHZhbGxl eXZpZXdfY3J0X2RldGVjdF9ob3RwbHVnKGNvbm5lY3Rvcik7CiAKIAkvKgpAQCAtODUwLDcgKzg1 MCw3IEBAIHZvaWQgaW50ZWxfY3J0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCWlm IChIQVNfUENIX1NQTElUKGRldl9wcml2KSkKIAkJYWRwYV9yZWcgPSBQQ0hfQURQQTsKLQllbHNl IGlmIChJU19WQUxMRVlWSUVXKGRldikpCisJZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJp dikpCiAJCWFkcGFfcmVnID0gVkxWX0FEUEE7CiAJZWxzZQogCQlhZHBhX3JlZyA9IEFEUEE7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggODUzNjZjOWQ2YmMwLi5lNGY2ODBm MmU4NmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTU4NzQsNyArNTg3 NCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3VwZGF0ZV9tYXhfY2RjbGsoc3RydWN0IGRybV9kZXZp Y2UgKmRldikKIAkJCWRldl9wcml2LT5tYXhfY2RjbGtfZnJlcSA9IDY3NTAwMDsKIAl9IGVsc2Ug aWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJCWRldl9wcml2LT5tYXhfY2RjbGtfZnJl cSA9IDMyMDAwMDsKLQl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2KSkgeworCX0gZWxzZSBp ZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikpIHsKIAkJZGV2X3ByaXYtPm1heF9jZGNsa19mcmVx ID0gNDAwMDAwOwogCX0gZWxzZSB7CiAJCS8qIG90aGVyd2lzZSBhc3N1bWUgY2RjbGsgaXMgZml4 ZWQgKi8KQEAgLTY4MzgsNyArNjgzOCw3IEBAIHN0YXRpYyB2b2lkIGk5eHhfY3J0Y19kaXNhYmxl KHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y19zdGF0ZSwKIAlpZiAoIWludGVsX2Ny dGNfaGFzX3R5cGUoaW50ZWxfY3J0Yy0+Y29uZmlnLCBJTlRFTF9PVVRQVVRfRFNJKSkgewogCQlp ZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCiAJCQljaHZfZGlzYWJsZV9wbGwoZGV2X3ByaXYs IHBpcGUpOwotCQllbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldikpCisJCWVsc2UgaWYgKElTX1ZB TExFWVZJRVcoZGV2X3ByaXYpKQogCQkJdmx2X2Rpc2FibGVfcGxsKGRldl9wcml2LCBwaXBlKTsK IAkJZWxzZQogCQkJaTl4eF9kaXNhYmxlX3BsbChpbnRlbF9jcnRjKTsKQEAgLTg5MDQsNyArODkw NCw3IEBAIHN0YXRpYyBib29sIGk5eHhfZ2V0X3BpcGVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRj ICpjcnRjLAogCiAJaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQljaHZfY3J0Y19jbG9j a19nZXQoY3J0YywgcGlwZV9jb25maWcpOwotCWVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2KSkK KwllbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSkKIAkJdmx2X2NydGNfY2xvY2tfZ2V0 KGNydGMsIHBpcGVfY29uZmlnKTsKIAllbHNlCiAJCWk5eHhfY3J0Y19jbG9ja19nZXQoY3J0Yywg cGlwZV9jb25maWcpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKaW5kZXggMWUxY2NmMDkyZTExLi5h MmM0ZDVhMGI3MDQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpAQCAtMTM1MCw3ICsxMzUwLDcg QEAgaW50ZWxfZHBfc2V0X2Nsb2NrKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCX0g ZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJZGl2aXNvciA9IGNodl9kcGxs OwogCQljb3VudCA9IEFSUkFZX1NJWkUoY2h2X2RwbGwpOwotCX0gZWxzZSBpZiAoSVNfVkFMTEVZ VklFVyhkZXYpKSB7CisJfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSkgewogCQlk aXZpc29yID0gdmx2X2RwbGw7CiAJCWNvdW50ID0gQVJSQVlfU0laRSh2bHZfZHBsbCk7CiAJfQpA QCAtMTc5MCw3ICsxNzkwLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZHBfcHJlcGFyZShzdHJ1Y3Qg aW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCXRyYW5zX2RwICY9IH5UUkFOU19EUF9FTkhfRlJB TUlORzsKIAkJSTkxNV9XUklURShUUkFOU19EUF9DVEwoY3J0Yy0+cGlwZSksIHRyYW5zX2RwKTsK IAl9IGVsc2UgewotCQlpZiAoIUhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpICYmICFJU19WQUxMRVlW SUVXKGRldikgJiYKKwkJaWYgKCFIQVNfUENIX1NQTElUKGRldl9wcml2KSAmJiAhSVNfVkFMTEVZ VklFVyhkZXZfcHJpdikgJiYKIAkJICAgICFJU19DSEVSUllWSUVXKGRldl9wcml2KSAmJgogCQkg ICAgcGlwZV9jb25maWctPmxpbWl0ZWRfY29sb3JfcmFuZ2UpCiAJCQlpbnRlbF9kcC0+RFAgfD0g RFBfQ09MT1JfUkFOR0VfMTZfMjM1OwpAQCAtMzM1MSw3ICszMzUxLDcgQEAgaW50ZWxfZHBfc2V0 X3NpZ25hbF9sZXZlbHMoc3RydWN0IGludGVsX2RwICppbnRlbF9kcCkKIAkJCW1hc2sgPSBERElf QlVGX0VNUF9NQVNLOwogCX0gZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJ c2lnbmFsX2xldmVscyA9IGNodl9zaWduYWxfbGV2ZWxzKGludGVsX2RwKTsKLQl9IGVsc2UgaWYg KElTX1ZBTExFWVZJRVcoZGV2KSkgeworCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJp dikpIHsKIAkJc2lnbmFsX2xldmVscyA9IHZsdl9zaWduYWxfbGV2ZWxzKGludGVsX2RwKTsKIAl9 IGVsc2UgaWYgKElTX0dFTjcoZGV2KSAmJiBwb3J0ID09IFBPUlRfQSkgewogCQlzaWduYWxfbGV2 ZWxzID0gZ2VuN19lZHBfc2lnbmFsX2xldmVscyh0cmFpbl9zZXQpOwpAQCAtNTgwMSw3ICs1ODAx LDcgQEAgYm9vbCBpbnRlbF9kcF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCWludGVs X2VuY29kZXItPmVuYWJsZSA9IHZsdl9lbmFibGVfZHA7CiAJCWludGVsX2VuY29kZXItPnBvc3Rf ZGlzYWJsZSA9IGNodl9wb3N0X2Rpc2FibGVfZHA7CiAJCWludGVsX2VuY29kZXItPnBvc3RfcGxs X2Rpc2FibGUgPSBjaHZfZHBfcG9zdF9wbGxfZGlzYWJsZTsKLQl9IGVsc2UgaWYgKElTX1ZBTExF WVZJRVcoZGV2KSkgeworCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikpIHsKIAkJ aW50ZWxfZW5jb2Rlci0+cHJlX3BsbF9lbmFibGUgPSB2bHZfZHBfcHJlX3BsbF9lbmFibGU7CiAJ CWludGVsX2VuY29kZXItPnByZV9lbmFibGUgPSB2bHZfcHJlX2VuYWJsZV9kcDsKIAkJaW50ZWxf ZW5jb2Rlci0+ZW5hYmxlID0gdmx2X2VuYWJsZV9kcDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2hkbWkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWku YwppbmRleCBjODI0M2RjNGQyYjkuLjUwMTMzNDI0MmQzOCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2hkbWkuYwpAQCAtMTk2NSw3ICsxOTY1LDcgQEAgdm9pZCBpbnRlbF9oZG1pX2luaXQoc3RydWN0 IGRybV9kZXZpY2UgKmRldiwKIAkJaW50ZWxfZW5jb2Rlci0+ZW5hYmxlID0gdmx2X2VuYWJsZV9o ZG1pOwogCQlpbnRlbF9lbmNvZGVyLT5wb3N0X2Rpc2FibGUgPSBjaHZfaGRtaV9wb3N0X2Rpc2Fi bGU7CiAJCWludGVsX2VuY29kZXItPnBvc3RfcGxsX2Rpc2FibGUgPSBjaHZfaGRtaV9wb3N0X3Bs bF9kaXNhYmxlOwotCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpKSB7CisJfSBlbHNlIGlm IChJU19WQUxMRVlWSUVXKGRldl9wcml2KSkgewogCQlpbnRlbF9lbmNvZGVyLT5wcmVfcGxsX2Vu YWJsZSA9IHZsdl9oZG1pX3ByZV9wbGxfZW5hYmxlOwogCQlpbnRlbF9lbmNvZGVyLT5wcmVfZW5h YmxlID0gdmx2X2hkbWlfcHJlX2VuYWJsZTsKIAkJaW50ZWxfZW5jb2Rlci0+ZW5hYmxlID0gdmx2 X2VuYWJsZV9oZG1pOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0u YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXggYzMwYTM3NWY2NmEwLi4x MGNhZDFmZjljNmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtNzc2Niw3ICs3NzY2LDcg QEAgdm9pZCBpbnRlbF9pbml0X3BtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJfSBlbHNlIGlm IChJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQl2bHZfc2V0dXBfd21fbGF0ZW5jeShkZXYp OwogCQlkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVfd20gPSB2bHZfdXBkYXRlX3dtOwotCX0gZWxz ZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpKSB7CisJfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRl dl9wcml2KSkgewogCQl2bHZfc2V0dXBfd21fbGF0ZW5jeShkZXYpOwogCQlkZXZfcHJpdi0+ZGlz cGxheS51cGRhdGVfd20gPSB2bHZfdXBkYXRlX3dtOwogCX0gZWxzZSBpZiAoSVNfUElORVZJRVco ZGV2KSkgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9w bS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jCmluZGV4IDNhNmUx YTkzYWVkOS4uZWU1NmE4NzU2YzA3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9ydW50aW1lX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGlt ZV9wbS5jCkBAIC0yNTg5LDcgKzI1ODksNiBAQCBzdGF0aWMgdm9pZCB2bHZfY21ubGFuZV93YShz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAgKi8KIHZvaWQgaW50ZWxfcG93ZXJf ZG9tYWluc19pbml0X2h3KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgYm9vbCBy ZXN1bWUpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9ICZkZXZfcHJpdi0+ZHJtOwogCXN0 cnVjdCBpOTE1X3Bvd2VyX2RvbWFpbnMgKnBvd2VyX2RvbWFpbnMgPSAmZGV2X3ByaXYtPnBvd2Vy X2RvbWFpbnM7CiAKIAlwb3dlcl9kb21haW5zLT5pbml0aWFsaXppbmcgPSB0cnVlOwpAQCAtMjYw Miw3ICsyNjAxLDcgQEAgdm9pZCBpbnRlbF9wb3dlcl9kb21haW5zX2luaXRfaHcoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBib29sIHJlc3VtZSkKIAkJbXV0ZXhfbG9jaygmcG93 ZXJfZG9tYWlucy0+bG9jayk7CiAJCWNodl9waHlfY29udHJvbF9pbml0KGRldl9wcml2KTsKIAkJ bXV0ZXhfdW5sb2NrKCZwb3dlcl9kb21haW5zLT5sb2NrKTsKLQl9IGVsc2UgaWYgKElTX1ZBTExF WVZJRVcoZGV2KSkgeworCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikpIHsKIAkJ bXV0ZXhfbG9jaygmcG93ZXJfZG9tYWlucy0+bG9jayk7CiAJCXZsdl9jbW5sYW5lX3dhKGRldl9w cml2KTsKIAkJbXV0ZXhfdW5sb2NrKCZwb3dlcl9kb21haW5zLT5sb2NrKTsKLS0gCjIuNy40Cgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZngg bWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK