From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Subject: [PATCH v4.1 4/5] drm/atomic: Convert get_existing_state callers to
 get_old/new_state, v4.
Date: Wed, 1 Mar 2017 10:22:10 +0100
Message-ID: <df91a9f9-005e-bcbd-1f74-03c38e1e21dd@linux.intel.com>
References: <1487256430-7625-1-git-send-email-maarten.lankhorst@linux.intel.com>
 <1487256430-7625-5-git-send-email-maarten.lankhorst@linux.intel.com>
 <33099096.olWWpuyW68@avalon>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <dri-devel-bounces@lists.freedesktop.org>
In-Reply-To: <33099096.olWWpuyW68@avalon>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>, dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
List-Id: dri-devel@lists.freedesktop.org

VGhpcyBpcyBhIHN0cmFpZ2h0Zm9yd2FyZCBjb252ZXJzaW9uIHRoYXQgY29udmVydHMgYWxsIHRo
ZSB1c2VycyBvZgpnZXRfZXhpc3Rpbmdfc3RhdGUgaW4gYXRvbWljIGNvcmUgdG8gdXNlIGdldF9v
bGRfc3RhdGUgb3IgZ2V0X25ld19zdGF0ZQoKQ2hhbmdlcyBzaW5jZSB2MToKLSBGaXggdXNpbmcg
dGhlIHdyb25nIHN0YXRlIGluIGRybV9hdG9taWNfaGVscGVyX3VwZGF0ZV9sZWdhY3lfbW9kZXNl
dF9zdGF0ZS4KQ2hhbmdlcyBzaW5jZSB2MjoKLSBVc2UgdGhlIGNvcnJlY3Qgc3RhdGUgaW4gZGlz
YWJsZV9vdXRwdXRzKCkKQ2hhbmdlcyBzaW5jZSB2MzoKLSBSZWJhc2UgZm9yIGxpbmsgc3RhdHVz
IHRyYWluaW5nLgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFu
a2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5j
ICAgICAgICAgICAgfCAgNiArKy0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVy
LmMgICAgIHwgNDcgKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dw
dS9kcm0vZHJtX2JsZW5kLmMgICAgICAgICAgICAgfCAgMyArLS0KIGRyaXZlcnMvZ3B1L2RybS9k
cm1fc2ltcGxlX2ttc19oZWxwZXIuYyB8ICA0ICstLQogNCBmaWxlcyBjaGFuZ2VkLCAzMCBpbnNl
cnRpb25zKCspLCAzMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v
ZHJtX2F0b21pYy5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYwppbmRleCAyMzZkOTQ3
MDExZjkuLjliODkyYWY3ODExYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9t
aWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jCkBAIC0xMzc0LDggKzEzNzQs
OCBAQCBkcm1fYXRvbWljX3NldF9jcnRjX2Zvcl9jb25uZWN0b3Ioc3RydWN0IGRybV9jb25uZWN0
b3Jfc3RhdGUgKmNvbm5fc3RhdGUsCiAJCXJldHVybiAwOwogCiAJaWYgKGNvbm5fc3RhdGUtPmNy
dGMpIHsKLQkJY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX2NydGNfc3RhdGUo
Y29ubl9zdGF0ZS0+c3RhdGUsCi0JCQkJCQkJCWNvbm5fc3RhdGUtPmNydGMpOworCQljcnRjX3N0
YXRlID0gZHJtX2F0b21pY19nZXRfbmV3X2NydGNfc3RhdGUoY29ubl9zdGF0ZS0+c3RhdGUsCisJ
CQkJCQkJICAgY29ubl9zdGF0ZS0+Y3J0Yyk7CiAKIAkJY3J0Y19zdGF0ZS0+Y29ubmVjdG9yX21h
c2sgJj0KIAkJCX4oMSA8PCBkcm1fY29ubmVjdG9yX2luZGV4KGNvbm5fc3RhdGUtPmNvbm5lY3Rv
cikpOwpAQCAtMTQ5Miw3ICsxNDkyLDcgQEAgZHJtX2F0b21pY19hZGRfYWZmZWN0ZWRfcGxhbmVz
KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIHsKIAlzdHJ1Y3QgZHJtX3BsYW5lICpw
bGFuZTsKIAotCVdBUk5fT04oIWRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX2NydGNfc3RhdGUoc3Rh
dGUsIGNydGMpKTsKKwlXQVJOX09OKCFkcm1fYXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZShzdGF0
ZSwgY3J0YykpOwogCiAJZHJtX2Zvcl9lYWNoX3BsYW5lX21hc2socGxhbmUsIHN0YXRlLT5kZXYs
IGNydGMtPnN0YXRlLT5wbGFuZV9tYXNrKSB7CiAJCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBs
YW5lX3N0YXRlID0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBl
ci5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKaW5kZXggYmM5NmQzMWJk
Mzg4Li40ZTI2YjczYmIwZDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWlj
X2hlbHBlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCkBAIC03
MCw4ICs3MCw4IEBAIGRybV9hdG9taWNfaGVscGVyX3BsYW5lX2NoYW5nZWQoc3RydWN0IGRybV9h
dG9taWNfc3RhdGUgKnN0YXRlLAogCXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZTsK
IAogCWlmIChvbGRfcGxhbmVfc3RhdGUtPmNydGMpIHsKLQkJY3J0Y19zdGF0ZSA9IGRybV9hdG9t
aWNfZ2V0X2V4aXN0aW5nX2NydGNfc3RhdGUoc3RhdGUsCi0JCQkJCQkJCW9sZF9wbGFuZV9zdGF0
ZS0+Y3J0Yyk7CisJCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZShz
dGF0ZSwKKwkJCQkJCQkgICBvbGRfcGxhbmVfc3RhdGUtPmNydGMpOwogCiAJCWlmIChXQVJOX09O
KCFjcnRjX3N0YXRlKSkKIAkJCXJldHVybjsKQEAgLTgwLDggKzgwLDcgQEAgZHJtX2F0b21pY19o
ZWxwZXJfcGxhbmVfY2hhbmdlZChzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJfQog
CiAJaWYgKHBsYW5lX3N0YXRlLT5jcnRjKSB7Ci0JCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dl
dF9leGlzdGluZ19jcnRjX3N0YXRlKHN0YXRlLAotCQkJCQkJCQlwbGFuZV9zdGF0ZS0+Y3J0Yyk7
CisJCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZShzdGF0ZSwgcGxh
bmVfc3RhdGUtPmNydGMpOwogCiAJCWlmIChXQVJOX09OKCFjcnRjX3N0YXRlKSkKIAkJCXJldHVy
bjsKQEAgLTE1MCw3ICsxNDksNyBAQCBzdGF0aWMgaW50IGhhbmRsZV9jb25mbGljdGluZ19lbmNv
ZGVycyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCiAJZHJtX2Zvcl9lYWNoX2Nvbm5l
Y3Rvcl9pdGVyKGNvbm5lY3RvciwgJmNvbm5faXRlcikgewogCQlzdHJ1Y3QgZHJtX2NydGNfc3Rh
dGUgKmNydGNfc3RhdGU7CiAKLQkJaWYgKGRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX2Nvbm5lY3Rv
cl9zdGF0ZShzdGF0ZSwgY29ubmVjdG9yKSkKKwkJaWYgKGRybV9hdG9taWNfZ2V0X25ld19jb25u
ZWN0b3Jfc3RhdGUoc3RhdGUsIGNvbm5lY3RvcikpCiAJCQljb250aW51ZTsKIAogCQllbmNvZGVy
ID0gY29ubmVjdG9yLT5zdGF0ZS0+YmVzdF9lbmNvZGVyOwpAQCAtMTc4LDcgKzE3Nyw3IEBAIHN0
YXRpYyBpbnQgaGFuZGxlX2NvbmZsaWN0aW5nX2VuY29kZXJzKHN0cnVjdCBkcm1fYXRvbWljX3N0
YXRlICpzdGF0ZSwKIAkJCQkgbmV3X2Nvbm5fc3RhdGUtPmNydGMtPmJhc2UuaWQsIG5ld19jb25u
X3N0YXRlLT5jcnRjLT5uYW1lLAogCQkJCSBjb25uZWN0b3ItPmJhc2UuaWQsIGNvbm5lY3Rvci0+
bmFtZSk7CiAKLQkJY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX2NydGNfc3Rh
dGUoc3RhdGUsIG5ld19jb25uX3N0YXRlLT5jcnRjKTsKKwkJY3J0Y19zdGF0ZSA9IGRybV9hdG9t
aWNfZ2V0X25ld19jcnRjX3N0YXRlKHN0YXRlLCBuZXdfY29ubl9zdGF0ZS0+Y3J0Yyk7CiAKIAkJ
cmV0ID0gZHJtX2F0b21pY19zZXRfY3J0Y19mb3JfY29ubmVjdG9yKG5ld19jb25uX3N0YXRlLCBO
VUxMKTsKIAkJaWYgKHJldCkKQEAgLTIxOSw3ICsyMTgsNyBAQCBzZXRfYmVzdF9lbmNvZGVyKHN0
cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAkJICovCiAJCVdBUk5fT04oIWNydGMgJiYg
ZW5jb2RlciAhPSBjb25uX3N0YXRlLT5iZXN0X2VuY29kZXIpOwogCQlpZiAoY3J0YykgewotCQkJ
Y3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX2NydGNfc3RhdGUoc3RhdGUsIGNy
dGMpOworCQkJY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKHN0YXRl
LCBjcnRjKTsKIAogCQkJY3J0Y19zdGF0ZS0+ZW5jb2Rlcl9tYXNrICY9CiAJCQkJfigxIDw8IGRy
bV9lbmNvZGVyX2luZGV4KGNvbm5fc3RhdGUtPmJlc3RfZW5jb2RlcikpOwpAQCAtMjMwLDcgKzIy
OSw3IEBAIHNldF9iZXN0X2VuY29kZXIoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAog
CQljcnRjID0gY29ubl9zdGF0ZS0+Y3J0YzsKIAkJV0FSTl9PTighY3J0Yyk7CiAJCWlmIChjcnRj
KSB7Ci0JCQljcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfY3J0Y19zdGF0ZShz
dGF0ZSwgY3J0Yyk7CisJCQljcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRfbmV3X2NydGNfc3Rh
dGUoc3RhdGUsIGNydGMpOwogCiAJCQljcnRjX3N0YXRlLT5lbmNvZGVyX21hc2sgfD0KIAkJCQkx
IDw8IGRybV9lbmNvZGVyX2luZGV4KGVuY29kZXIpOwpAQCAtMjYzLDcgKzI2Miw3IEBAIHN0ZWFs
X2VuY29kZXIoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCiAJCXNldF9iZXN0X2Vu
Y29kZXIoc3RhdGUsIG5ld19jb25uZWN0b3Jfc3RhdGUsIE5VTEwpOwogCi0JCWNydGNfc3RhdGUg
PSBkcm1fYXRvbWljX2dldF9leGlzdGluZ19jcnRjX3N0YXRlKHN0YXRlLCBlbmNvZGVyX2NydGMp
OworCQljcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRfbmV3X2NydGNfc3RhdGUoc3RhdGUsIGVu
Y29kZXJfY3J0Yyk7CiAJCWNydGNfc3RhdGUtPmNvbm5lY3RvcnNfY2hhbmdlZCA9IHRydWU7CiAK
IAkJcmV0dXJuOwpAQCAtMjg2LDEyICsyODUsMTIgQEAgdXBkYXRlX2Nvbm5lY3Rvcl9yb3V0aW5n
KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKIAogCWlmIChvbGRfY29ubmVjdG9yX3N0
YXRlLT5jcnRjICE9IG5ld19jb25uZWN0b3Jfc3RhdGUtPmNydGMpIHsKIAkJaWYgKG9sZF9jb25u
ZWN0b3Jfc3RhdGUtPmNydGMpIHsKLQkJCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9leGlz
dGluZ19jcnRjX3N0YXRlKHN0YXRlLCBvbGRfY29ubmVjdG9yX3N0YXRlLT5jcnRjKTsKKwkJCWNy
dGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9uZXdfY3J0Y19zdGF0ZShzdGF0ZSwgb2xkX2Nvbm5l
Y3Rvcl9zdGF0ZS0+Y3J0Yyk7CiAJCQljcnRjX3N0YXRlLT5jb25uZWN0b3JzX2NoYW5nZWQgPSB0
cnVlOwogCQl9CiAKIAkJaWYgKG5ld19jb25uZWN0b3Jfc3RhdGUtPmNydGMpIHsKLQkJCWNydGNf
c3RhdGUgPSBkcm1fYXRvbWljX2dldF9leGlzdGluZ19jcnRjX3N0YXRlKHN0YXRlLCBuZXdfY29u
bmVjdG9yX3N0YXRlLT5jcnRjKTsKKwkJCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9uZXdf
Y3J0Y19zdGF0ZShzdGF0ZSwgbmV3X2Nvbm5lY3Rvcl9zdGF0ZS0+Y3J0Yyk7CiAJCQljcnRjX3N0
YXRlLT5jb25uZWN0b3JzX2NoYW5nZWQgPSB0cnVlOwogCQl9CiAJfQpAQCAtMzUwLDcgKzM0OSw3
IEBAIHVwZGF0ZV9jb25uZWN0b3Jfcm91dGluZyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3Rh
dGUsCiAKIAlzZXRfYmVzdF9lbmNvZGVyKHN0YXRlLCBuZXdfY29ubmVjdG9yX3N0YXRlLCBuZXdf
ZW5jb2Rlcik7CiAKLQljcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfY3J0Y19z
dGF0ZShzdGF0ZSwgbmV3X2Nvbm5lY3Rvcl9zdGF0ZS0+Y3J0Yyk7CisJY3J0Y19zdGF0ZSA9IGRy
bV9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKHN0YXRlLCBuZXdfY29ubmVjdG9yX3N0YXRlLT5j
cnRjKTsKIAljcnRjX3N0YXRlLT5jb25uZWN0b3JzX2NoYW5nZWQgPSB0cnVlOwogCiAJRFJNX0RF
QlVHX0FUT01JQygiW0NPTk5FQ1RPUjolZDolc10gdXNpbmcgW0VOQ09ERVI6JWQ6JXNdIG9uIFtD
UlRDOiVkOiVzXVxuIiwKQEAgLTM5Miw3ICszOTEsNyBAQCBtb2RlX2ZpeHVwKHN0cnVjdCBkcm1f
YXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJCWNvbnRpbnVlOwogCiAJCW5ld19jcnRjX3N0YXRlID0K
LQkJCWRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX2NydGNfc3RhdGUoc3RhdGUsIG5ld19jb25uX3N0
YXRlLT5jcnRjKTsKKwkJCWRybV9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKHN0YXRlLCBuZXdf
Y29ubl9zdGF0ZS0+Y3J0Yyk7CiAKIAkJLyoKIAkJICogRWFjaCBlbmNvZGVyIGhhcyBhdCBtb3N0
IG9uZSBjb25uZWN0b3IgKHNpbmNlIHdlIGFsd2F5cyBzdGVhbApAQCAtNTM0LDggKzUzMyw4IEBA
IGRybV9hdG9taWNfaGVscGVyX2NoZWNrX21vZGVzZXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwK
IAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7CiAJCWlmIChvbGRfY29ubmVjdG9yX3N0YXRlLT5j
cnRjKSB7Ci0JCQluZXdfY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX2NydGNf
c3RhdGUoc3RhdGUsCi0JCQkJCQkJCQkgICAgb2xkX2Nvbm5lY3Rvcl9zdGF0ZS0+Y3J0Yyk7CisJ
CQluZXdfY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKHN0YXRlLAor
CQkJCQkJCQkgICAgICAgb2xkX2Nvbm5lY3Rvcl9zdGF0ZS0+Y3J0Yyk7CiAJCQlpZiAob2xkX2Nv
bm5lY3Rvcl9zdGF0ZS0+bGlua19zdGF0dXMgIT0KIAkJCSAgICBuZXdfY29ubmVjdG9yX3N0YXRl
LT5saW5rX3N0YXR1cykKIAkJCQluZXdfY3J0Y19zdGF0ZS0+Y29ubmVjdG9yc19jaGFuZ2VkID0g
dHJ1ZTsKQEAgLTcxMSw4ICs3MTAsNyBAQCBkaXNhYmxlX291dHB1dHMoc3RydWN0IGRybV9kZXZp
Y2UgKmRldiwgc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKm9sZF9zdGF0ZSkKIAkJaWYgKCFvbGRf
Y29ubl9zdGF0ZS0+Y3J0YykKIAkJCWNvbnRpbnVlOwogCi0JCW9sZF9jcnRjX3N0YXRlID0gZHJt
X2F0b21pY19nZXRfZXhpc3RpbmdfY3J0Y19zdGF0ZShvbGRfc3RhdGUsCi0JCQkJCQkJCSAgICBv
bGRfY29ubl9zdGF0ZS0+Y3J0Yyk7CisJCW9sZF9jcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRf
b2xkX2NydGNfc3RhdGUob2xkX3N0YXRlLCBvbGRfY29ubl9zdGF0ZS0+Y3J0Yyk7CiAKIAkJaWYg
KCFvbGRfY3J0Y19zdGF0ZS0+YWN0aXZlIHx8CiAJCSAgICAhZHJtX2F0b21pY19jcnRjX25lZWRz
X21vZGVzZXQob2xkX2Nvbm5fc3RhdGUtPmNydGMtPnN0YXRlKSkKQEAgLTg0MSwxNCArODM5LDE3
IEBAIGRybV9hdG9taWNfaGVscGVyX3VwZGF0ZV9sZWdhY3lfbW9kZXNldF9zdGF0ZShzdHJ1Y3Qg
ZHJtX2RldmljZSAqZGV2LAogCS8qIHNldCBsZWdhY3kgc3RhdGUgaW4gdGhlIGNydGMgc3RydWN0
dXJlICovCiAJZm9yX2VhY2hfbmV3X2NydGNfaW5fc3RhdGUob2xkX3N0YXRlLCBjcnRjLCBuZXdf
Y3J0Y19zdGF0ZSwgaSkgewogCQlzdHJ1Y3QgZHJtX3BsYW5lICpwcmltYXJ5ID0gY3J0Yy0+cHJp
bWFyeTsKKwkJc3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqbmV3X3BsYW5lX3N0YXRlOwogCiAJCWNy
dGMtPm1vZGUgPSBuZXdfY3J0Y19zdGF0ZS0+bW9kZTsKIAkJY3J0Yy0+ZW5hYmxlZCA9IG5ld19j
cnRjX3N0YXRlLT5lbmFibGU7CiAKLQkJaWYgKGRybV9hdG9taWNfZ2V0X2V4aXN0aW5nX3BsYW5l
X3N0YXRlKG9sZF9zdGF0ZSwgcHJpbWFyeSkgJiYKLQkJICAgIHByaW1hcnktPnN0YXRlLT5jcnRj
ID09IGNydGMpIHsKLQkJCWNydGMtPnggPSBwcmltYXJ5LT5zdGF0ZS0+c3JjX3ggPj4gMTY7Ci0J
CQljcnRjLT55ID0gcHJpbWFyeS0+c3RhdGUtPnNyY195ID4+IDE2OworCQluZXdfcGxhbmVfc3Rh
dGUgPQorCQkJZHJtX2F0b21pY19nZXRfbmV3X3BsYW5lX3N0YXRlKG9sZF9zdGF0ZSwgcHJpbWFy
eSk7CisKKwkJaWYgKG5ld19wbGFuZV9zdGF0ZSAmJiBuZXdfcGxhbmVfc3RhdGUtPmNydGMgPT0g
Y3J0YykgeworCQkJY3J0Yy0+eCA9IG5ld19wbGFuZV9zdGF0ZS0+c3JjX3ggPj4gMTY7CisJCQlj
cnRjLT55ID0gbmV3X3BsYW5lX3N0YXRlLT5zcmNfeSA+PiAxNjsKIAkJfQogCiAJCWlmIChuZXdf
Y3J0Y19zdGF0ZS0+ZW5hYmxlKQpAQCAtMTg1MCw3ICsxODUxLDcgQEAgZHJtX2F0b21pY19oZWxw
ZXJfY29tbWl0X3BsYW5lc19vbl9jcnRjKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqb2xkX2NydGNf
c3RhdGUpCiAKIAlkcm1fZm9yX2VhY2hfcGxhbmVfbWFzayhwbGFuZSwgY3J0Yy0+ZGV2LCBwbGFu
ZV9tYXNrKSB7CiAJCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKm9sZF9wbGFuZV9zdGF0ZSA9Ci0J
CQlkcm1fYXRvbWljX2dldF9leGlzdGluZ19wbGFuZV9zdGF0ZShvbGRfc3RhdGUsIHBsYW5lKTsK
KwkJCWRybV9hdG9taWNfZ2V0X29sZF9wbGFuZV9zdGF0ZShvbGRfc3RhdGUsIHBsYW5lKTsKIAkJ
Y29uc3Qgc3RydWN0IGRybV9wbGFuZV9oZWxwZXJfZnVuY3MgKnBsYW5lX2Z1bmNzOwogCiAJCXBs
YW5lX2Z1bmNzID0gcGxhbmUtPmhlbHBlcl9wcml2YXRlOwpAQCAtMjk1Myw3ICsyOTU0LDcgQEAg
aW50IGRybV9hdG9taWNfaGVscGVyX3BhZ2VfZmxpcF90YXJnZXQoCiAJaWYgKHJldCAhPSAwKQog
CQlnb3RvIGZhaWw7CiAKLQljcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRfZXhpc3RpbmdfY3J0
Y19zdGF0ZShzdGF0ZSwgY3J0Yyk7CisJY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X25ld19j
cnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKIAlpZiAoV0FSTl9PTighY3J0Y19zdGF0ZSkpIHsKIAkJ
cmV0ID0gLUVJTlZBTDsKIAkJZ290byBmYWlsOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt
L2RybV9ibGVuZC5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9ibGVuZC5jCmluZGV4IDY2NWFhZmM2
YWQ2OC4uZDcwNTNiYjY3ZGI2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2JsZW5k
LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9ibGVuZC5jCkBAIC0zODcsOCArMzg3LDcgQEAg
aW50IGRybV9hdG9taWNfbm9ybWFsaXplX3pwb3Moc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJ
aWYgKCFjcnRjKQogCQkJY29udGludWU7CiAJCWlmIChwbGFuZS0+c3RhdGUtPnpwb3MgIT0gcGxh
bmVfc3RhdGUtPnpwb3MpIHsKLQkJCWNydGNfc3RhdGUgPQotCQkJCWRybV9hdG9taWNfZ2V0X2V4
aXN0aW5nX2NydGNfc3RhdGUoc3RhdGUsIGNydGMpOworCQkJY3J0Y19zdGF0ZSA9IGRybV9hdG9t
aWNfZ2V0X25ld19jcnRjX3N0YXRlKHN0YXRlLCBjcnRjKTsKIAkJCWNydGNfc3RhdGUtPnpwb3Nf
Y2hhbmdlZCA9IHRydWU7CiAJCX0KIAl9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJt
X3NpbXBsZV9rbXNfaGVscGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX3NpbXBsZV9rbXNfaGVs
cGVyLmMKaW5kZXggMzVjNWQ5OTI5NmI5Li4xNjc4OWZhYTkyOTEgMTAwNjQ0Ci0tLSBhL2RyaXZl
cnMvZ3B1L2RybS9kcm1fc2ltcGxlX2ttc19oZWxwZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v
ZHJtX3NpbXBsZV9rbXNfaGVscGVyLmMKQEAgLTg2LDggKzg2LDggQEAgc3RhdGljIGludCBkcm1f
c2ltcGxlX2ttc19wbGFuZV9hdG9taWNfY2hlY2soc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJ
aW50IHJldDsKIAogCXBpcGUgPSBjb250YWluZXJfb2YocGxhbmUsIHN0cnVjdCBkcm1fc2ltcGxl
X2Rpc3BsYXlfcGlwZSwgcGxhbmUpOwotCWNydGNfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9leGlz
dGluZ19jcnRjX3N0YXRlKHBsYW5lX3N0YXRlLT5zdGF0ZSwKLQkJCQkJCQkmcGlwZS0+Y3J0Yyk7
CisJY3J0Y19zdGF0ZSA9IGRybV9hdG9taWNfZ2V0X25ld19jcnRjX3N0YXRlKHBsYW5lX3N0YXRl
LT5zdGF0ZSwKKwkJCQkJCSAgICZwaXBlLT5jcnRjKTsKIAlpZiAoY3J0Y19zdGF0ZS0+ZW5hYmxl
ICE9ICEhcGxhbmVfc3RhdGUtPmNydGMpCiAJCXJldHVybiAtRUlOVkFMOyAvKiBwbGFuZSBtdXN0
IG1hdGNoIGNydGMgZW5hYmxlIHN0YXRlICovCiAKLS0gCjIuNy40CgoKX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApk
cmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au
b3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==