From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: [PATCH 3/5] drm/i915: Move engine reset prepare/finish
 to backends
Date: Tue, 20 Mar 2018 00:18:46 +0000
Message-ID: <20180320001848.4405-3-chris@chris-wilson.co.uk>
References: <20180320001848.4405-1-chris@chris-wilson.co.uk>
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 fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 7D7986E2D7
 for <intel-gfx@lists.freedesktop.org>; Tue, 20 Mar 2018 00:19:01 +0000 (UTC)
In-Reply-To: <20180320001848.4405-1-chris@chris-wilson.co.uk>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://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: <https://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

SW4gcHJlcGFyYXRpb24gdG8gbW9yZSBjYXJlZnVsbHkgaGFuZGxpbmcgaW5jb21wbGV0ZSBwcmVl
bXB0aW9uIGR1cmluZwpyZXNldCBieSBleGVjbGlzdHMsIHdlIG1vdmUgdGhlIGV4aXN0aW5nIGNv
ZGUgd2hvbGVzYWxlIHRvIHRoZSBiYWNrZW5kcwp1bmRlciBhIGNvdXBsZSBvZiBuZXcgcmVzZXQg
dmZ1bmNzLgoKU2lnbmVkLW9mZi1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24u
Y28udWs+CkNjOiBNaWNoYcWCIFdpbmlhcnNraSA8bWljaGFsLndpbmlhcnNraUBpbnRlbC5jb20+
CkNDOiBNaWNoZWwgVGhpZXJyeSA8bWljaGVsLnRoaWVycnlAaW50ZWwuY29tPgpDYzogSmVmZiBN
Y0dlZSA8amVmZi5tY2dlZUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx
NV9nZW0uYyAgICAgICAgIHwgNDIgKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX2xyYy5jICAgICAgICB8IDUyICsrKysrKysrKysrKysrKysrKysr
KysrKysrKysrKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jIHwg
MjAgKysrKysrKysrKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5o
IHwgIDkgKysrKy0tCiA0IGZpbGVzIGNoYW5nZWQsIDc4IGluc2VydGlvbnMoKyksIDQ1IGRlbGV0
aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgYi9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IDgwMmRmOGUxYTU0NC4uMzhmNzE2
MGQ5OWM5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBi
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTI5MTcsNyArMjkxNyw3IEBAIHN0
YXRpYyBib29sIGVuZ2luZV9zdGFsbGVkKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSkK
IHN0cnVjdCBpOTE1X3JlcXVlc3QgKgogaTkxNV9nZW1fcmVzZXRfcHJlcGFyZV9lbmdpbmUoc3Ry
dWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogewotCXN0cnVjdCBpOTE1X3JlcXVlc3QgKnJl
cXVlc3QgPSBOVUxMOworCXN0cnVjdCBpOTE1X3JlcXVlc3QgKnJlcXVlc3Q7CiAKIAkvKgogCSAq
IER1cmluZyB0aGUgcmVzZXQgc2VxdWVuY2UsIHdlIG11c3QgcHJldmVudCB0aGUgZW5naW5lIGZy
b20KQEAgLTI5NDAsNDAgKzI5NDAsNyBAQCBpOTE1X2dlbV9yZXNldF9wcmVwYXJlX2VuZ2luZShz
dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJICovCiAJa3RocmVhZF9wYXJrKGVuZ2lu
ZS0+YnJlYWRjcnVtYnMuc2lnbmFsZXIpOwogCi0JLyoKLQkgKiBQcmV2ZW50IHJlcXVlc3Qgc3Vi
bWlzc2lvbiB0byB0aGUgaGFyZHdhcmUgdW50aWwgd2UgaGF2ZQotCSAqIGNvbXBsZXRlZCB0aGUg
cmVzZXQgaW4gaTkxNV9nZW1fcmVzZXRfZmluaXNoKCkuIElmIGEgcmVxdWVzdAotCSAqIGlzIGNv
bXBsZXRlZCBieSBvbmUgZW5naW5lLCBpdCBtYXkgdGhlbiBxdWV1ZSBhIHJlcXVlc3QKLQkgKiB0
byBhIHNlY29uZCB2aWEgaXRzIGV4ZWNsaXN0cy0+dGFza2xldCAqanVzdCogYXMgd2UgYXJlCi0J
ICogY2FsbGluZyBlbmdpbmUtPmluaXRfaHcoKSBhbmQgYWxzbyB3cml0aW5nIHRoZSBFTFNQLgot
CSAqIFR1cm5pbmcgb2ZmIHRoZSBleGVjbGlzdHMtPnRhc2tsZXQgdW50aWwgdGhlIHJlc2V0IGlz
IG92ZXIKLQkgKiBwcmV2ZW50cyB0aGUgcmFjZS4KLQkgKgotCSAqIE5vdGUgdGhhdCB0aGlzIG5l
ZWRzIHRvIGJlIGEgc2luZ2xlIGF0b21pYyBvcGVyYXRpb24gb24gdGhlCi0JICogdGFza2xldCAo
Zmx1c2ggZXhpc3RpbmcgdGFza3MsIHByZXZlbnQgbmV3IHRhc2tzKSB0byBwcmV2ZW50Ci0JICog
YSByYWNlIGJldHdlZW4gcmVzZXQgYW5kIHNldC13ZWRnZWQuIEl0IGlzIG5vdCwgc28gd2UgZG8g
dGhlIGJlc3QKLQkgKiB3ZSBjYW4gYXRtIGFuZCBtYWtlIHN1cmUgd2UgZG9uJ3QgbG9jayB0aGUg
bWFjaGluZSB1cCBpbiB0aGUgbW9yZQotCSAqIGNvbW1vbiBjYXNlIG9mIHJlY3Vyc2l2ZWx5IGJl
aW5nIGNhbGxlZCBmcm9tIHNldC13ZWRnZWQgZnJvbSBpbnNpZGUKLQkgKiBpOTE1X3Jlc2V0Lgot
CSAqLwotCWlmICghYXRvbWljX3JlYWQoJmVuZ2luZS0+ZXhlY2xpc3RzLnRhc2tsZXQuY291bnQp
KQotCQl0YXNrbGV0X2tpbGwoJmVuZ2luZS0+ZXhlY2xpc3RzLnRhc2tsZXQpOwotCXRhc2tsZXRf
ZGlzYWJsZSgmZW5naW5lLT5leGVjbGlzdHMudGFza2xldCk7Ci0KLQkvKgotCSAqIFdlJ3JlIHVz
aW5nIHdvcmtlciB0byBxdWV1ZSBwcmVlbXB0aW9uIHJlcXVlc3RzIGZyb20gdGhlIHRhc2tsZXQg
aW4KLQkgKiBHdUMgc3VibWlzc2lvbiBtb2RlLgotCSAqIEV2ZW4gdGhvdWdoIHRhc2tsZXQgd2Fz
IGRpc2FibGVkLCB3ZSBtYXkgc3RpbGwgaGF2ZSBhIHdvcmtlciBxdWV1ZWQuCi0JICogTGV0J3Mg
bWFrZSBzdXJlIHRoYXQgYWxsIHdvcmtlcnMgc2NoZWR1bGVkIGJlZm9yZSBkaXNhYmxpbmcgdGhl
Ci0JICogdGFza2xldCBhcmUgY29tcGxldGVkIGJlZm9yZSBjb250aW51aW5nIHdpdGggdGhlIHJl
c2V0LgotCSAqLwotCWlmIChlbmdpbmUtPmk5MTUtPmd1Yy5wcmVlbXB0X3dxKQotCQlmbHVzaF93
b3JrcXVldWUoZW5naW5lLT5pOTE1LT5ndWMucHJlZW1wdF93cSk7Ci0KLQlpZiAoZW5naW5lLT5p
cnFfc2Vxbm9fYmFycmllcikKLQkJZW5naW5lLT5pcnFfc2Vxbm9fYmFycmllcihlbmdpbmUpOwot
Ci0JcmVxdWVzdCA9IGk5MTVfZ2VtX2ZpbmRfYWN0aXZlX3JlcXVlc3QoZW5naW5lKTsKKwlyZXF1
ZXN0ID0gZW5naW5lLT5yZXNldC5wcmVwYXJlKGVuZ2luZSk7CiAJaWYgKHJlcXVlc3QgJiYgcmVx
dWVzdC0+ZmVuY2UuZXJyb3IgPT0gLUVJTykKIAkJcmVxdWVzdCA9IEVSUl9QVFIoLUVJTyk7IC8q
IFByZXZpb3VzIHJlc2V0IGZhaWxlZCEgKi8KIApAQCAtMzEyMCw3ICszMDg3LDcgQEAgdm9pZCBp
OTE1X2dlbV9yZXNldF9lbmdpbmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCX0K
IAogCS8qIFNldHVwIHRoZSBDUyB0byByZXN1bWUgZnJvbSB0aGUgYnJlYWRjcnVtYiBvZiB0aGUg
aHVuZyByZXF1ZXN0ICovCi0JZW5naW5lLT5yZXNldF9odyhlbmdpbmUsIHJlcXVlc3QpOworCWVu
Z2luZS0+cmVzZXQucmVzZXQoZW5naW5lLCByZXF1ZXN0KTsKIH0KIAogdm9pZCBpOTE1X2dlbV9y
ZXNldChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCkBAIC0zMTcyLDcgKzMxMzks
OCBAQCB2b2lkIGk5MTVfZ2VtX3Jlc2V0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp
dikKIAogdm9pZCBpOTE1X2dlbV9yZXNldF9maW5pc2hfZW5naW5lKHN0cnVjdCBpbnRlbF9lbmdp
bmVfY3MgKmVuZ2luZSkKIHsKLQl0YXNrbGV0X2VuYWJsZSgmZW5naW5lLT5leGVjbGlzdHMudGFz
a2xldCk7CisJZW5naW5lLT5yZXNldC5maW5pc2goZW5naW5lKTsKKwogCWt0aHJlYWRfdW5wYXJr
KGVuZ2luZS0+YnJlYWRjcnVtYnMuc2lnbmFsZXIpOwogCiAJaW50ZWxfdW5jb3JlX2ZvcmNld2Fr
ZV9wdXQoZW5naW5lLT5pOTE1LCBGT1JDRVdBS0VfQUxMKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJj
LmMKaW5kZXggMGJmYWViNTZiOGM3Li5mNjYyYTk1MjQyMzMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv
Z3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X2xyYy5jCkBAIC0xNjYzLDYgKzE2NjMsNDQgQEAgc3RhdGljIGludCBnZW45X2luaXRfcmVuZGVy
X3Jpbmcoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCXJldHVybiBpbml0X3dvcmth
cm91bmRzX3JpbmcoZW5naW5lKTsKIH0KIAorc3RhdGljIHN0cnVjdCBpOTE1X3JlcXVlc3QgKgor
ZXhlY2xpc3RzX3Jlc2V0X3ByZXBhcmUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQor
eworCXN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3RzICogY29uc3QgZXhlY2xpc3RzID0gJmVu
Z2luZS0+ZXhlY2xpc3RzOworCisJLyoKKwkgKiBQcmV2ZW50IHJlcXVlc3Qgc3VibWlzc2lvbiB0
byB0aGUgaGFyZHdhcmUgdW50aWwgd2UgaGF2ZQorCSAqIGNvbXBsZXRlZCB0aGUgcmVzZXQgaW4g
aTkxNV9nZW1fcmVzZXRfZmluaXNoKCkuIElmIGEgcmVxdWVzdAorCSAqIGlzIGNvbXBsZXRlZCBi
eSBvbmUgZW5naW5lLCBpdCBtYXkgdGhlbiBxdWV1ZSBhIHJlcXVlc3QKKwkgKiB0byBhIHNlY29u
ZCB2aWEgaXRzIGV4ZWNsaXN0cy0+dGFza2xldCAqanVzdCogYXMgd2UgYXJlCisJICogY2FsbGlu
ZyBlbmdpbmUtPmluaXRfaHcoKSBhbmQgYWxzbyB3cml0aW5nIHRoZSBFTFNQLgorCSAqIFR1cm5p
bmcgb2ZmIHRoZSBleGVjbGlzdHMtPnRhc2tsZXQgdW50aWwgdGhlIHJlc2V0IGlzIG92ZXIKKwkg
KiBwcmV2ZW50cyB0aGUgcmFjZS4KKwkgKgorCSAqIE5vdGUgdGhhdCB0aGlzIG5lZWRzIHRvIGJl
IGEgc2luZ2xlIGF0b21pYyBvcGVyYXRpb24gb24gdGhlCisJICogdGFza2xldCAoZmx1c2ggZXhp
c3RpbmcgdGFza3MsIHByZXZlbnQgbmV3IHRhc2tzKSB0byBwcmV2ZW50CisJICogYSByYWNlIGJl
dHdlZW4gcmVzZXQgYW5kIHNldC13ZWRnZWQuIEl0IGlzIG5vdCwgc28gd2UgZG8gdGhlIGJlc3QK
KwkgKiB3ZSBjYW4gYXRtIGFuZCBtYWtlIHN1cmUgd2UgZG9uJ3QgbG9jayB0aGUgbWFjaGluZSB1
cCBpbiB0aGUgbW9yZQorCSAqIGNvbW1vbiBjYXNlIG9mIHJlY3Vyc2l2ZWx5IGJlaW5nIGNhbGxl
ZCBmcm9tIHNldC13ZWRnZWQgZnJvbSBpbnNpZGUKKwkgKiBpOTE1X3Jlc2V0LgorCSAqLworCWlm
ICghYXRvbWljX3JlYWQoJmV4ZWNsaXN0cy0+dGFza2xldC5jb3VudCkpCisJCXRhc2tsZXRfa2ls
bCgmZXhlY2xpc3RzLT50YXNrbGV0KTsKKwl0YXNrbGV0X2Rpc2FibGUoJmV4ZWNsaXN0cy0+dGFz
a2xldCk7CisKKwkvKgorCSAqIFdlJ3JlIHVzaW5nIHdvcmtlciB0byBxdWV1ZSBwcmVlbXB0aW9u
IHJlcXVlc3RzIGZyb20gdGhlIHRhc2tsZXQgaW4KKwkgKiBHdUMgc3VibWlzc2lvbiBtb2RlLgor
CSAqIEV2ZW4gdGhvdWdoIHRhc2tsZXQgd2FzIGRpc2FibGVkLCB3ZSBtYXkgc3RpbGwgaGF2ZSBh
IHdvcmtlciBxdWV1ZWQuCisJICogTGV0J3MgbWFrZSBzdXJlIHRoYXQgYWxsIHdvcmtlcnMgc2No
ZWR1bGVkIGJlZm9yZSBkaXNhYmxpbmcgdGhlCisJICogdGFza2xldCBhcmUgY29tcGxldGVkIGJl
Zm9yZSBjb250aW51aW5nIHdpdGggdGhlIHJlc2V0LgorCSAqLworCWlmIChlbmdpbmUtPmk5MTUt
Pmd1Yy5wcmVlbXB0X3dxKQorCQlmbHVzaF93b3JrcXVldWUoZW5naW5lLT5pOTE1LT5ndWMucHJl
ZW1wdF93cSk7CisKKwlyZXR1cm4gaTkxNV9nZW1fZmluZF9hY3RpdmVfcmVxdWVzdChlbmdpbmUp
OworfQorCiBzdGF0aWMgdm9pZCByZXNldF9pcnEoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5n
aW5lKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGVuZ2luZS0+aTkx
NTsKQEAgLTE2OTIsOCArMTczMCw4IEBAIHN0YXRpYyB2b2lkIHJlc2V0X2lycShzdHJ1Y3QgaW50
ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJY2xlYXJfYml0KEVOR0lORV9JUlFfRVhFQ0xJU1QsICZl
bmdpbmUtPmlycV9wb3N0ZWQpOwogfQogCi1zdGF0aWMgdm9pZCByZXNldF9jb21tb25fcmluZyhz
dHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCi0JCQkgICAgICBzdHJ1Y3QgaTkxNV9yZXF1
ZXN0ICpyZXF1ZXN0KQorc3RhdGljIHZvaWQgZXhlY2xpc3RzX3Jlc2V0KHN0cnVjdCBpbnRlbF9l
bmdpbmVfY3MgKmVuZ2luZSwKKwkJCSAgICBzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpyZXF1ZXN0KQog
ewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfZXhlY2xpc3RzICogY29uc3QgZXhlY2xpc3RzID0gJmVu
Z2luZS0+ZXhlY2xpc3RzOwogCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjZTsKQEAgLTE3NjYsNiAr
MTgwNCwxMSBAQCBzdGF0aWMgdm9pZCByZXNldF9jb21tb25fcmluZyhzdHJ1Y3QgaW50ZWxfZW5n
aW5lX2NzICplbmdpbmUsCiAJdW53aW5kX3dhX3RhaWwocmVxdWVzdCk7CiB9CiAKK3N0YXRpYyB2
b2lkIGV4ZWNsaXN0c19yZXNldF9maW5pc2goc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5l
KQoreworCXRhc2tsZXRfZW5hYmxlKCZlbmdpbmUtPmV4ZWNsaXN0cy50YXNrbGV0KTsKK30KKwog
c3RhdGljIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfZW1pdF9wZHBzKHN0cnVjdCBpOTE1X3JlcXVl
c3QgKnJxKQogewogCXN0cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCA9IHJxLT5jdHgtPnBwZ3R0
OwpAQCAtMjA5MCw3ICsyMTMzLDEwIEBAIGxvZ2ljYWxfcmluZ19kZWZhdWx0X3ZmdW5jcyhzdHJ1
Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiB7CiAJLyogRGVmYXVsdCB2ZnVuY3Mgd2hpY2gg
Y2FuIGJlIG92ZXJyaWRlbiBieSBlYWNoIGVuZ2luZS4gKi8KIAllbmdpbmUtPmluaXRfaHcgPSBn
ZW44X2luaXRfY29tbW9uX3Jpbmc7Ci0JZW5naW5lLT5yZXNldF9odyA9IHJlc2V0X2NvbW1vbl9y
aW5nOworCisJZW5naW5lLT5yZXNldC5wcmVwYXJlID0gZXhlY2xpc3RzX3Jlc2V0X3ByZXBhcmU7
CisJZW5naW5lLT5yZXNldC5yZXNldCA9IGV4ZWNsaXN0c19yZXNldDsKKwllbmdpbmUtPnJlc2V0
LmZpbmlzaCA9IGV4ZWNsaXN0c19yZXNldF9maW5pc2g7CiAKIAllbmdpbmUtPmNvbnRleHRfcGlu
ID0gZXhlY2xpc3RzX2NvbnRleHRfcGluOwogCWVuZ2luZS0+Y29udGV4dF91bnBpbiA9IGV4ZWNs
aXN0c19jb250ZXh0X3VucGluOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfcmluZ2J1ZmZlci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5j
CmluZGV4IDA0ZDlkOWE5NDZhNy4uZWViY2M4NzdlZjYwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aW50ZWxfcmluZ2J1ZmZlci5jCkBAIC01MzAsOCArNTMwLDE2IEBAIHN0YXRpYyBpbnQgaW5pdF9y
aW5nX2NvbW1vbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUpCiAJcmV0dXJuIHJldDsK
IH0KIAotc3RhdGljIHZvaWQgcmVzZXRfcmluZ19jb21tb24oc3RydWN0IGludGVsX2VuZ2luZV9j
cyAqZW5naW5lLAotCQkJICAgICAgc3RydWN0IGk5MTVfcmVxdWVzdCAqcmVxdWVzdCkKK3N0YXRp
YyBzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpyZXNldF9wcmVwYXJlKHN0cnVjdCBpbnRlbF9lbmdpbmVf
Y3MgKmVuZ2luZSkKK3sKKwlpZiAoZW5naW5lLT5pcnFfc2Vxbm9fYmFycmllcikKKwkJZW5naW5l
LT5pcnFfc2Vxbm9fYmFycmllcihlbmdpbmUpOworCisJcmV0dXJuIGk5MTVfZ2VtX2ZpbmRfYWN0
aXZlX3JlcXVlc3QoZW5naW5lKTsKK30KKworc3RhdGljIHZvaWQgcmVzZXRfcmluZyhzdHJ1Y3Qg
aW50ZWxfZW5naW5lX2NzICplbmdpbmUsCisJCSAgICAgICBzdHJ1Y3QgaTkxNV9yZXF1ZXN0ICpy
ZXF1ZXN0KQogewogCS8qCiAJICogUkM2IG11c3QgYmUgcHJldmVudGVkIHVudGlsIHRoZSByZXNl
dCBpcyBjb21wbGV0ZSBhbmQgdGhlIGVuZ2luZQpAQCAtNTk1LDYgKzYwMywxMCBAQCBzdGF0aWMg
dm9pZCByZXNldF9yaW5nX2NvbW1vbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJ
fQogfQogCitzdGF0aWMgdm9pZCByZXNldF9maW5pc2goc3RydWN0IGludGVsX2VuZ2luZV9jcyAq
ZW5naW5lKQoreworfQorCiBzdGF0aWMgaW50IGludGVsX3Jjc19jdHhfaW5pdChzdHJ1Y3QgaTkx
NV9yZXF1ZXN0ICpycSkKIHsKIAlpbnQgcmV0OwpAQCAtMTk4Nyw3ICsxOTk5LDkgQEAgc3RhdGlj
IHZvaWQgaW50ZWxfcmluZ19kZWZhdWx0X3ZmdW5jcyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq
ZGV2X3ByaXYsCiAJaW50ZWxfcmluZ19pbml0X3NlbWFwaG9yZXMoZGV2X3ByaXYsIGVuZ2luZSk7
CiAKIAllbmdpbmUtPmluaXRfaHcgPSBpbml0X3JpbmdfY29tbW9uOwotCWVuZ2luZS0+cmVzZXRf
aHcgPSByZXNldF9yaW5nX2NvbW1vbjsKKwllbmdpbmUtPnJlc2V0LnByZXBhcmUgPSByZXNldF9w
cmVwYXJlOworCWVuZ2luZS0+cmVzZXQucmVzZXQgPSByZXNldF9yaW5nOworCWVuZ2luZS0+cmVz
ZXQuZmluaXNoID0gcmVzZXRfZmluaXNoOwogCiAJZW5naW5lLT5jb250ZXh0X3BpbiA9IGludGVs
X3JpbmdfY29udGV4dF9waW47CiAJZW5naW5lLT5jb250ZXh0X3VucGluID0gaW50ZWxfcmluZ19j
b250ZXh0X3VucGluOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmlu
Z2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oCmluZGV4
IDFmNTA3MjdhNWRkYi4uZTI2ODEzMDNjZTIxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf
cmluZ2J1ZmZlci5oCkBAIC00MTgsOCArNDE4LDEzIEBAIHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg
ewogCXZvaWQJCSgqaXJxX2Rpc2FibGUpKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZSk7
CiAKIAlpbnQJCSgqaW5pdF9odykoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKLQl2
b2lkCQkoKnJlc2V0X2h3KShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCi0JCQkJICAg
IHN0cnVjdCBpOTE1X3JlcXVlc3QgKnJxKTsKKworCXN0cnVjdCB7CisJCXN0cnVjdCBpOTE1X3Jl
cXVlc3QgKigqcHJlcGFyZSkoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKTsKKwkJdm9p
ZCAoKnJlc2V0KShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUsCisJCQkgICAgICBzdHJ1
Y3QgaTkxNV9yZXF1ZXN0ICpycSk7CisJCXZvaWQgKCpmaW5pc2gpKHN0cnVjdCBpbnRlbF9lbmdp
bmVfY3MgKmVuZ2luZSk7CisJfSByZXNldDsKIAogCXZvaWQJCSgqcGFyaykoc3RydWN0IGludGVs
X2VuZ2luZV9jcyAqZW5naW5lKTsKIAl2b2lkCQkoKnVucGFyaykoc3RydWN0IGludGVsX2VuZ2lu
ZV9jcyAqZW5naW5lKTsKLS0gCjIuMTYuMgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu
ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz
dGluZm8vaW50ZWwtZ2Z4Cg==