From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Subject: [PATCH 04/35] drm/i915: get rid of primary_enabled and
	use atomic state
Date: Tue, 21 Apr 2015 17:12:53 +0300
Message-ID: <1429625604-22252-5-git-send-email-ander.conselvan.de.oliveira@intel.com>
References: <1429625604-22252-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: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga02.intel.com (mga02.intel.com [134.134.136.20])
 by gabe.freedesktop.org (Postfix) with ESMTP id 0D7646E5C9
 for <intel-gfx@lists.freedesktop.org>; Tue, 21 Apr 2015 07:13:36 -0700 (PDT)
In-Reply-To: <1429625604-22252-1-git-send-email-ander.conselvan.de.oliveira@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

RnJvbTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNv
bT4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBs
aW51eC5pbnRlbC5jb20+ClJldmlld2VkLWJ5OiBBbmRlciBDb25zZWx2YW4gZGUgT2xpdmVpcmEg
PGFuZGVyLmNvbnNlbHZhbi5kZS5vbGl2ZWlyYUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIHwgNTAgKysrKysrKysrKysrKysrKysrKystLS0tLS0t
LS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgMSAtCiBk
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9mYmMuYyAgICAgfCAgMiArLQogMyBmaWxlcyBjaGFu
Z2VkLCAyOSBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2
ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9kaXNwbGF5LmMKaW5kZXggYWNmMzQ5NC4uNDBlM2M2MiAxMDA2NDQKLS0tIGEvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1
L2ludGVsX2Rpc3BsYXkuYwpAQCAtMjIzNiwxMSArMjIzNiw3IEBAIHN0YXRpYyB2b2lkIGludGVs
X2VuYWJsZV9wcmltYXJ5X2h3X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCiAJLyog
SWYgdGhlIHBpcGUgaXNuJ3QgZW5hYmxlZCwgd2UgY2FuJ3QgcHVtcCBwaXhlbHMgYW5kIG1heSBo
YW5nICovCiAJYXNzZXJ0X3BpcGVfZW5hYmxlZChkZXZfcHJpdiwgaW50ZWxfY3J0Yy0+cGlwZSk7
Ci0KLQlpZiAoaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVkKQotCQlyZXR1cm47Ci0KLQlpbnRl
bF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQgPSB0cnVlOworCXRvX2ludGVsX3BsYW5lX3N0YXRlKHBs
YW5lLT5zdGF0ZSktPnZpc2libGUgPSB0cnVlOwogCiAJZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRl
X3ByaW1hcnlfcGxhbmUoY3J0YywgcGxhbmUtPmZiLAogCQkJCQkgICAgICAgY3J0Yy0+eCwgY3J0
Yy0+eSk7CkBAIC0yNjYxLDYgKzI2NTcsOCBAQCBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0ZV9wcmlt
YXJ5X3BsYW5lKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2
ID0gY3J0Yy0+ZGV2OwogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+
ZGV2X3ByaXZhdGU7CiAJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9j
cnRjKGNydGMpOworCXN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnkgPSBjcnRjLT5wcmltYXJ5Owor
CWJvb2wgdmlzaWJsZSA9IHRvX2ludGVsX3BsYW5lX3N0YXRlKHByaW1hcnktPnN0YXRlKS0+dmlz
aWJsZTsKIAlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqOwogCWludCBwbGFuZSA9IGlu
dGVsX2NydGMtPnBsYW5lOwogCXVuc2lnbmVkIGxvbmcgbGluZWFyX29mZnNldDsKQEAgLTI2Njgs
NyArMjY2Niw3IEBAIHN0YXRpYyB2b2lkIGk5eHhfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0
IGRybV9jcnRjICpjcnRjLAogCXUzMiByZWcgPSBEU1BDTlRSKHBsYW5lKTsKIAlpbnQgcGl4ZWxf
c2l6ZTsKIAotCWlmICghaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVkIHx8ICFmYikgeworCWlm
ICghdmlzaWJsZSB8fCAhZmIpIHsKIAkJSTkxNV9XUklURShyZWcsIDApOwogCQlpZiAoSU5URUxf
SU5GTyhkZXYpLT5nZW4gPj0gNCkKIAkJCUk5MTVfV1JJVEUoRFNQU1VSRihwbGFuZSksIDApOwpA
QCAtMjc5MCw2ICsyNzg4LDggQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfdXBkYXRlX3ByaW1hcnlf
cGxhbmUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBj
cnRjLT5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZf
cHJpdmF0ZTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMo
Y3J0Yyk7CisJc3RydWN0IGRybV9wbGFuZSAqcHJpbWFyeSA9IGNydGMtPnByaW1hcnk7CisJYm9v
bCB2aXNpYmxlID0gdG9faW50ZWxfcGxhbmVfc3RhdGUocHJpbWFyeS0+c3RhdGUpLT52aXNpYmxl
OwogCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmo7CiAJaW50IHBsYW5lID0gaW50ZWxf
Y3J0Yy0+cGxhbmU7CiAJdW5zaWduZWQgbG9uZyBsaW5lYXJfb2Zmc2V0OwpAQCAtMjc5Nyw3ICsy
Nzk3LDcgQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0
IGRybV9jcnRjICpjcnRjLAogCXUzMiByZWcgPSBEU1BDTlRSKHBsYW5lKTsKIAlpbnQgcGl4ZWxf
c2l6ZTsKIAotCWlmICghaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVkIHx8ICFmYikgeworCWlm
ICghdmlzaWJsZSB8fCAhZmIpIHsKIAkJSTkxNV9XUklURShyZWcsIDApOwogCQlJOTE1X1dSSVRF
KERTUFNVUkYocGxhbmUpLCAwKTsKIAkJUE9TVElOR19SRUFEKHJlZyk7CkBAIC0yOTY2LDYgKzI5
NjYsOCBAQCBzdGF0aWMgdm9pZCBza3lsYWtlX3VwZGF0ZV9wcmltYXJ5X3BsYW5lKHN0cnVjdCBk
cm1fY3J0YyAqY3J0YywKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+ZGV2OwogCXN0
cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGRldi0+ZGV2X3ByaXZhdGU7CiAJc3Ry
dWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0b19pbnRlbF9jcnRjKGNydGMpOworCXN0cnVj
dCBkcm1fcGxhbmUgKnBsYW5lID0gY3J0Yy0+cHJpbWFyeTsKKwlib29sIHZpc2libGUgPSB0b19p
bnRlbF9wbGFuZV9zdGF0ZShwbGFuZS0+c3RhdGUpLT52aXNpYmxlOwogCXN0cnVjdCBkcm1faTkx
NV9nZW1fb2JqZWN0ICpvYmo7CiAJaW50IHBpcGUgPSBpbnRlbF9jcnRjLT5waXBlOwogCXUzMiBw
bGFuZV9jdGwsIHN0cmlkZV9kaXYsIHN0cmlkZTsKQEAgLTI5NzMsOSArMjk3NSw4IEBAIHN0YXRp
YyB2b2lkIHNreWxha2VfdXBkYXRlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9jcnRjICpjcnRj
LAogCXVuc2lnbmVkIGludCByb3RhdGlvbjsKIAlpbnQgeF9vZmZzZXQsIHlfb2Zmc2V0OwogCXVu
c2lnbmVkIGxvbmcgc3VyZl9hZGRyOwotCXN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lOwogCi0JaWYg
KCFpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQgfHwgIWZiKSB7CisJaWYgKCF2aXNpYmxlIHx8
ICFmYikgewogCQlJOTE1X1dSSVRFKFBMQU5FX0NUTChwaXBlLCAwKSwgMCk7CiAJCUk5MTVfV1JJ
VEUoUExBTkVfU1VSRihwaXBlLCAwKSwgMCk7CiAJCVBPU1RJTkdfUkVBRChQTEFORV9DVEwocGlw
ZSwgMCkpOwpAQCAtMzAzNSw3ICszMDM2LDYgQEAgc3RhdGljIHZvaWQgc2t5bGFrZV91cGRhdGVf
cHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAKIAlwbGFuZV9jdGwgfD0gUExB
TkVfQ1RMX1BMQU5FX0dBTU1BX0RJU0FCTEU7CiAKLQlwbGFuZSA9IGNydGMtPnByaW1hcnk7CiAJ
cm90YXRpb24gPSBwbGFuZS0+c3RhdGUtPnJvdGF0aW9uOwogCXN3aXRjaCAocm90YXRpb24pIHsK
IAljYXNlIEJJVChEUk1fUk9UQVRFXzkwKToKQEAgLTQ2OTksNyArNDY5OSw2IEBAIHN0YXRpYyB2
b2lkIGludGVsX2NydGNfZGlzYWJsZV9wbGFuZXMoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCWhz
d19kaXNhYmxlX2lwcyhpbnRlbF9jcnRjKTsKIAogCWludGVsX2NydGNfZHBtc19vdmVybGF5KGlu
dGVsX2NydGMsIGZhbHNlKTsKLQlpbnRlbF9jcnRjLT5wcmltYXJ5X2VuYWJsZWQgPSBmYWxzZTsK
IAlmb3JfZWFjaF9pbnRlbF9wbGFuZShkZXYsIGludGVsX3BsYW5lKSB7CiAJCWlmIChpbnRlbF9w
bGFuZS0+cGlwZSA9PSBwaXBlKSB7CiAJCQlzdHJ1Y3QgZHJtX2NydGMgKmZyb20gPSBpbnRlbF9w
bGFuZS0+YmFzZS5jcnRjOwpAQCAtMTI4MDMsNiArMTI4MDIsOSBAQCBzdGF0aWMgaW50IGludGVs
X2NydGNfc2V0X2NvbmZpZyhzdHJ1Y3QgZHJtX21vZGVfc2V0ICpzZXQpCiAJfSBlbHNlIGlmIChj
b25maWctPmZiX2NoYW5nZWQpIHsKIAkJc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMgPSB0
b19pbnRlbF9jcnRjKHNldC0+Y3J0Yyk7CiAJCXN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnkgPSBz
ZXQtPmNydGMtPnByaW1hcnk7CisJCXN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3Rh
dGUgPQorCQkJCXRvX2ludGVsX3BsYW5lX3N0YXRlKHByaW1hcnktPnN0YXRlKTsKKwkJYm9vbCB3
YXNfdmlzaWJsZSA9IHBsYW5lX3N0YXRlLT52aXNpYmxlOwogCQlpbnQgdmRpc3BsYXksIGhkaXNw
bGF5OwogCiAJCWRybV9jcnRjX2dldF9odl90aW1pbmcoc2V0LT5tb2RlLCAmaGRpc3BsYXksICZ2
ZGlzcGxheSk7CkBAIC0xMjgxNSw3ICsxMjgxNyw4IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0Y19z
ZXRfY29uZmlnKHN0cnVjdCBkcm1fbW9kZV9zZXQgKnNldCkKIAkJICogV2UgbmVlZCB0byBtYWtl
IHN1cmUgdGhlIHByaW1hcnkgcGxhbmUgaXMgcmUtZW5hYmxlZCBpZiBpdAogCQkgKiBoYXMgcHJl
dmlvdXNseSBiZWVuIHR1cm5lZCBvZmYuCiAJCSAqLwotCQlpZiAoIWludGVsX2NydGMtPnByaW1h
cnlfZW5hYmxlZCAmJiByZXQgPT0gMCkgeworCQlwbGFuZV9zdGF0ZSA9IHRvX2ludGVsX3BsYW5l
X3N0YXRlKHByaW1hcnktPnN0YXRlKTsKKwkJaWYgKHJldCA9PSAwICYmICF3YXNfdmlzaWJsZSAm
JiBwbGFuZV9zdGF0ZS0+dmlzaWJsZSkgewogCQkJV0FSTl9PTighaW50ZWxfY3J0Yy0+YWN0aXZl
KTsKIAkJCWludGVsX2VuYWJsZV9wcmltYXJ5X2h3X3BsYW5lKHNldC0+Y3J0Yy0+cHJpbWFyeSwg
c2V0LT5jcnRjKTsKIAkJfQpAQCAtMTMxMTMsNiArMTMxMTYsOSBAQCBpbnRlbF9jaGVja19wcmlt
YXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAogCQlyZXR1cm4gcmV0OwogCiAJaWYg
KGludGVsX2NydGMtPmFjdGl2ZSkgeworCQlzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKm9sZF9z
dGF0ZSA9CisJCQl0b19pbnRlbF9wbGFuZV9zdGF0ZShwbGFuZS0+c3RhdGUpOworCiAJCWludGVs
X2NydGMtPmF0b21pYy53YWl0X2Zvcl9mbGlwcyA9IHRydWU7CiAKIAkJLyoKQEAgLTEzMTI1LDIw
ICsxMzEzMSwyMCBAQCBpbnRlbF9jaGVja19wcmltYXJ5X3BsYW5lKHN0cnVjdCBkcm1fcGxhbmUg
KnBsYW5lLAogCQkgKiBvbmUgaXMgZG9uZSB0b28gbGF0ZS4gV2UgZXZlbnR1YWxseSBuZWVkIHRv
IHVuaWZ5CiAJCSAqIHRoaXMuCiAJCSAqLwotCQlpZiAoaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFi
bGVkICYmCisJCWlmIChzdGF0ZS0+dmlzaWJsZSAmJgogCQkgICAgSU5URUxfSU5GTyhkZXYpLT5n
ZW4gPD0gNCAmJiAhSVNfRzRYKGRldikgJiYKIAkJICAgIGRldl9wcml2LT5mYmMuY3J0YyA9PSBp
bnRlbF9jcnRjICYmCiAJCSAgICBzdGF0ZS0+YmFzZS5yb3RhdGlvbiAhPSBCSVQoRFJNX1JPVEFU
RV8wKSkgewogCQkJaW50ZWxfY3J0Yy0+YXRvbWljLmRpc2FibGVfZmJjID0gdHJ1ZTsKIAkJfQog
Ci0JCWlmIChzdGF0ZS0+dmlzaWJsZSkgeworCQlpZiAoc3RhdGUtPnZpc2libGUgJiYgIW9sZF9z
dGF0ZS0+dmlzaWJsZSkgewogCQkJLyoKIAkJCSAqIEJEVyBzaWduYWxzIGZsaXAgZG9uZSBpbW1l
ZGlhdGVseSBpZiB0aGUgcGxhbmUKIAkJCSAqIGlzIGRpc2FibGVkLCBldmVuIGlmIHRoZSBwbGFu
ZSBlbmFibGUgaXMgYWxyZWFkeQogCQkJICogYXJtZWQgdG8gb2NjdXIgYXQgdGhlIG5leHQgdmJs
YW5rIDooCiAJCQkgKi8KLQkJCWlmIChJU19CUk9BRFdFTEwoZGV2KSAmJiAhaW50ZWxfY3J0Yy0+
cHJpbWFyeV9lbmFibGVkKQorCQkJaWYgKElTX0JST0FEV0VMTChkZXYpKQogCQkJCWludGVsX2Ny
dGMtPmF0b21pYy53YWl0X3ZibGFuayA9IHRydWU7CiAJCX0KIApAQCAtMTMxNzMsOCArMTMxNzks
NiBAQCBpbnRlbF9jb21taXRfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwK
IAljcnRjLT55ID0gc3JjLT55MSA+PiAxNjsKIAogCWlmIChpbnRlbF9jcnRjLT5hY3RpdmUpIHsK
LQkJaW50ZWxfY3J0Yy0+cHJpbWFyeV9lbmFibGVkID0gc3RhdGUtPnZpc2libGU7Ci0KIAkJaWYg
KHN0YXRlLT52aXNpYmxlKQogCQkJLyogRklYTUU6IGtpbGwgdGhpcyBmYXN0Ym9vdCBoYWNrICov
CiAJCQlpbnRlbF91cGRhdGVfcGlwZV9zaXplKGludGVsX2NydGMpOwpAQCAtMTMxOTIsOSArMTMx
OTYsNiBAQCBpbnRlbF9kaXNhYmxlX3ByaW1hcnlfcGxhbmUoc3RydWN0IGRybV9wbGFuZSAqcGxh
bmUsCiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHBsYW5lLT5kZXY7CiAJc3RydWN0IGRybV9p
OTE1X3ByaXZhdGUgKmRldl9wcml2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKIAotCWlmICghZm9yY2Up
Ci0JCXRvX2ludGVsX2NydGMoY3J0YyktPnByaW1hcnlfZW5hYmxlZCA9IGZhbHNlOwotCiAJZGV2
X3ByaXYtPmRpc3BsYXkudXBkYXRlX3ByaW1hcnlfcGxhbmUoY3J0YywgTlVMTCwgMCwgMCk7CiB9
CiAKQEAgLTE0NjU1LDggKzE0NjU2LDggQEAgc3RhdGljIHZvaWQgaW50ZWxfc2FuaXRpemVfY3J0
YyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkJICogVGVtcG9yYXJpbHkgY2hhbmdlIHRoZSBw
bGFuZSBtYXBwaW5nIGFuZCBkaXNhYmxlIGV2ZXJ5dGhpbmcKIAkJICogLi4uICAqLwogCQlwbGFu
ZSA9IGNydGMtPnBsYW5lOworCQl0b19pbnRlbF9wbGFuZV9zdGF0ZShjcnRjLT5iYXNlLnByaW1h
cnktPnN0YXRlKS0+dmlzaWJsZSA9IHRydWU7CiAJCWNydGMtPnBsYW5lID0gIXBsYW5lOwotCQlj
cnRjLT5wcmltYXJ5X2VuYWJsZWQgPSB0cnVlOwogCQlkZXZfcHJpdi0+ZGlzcGxheS5jcnRjX2Rp
c2FibGUoJmNydGMtPmJhc2UpOwogCQljcnRjLT5wbGFuZSA9IHBsYW5lOwogCkBAIC0xNDgzMyw2
ICsxNDgzNCw5IEBAIHN0YXRpYyB2b2lkIGludGVsX21vZGVzZXRfcmVhZG91dF9od19zdGF0ZShz
dHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWludCBpOwogCiAJZm9yX2VhY2hfaW50ZWxfY3J0Yyhk
ZXYsIGNydGMpIHsKKwkJc3RydWN0IGRybV9wbGFuZSAqcHJpbWFyeSA9IGNydGMtPmJhc2UucHJp
bWFyeTsKKwkJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZTsKKwogCQltZW1z
ZXQoY3J0Yy0+Y29uZmlnLCAwLCBzaXplb2YoKmNydGMtPmNvbmZpZykpOwogCiAJCWNydGMtPmNv
bmZpZy0+cXVpcmtzIHw9IFBJUEVfQ09ORklHX1FVSVJLX0lOSEVSSVRFRF9NT0RFOwpAQCAtMTQ4
NDIsNyArMTQ4NDYsOSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9tb2Rlc2V0X3JlYWRvdXRfaHdfc3Rh
dGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAogCQljcnRjLT5iYXNlLnN0YXRlLT5lbmFibGUg
PSBjcnRjLT5hY3RpdmU7CiAJCWNydGMtPmJhc2UuZW5hYmxlZCA9IGNydGMtPmFjdGl2ZTsKLQkJ
Y3J0Yy0+cHJpbWFyeV9lbmFibGVkID0gcHJpbWFyeV9nZXRfaHdfc3RhdGUoY3J0Yyk7CisKKwkJ
cGxhbmVfc3RhdGUgPSB0b19pbnRlbF9wbGFuZV9zdGF0ZShwcmltYXJ5LT5zdGF0ZSk7CisJCXBs
YW5lX3N0YXRlLT52aXNpYmxlID0gcHJpbWFyeV9nZXRfaHdfc3RhdGUoY3J0Yyk7CiAKIAkJRFJN
X0RFQlVHX0tNUygiW0NSVEM6JWRdIGh3IHN0YXRlIHJlYWRvdXQ6ICVzXG4iLAogCQkJICAgICAg
Y3J0Yy0+YmFzZS5iYXNlLmlkLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCA0MjU0OGJj
Li5jYjBmMjllIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAor
KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtNTEwLDcgKzUxMCw2IEBA
IHN0cnVjdCBpbnRlbF9jcnRjIHsKIAkgKi8KIAlib29sIGFjdGl2ZTsKIAl1bnNpZ25lZCBsb25n
IGVuYWJsZWRfcG93ZXJfZG9tYWluczsKLQlib29sIHByaW1hcnlfZW5hYmxlZDsgLyogaXMgdGhl
IHByaW1hcnkgcGxhbmUgKHBhcnRpYWxseSkgdmlzaWJsZT8gKi8KIAlib29sIGxvd2ZyZXFfYXZh
aWw7CiAJc3RydWN0IGludGVsX292ZXJsYXkgKm92ZXJsYXk7CiAJc3RydWN0IGludGVsX3VucGlu
X3dvcmsgKnVucGluX3dvcms7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl
bF9mYmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jCmluZGV4IDQxNjVjZTAu
LjZhYmI4MzQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jCisr
KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2ZiYy5jCkBAIC00NTcsNyArNDU3LDcgQEAg
c3RhdGljIHN0cnVjdCBkcm1fY3J0YyAqaW50ZWxfZmJjX2ZpbmRfY3J0YyhzdHJ1Y3QgZHJtX2k5
MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCXRtcF9jcnRjID0gZGV2X3ByaXYtPnBpcGVfdG9fY3J0
Y19tYXBwaW5nW3BpcGVdOwogCiAJCWlmIChpbnRlbF9jcnRjX2FjdGl2ZSh0bXBfY3J0YykgJiYK
LQkJICAgIHRvX2ludGVsX2NydGModG1wX2NydGMpLT5wcmltYXJ5X2VuYWJsZWQpIHsKKwkJICAg
IHRvX2ludGVsX3BsYW5lX3N0YXRlKHRtcF9jcnRjLT5wcmltYXJ5LT5zdGF0ZSktPnZpc2libGUp
IHsKIAkJCWlmIChvbmVfcGlwZV9vbmx5ICYmIGNydGMpIHsKIAkJCQlpZiAoc2V0X25vX2ZiY19y
ZWFzb24oZGV2X3ByaXYsIEZCQ19NVUxUSVBMRV9QSVBFUykpCiAJCQkJCURSTV9ERUJVR19LTVMo
Im1vcmUgdGhhbiBvbmUgcGlwZSBhY3RpdmUsIGRpc2FibGluZyBjb21wcmVzc2lvblxuIik7Ci0t
IAoyLjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K
SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0
dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK