From mboxrd@z Thu Jan  1 00:00:00 1970
From: Nick Hoath <nicholas.hoath@intel.com>
Subject: [PATCH 4/4] drm/i915: Subsume intel_ctx_submit_request
	in to drm_i915_gem_request
Date: Mon, 22 Dec 2014 09:37:24 +0000
Message-ID: <1419241044-929-5-git-send-email-nicholas.hoath@intel.com>
References: <1419241044-929-1-git-send-email-nicholas.hoath@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 mga09.intel.com (mga09.intel.com [134.134.136.24])
 by gabe.freedesktop.org (Postfix) with ESMTP id 32B3E6E21A
 for <intel-gfx@lists.freedesktop.org>; Mon, 22 Dec 2014 01:37:35 -0800 (PST)
In-Reply-To: <1419241044-929-1-git-send-email-nicholas.hoath@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
Cc: daniel.vetter@ffwll.ch
List-Id: intel-gfx@lists.freedesktop.org

TW92ZSBhbGwgcmVtYWluaW5nIGVsZW1lbnRzIHRoYXQgd2VyZSB1bmlxdWUgdG8gZXhlY2xpc3Rz
IHF1ZXVlIGl0ZW1zCmluIHRvIHRoZSBhc3NvY2lhdGVkIHJlcXVlc3QuCgpJc3N1ZTogVklaLTQy
NzQKCnYyOiBSZWJhc2UuIEZpeGVkIGlzc3VlIG9mIG92ZXJ6ZWFsb3VzIGZyZWVpbmcgb2YgcmVx
dWVzdC4KdjM6IFJlbW92ZWQgcmUtYWRkaXRpb24gb2YgY2xlYW51cCB3b3JrIHF1ZXVlIChmb3Vu
ZCBieSBEYW5pZWwgVmV0dGVyKQpTaWduZWQtb2ZmLWJ5OiBOaWNrIEhvYXRoIDxuaWNob2xhcy5o
b2F0aEBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMg
fCAgOCArKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICB8IDIxICsr
KysrKysrKysrKysrKysrKwogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgfCAg
NiArKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgfCA0NCArKysrKysr
KysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDQ2IGluc2Vy
dGlvbnMoKyksIDMzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2k5MTVfZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMK
aW5kZXggZDRjYzQ4Mi4uYjJkZmFjNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv
aTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMK
QEAgLTE5MjgsNyArMTkyOCw3IEBAIHN0YXRpYyBpbnQgaTkxNV9leGVjbGlzdHMoc3RydWN0IHNl
cV9maWxlICptLCB2b2lkICpkYXRhKQogCWludGVsX3J1bnRpbWVfcG1fZ2V0KGRldl9wcml2KTsK
IAogCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYsIHJpbmdfaWQpIHsKLQkJc3RydWN0IGlu
dGVsX2N0eF9zdWJtaXRfcmVxdWVzdCAqaGVhZF9yZXEgPSBOVUxMOworCQlzdHJ1Y3QgZHJtX2k5
MTVfZ2VtX3JlcXVlc3QgKmhlYWRfcmVxID0gTlVMTDsKIAkJaW50IGNvdW50ID0gMDsKIAkJdW5z
aWduZWQgbG9uZyBmbGFnczsKIApAQCAtMTk2MSwxOCArMTk2MSwxOCBAQCBzdGF0aWMgaW50IGk5
MTVfZXhlY2xpc3RzKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKIAkJbGlzdF9mb3Jf
ZWFjaChjdXJzb3IsICZyaW5nLT5leGVjbGlzdF9xdWV1ZSkKIAkJCWNvdW50Kys7CiAJCWhlYWRf
cmVxID0gbGlzdF9maXJzdF9lbnRyeV9vcl9udWxsKCZyaW5nLT5leGVjbGlzdF9xdWV1ZSwKLQkJ
CQlzdHJ1Y3QgaW50ZWxfY3R4X3N1Ym1pdF9yZXF1ZXN0LCBleGVjbGlzdF9saW5rKTsKKwkJCQlz
dHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QsIGV4ZWNsaXN0X2xpbmspOwogCQlzcGluX3VubG9j
a19pcnFyZXN0b3JlKCZyaW5nLT5leGVjbGlzdF9sb2NrLCBmbGFncyk7CiAKIAkJc2VxX3ByaW50
ZihtLCAiXHQlZCByZXF1ZXN0cyBpbiBxdWV1ZVxuIiwgY291bnQpOwogCQlpZiAoaGVhZF9yZXEp
IHsKIAkJCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqOwogCi0JCQljdHhfb2Jq
ID0gaGVhZF9yZXEtPnJlcXVlc3QtPmN0eC0+ZW5naW5lW3JpbmdfaWRdLnN0YXRlOworCQkJY3R4
X29iaiA9IGhlYWRfcmVxLT5jdHgtPmVuZ2luZVtyaW5nX2lkXS5zdGF0ZTsKIAkJCXNlcV9wcmlu
dGYobSwgIlx0SGVhZCByZXF1ZXN0IGlkOiAldVxuIiwKIAkJCQkgICBpbnRlbF9leGVjbGlzdHNf
Y3R4X2lkKGN0eF9vYmopKTsKIAkJCXNlcV9wcmludGYobSwgIlx0SGVhZCByZXF1ZXN0IHRhaWw6
ICV1XG4iLAotCQkJCSAgIGhlYWRfcmVxLT5yZXF1ZXN0LT50YWlsKTsKKwkJCQkgICBoZWFkX3Jl
cS0+dGFpbCk7CiAJCX0KIAogCQlzZXFfcHV0YyhtLCAnXG4nKTsKZGlmZiAtLWdpdCBhL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry
di5oCmluZGV4IDkyMWU0YzUuLjM3MDIwNzMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAt
MjA3OCw2ICsyMDc4LDI3IEBAIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCB7CiAJc3RydWN0
IGxpc3RfaGVhZCBjbGllbnRfbGlzdDsKIAogCXVpbnQzMl90IHVuaXE7CisKKwkvKioKKwkgKiBU
aGUgRUxTUCBvbmx5IGFjY2VwdHMgdHdvIGVsZW1lbnRzIGF0IGEgdGltZSwgc28gd2UgcXVldWUK
KwkgKiBjb250ZXh0L3RhaWwgcGFpcnMgb24gYSBnaXZlbiBxdWV1ZSAocmluZy0+ZXhlY2xpc3Rf
cXVldWUpIHVudGlsIHRoZQorCSAqIGhhcmR3YXJlIGlzIGF2YWlsYWJsZS4gVGhlIHF1ZXVlIHNl
cnZlcyBhIGRvdWJsZSBwdXJwb3NlOiB3ZSBhbHNvIHVzZQorCSAqIGl0IHRvIGtlZXAgdHJhY2sg
b2YgdGhlIHVwIHRvIDIgY29udGV4dHMgY3VycmVudGx5IGluIHRoZSBoYXJkd2FyZQorCSAqICh1
c3VhbGx5IG9uZSBpbiBleGVjdXRpb24gYW5kIHRoZSBvdGhlciBxdWV1ZWQgdXAgYnkgdGhlIEdQ
VSk6IFdlCisJICogb25seSByZW1vdmUgZWxlbWVudHMgZnJvbSB0aGUgaGVhZAorCSAqIG9mIHRo
ZSBxdWV1ZSB3aGVuIHRoZSBoYXJkd2FyZSBpbmZvcm1zIHVzIHRoYXQgYW4gZWxlbWVudCBoYXMg
YmVlbgorCSAqIGNvbXBsZXRlZC4KKwkgKgorCSAqIEFsbCBhY2Nlc3NlcyB0byB0aGUgcXVldWUg
YXJlIG1lZGlhdGVkIGJ5IGEgc3BpbmxvY2sKKwkgKiAocmluZy0+ZXhlY2xpc3RfbG9jaykuCisJ
ICovCisKKwkvKiogRXhlY2xpc3QgbGluayBpbiB0aGUgc3VibWlzc2lvbiBxdWV1ZS4qLworCXN0
cnVjdCBsaXN0X2hlYWQgZXhlY2xpc3RfbGluazsKKworCS8qKiBFeGVjbGlzdHMgbm8uIG9mIHRp
bWVzIHRoaXMgcmVxdWVzdCBoYXMgYmVlbiBzZW50IHRvIHRoZSBFTFNQICovCisJaW50IGVsc3Bf
c3VibWl0dGVkOworCiB9OwogCiB2b2lkIGk5MTVfZ2VtX3JlcXVlc3RfZnJlZShzdHJ1Y3Qga3Jl
ZiAqcmVxX3JlZik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5j
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCA3M2MxYTIyLi5mN2YyMzVj
IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZl
cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTI2NjEsMTQgKzI2NjEsMTQgQEAgc3RhdGlj
IHZvaWQgaTkxNV9nZW1fcmVzZXRfcmluZ19jbGVhbnVwKHN0cnVjdCBkcm1faTkxNV9wcml2YXRl
ICpkZXZfcHJpdiwKIAkgKiBwaW5uZWQgaW4gcGxhY2UuCiAJICovCiAJd2hpbGUgKCFsaXN0X2Vt
cHR5KCZyaW5nLT5leGVjbGlzdF9xdWV1ZSkpIHsKLQkJc3RydWN0IGludGVsX2N0eF9zdWJtaXRf
cmVxdWVzdCAqc3VibWl0X3JlcTsKKwkJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpzdWJt
aXRfcmVxOwogCiAJCXN1Ym1pdF9yZXEgPSBsaXN0X2ZpcnN0X2VudHJ5KCZyaW5nLT5leGVjbGlz
dF9xdWV1ZSwKLQkJCQlzdHJ1Y3QgaW50ZWxfY3R4X3N1Ym1pdF9yZXF1ZXN0LAorCQkJCXN0cnVj
dCBkcm1faTkxNV9nZW1fcmVxdWVzdCwKIAkJCQlleGVjbGlzdF9saW5rKTsKIAkJbGlzdF9kZWwo
JnN1Ym1pdF9yZXEtPmV4ZWNsaXN0X2xpbmspOwogCQlpbnRlbF9ydW50aW1lX3BtX3B1dChkZXZf
cHJpdik7Ci0JCWk5MTVfZ2VtX2NvbnRleHRfdW5yZWZlcmVuY2Uoc3VibWl0X3JlcS0+cmVxdWVz
dC0+Y3R4KTsKKwkJaTkxNV9nZW1fY29udGV4dF91bnJlZmVyZW5jZShzdWJtaXRfcmVxLT5jdHgp
OwogCQlrZnJlZShzdWJtaXRfcmVxKTsKIAl9CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry
bS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKaW5k
ZXggNDI3ZDU2MS4uOTY2Nzc3YyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfbHJjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMKQEAgLTQwNCw4
ICs0MDQsOCBAQCBzdGF0aWMgdm9pZCBleGVjbGlzdHNfc3VibWl0X2NvbnRleHRzKHN0cnVjdCBp
bnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAKIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19jb250ZXh0X3Vu
cXVldWUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIHsKLQlzdHJ1Y3QgaW50ZWxfY3R4
X3N1Ym1pdF9yZXF1ZXN0ICpyZXEwID0gTlVMTCwgKnJlcTEgPSBOVUxMOwotCXN0cnVjdCBpbnRl
bF9jdHhfc3VibWl0X3JlcXVlc3QgKmN1cnNvciA9IE5VTEwsICp0bXAgPSBOVUxMOworCXN0cnVj
dCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxMCA9IE5VTEwsICpyZXExID0gTlVMTDsKKwlzdHJ1
Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKmN1cnNvciA9IE5VTEwsICp0bXAgPSBOVUxMOwogCiAJ
YXNzZXJ0X3NwaW5fbG9ja2VkKCZyaW5nLT5leGVjbGlzdF9sb2NrKTsKIApAQCAtNDE3LDcgKzQx
Nyw3IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19jb250ZXh0X3VucXVldWUoc3RydWN0IGludGVs
X2VuZ2luZV9jcyAqcmluZykKIAkJCQkgZXhlY2xpc3RfbGluaykgewogCQlpZiAoIXJlcTApIHsK
IAkJCXJlcTAgPSBjdXJzb3I7Ci0JCX0gZWxzZSBpZiAocmVxMC0+cmVxdWVzdC0+Y3R4ID09IGN1
cnNvci0+cmVxdWVzdC0+Y3R4KSB7CisJCX0gZWxzZSBpZiAocmVxMC0+Y3R4ID09IGN1cnNvci0+
Y3R4KSB7CiAJCQkvKiBTYW1lIGN0eDogaWdub3JlIGZpcnN0IHJlcXVlc3QsIGFzIHNlY29uZCBy
ZXF1ZXN0CiAJCQkgKiB3aWxsIHVwZGF0ZSB0YWlsIHBhc3QgZmlyc3QgcmVxdWVzdCdzIHdvcmts
b2FkICovCiAJCQljdXJzb3ItPmVsc3Bfc3VibWl0dGVkID0gcmVxMC0+ZWxzcF9zdWJtaXR0ZWQ7
CkBAIC00MzMsOSArNDMzLDkgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX2NvbnRleHRfdW5xdWV1
ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogCiAJV0FSTl9PTihyZXExICYmIHJlcTEt
PmVsc3Bfc3VibWl0dGVkKTsKIAotCWV4ZWNsaXN0c19zdWJtaXRfY29udGV4dHMocmluZywgcmVx
MC0+cmVxdWVzdC0+Y3R4LCByZXEwLT5yZXF1ZXN0LT50YWlsLAotCQkJCSAgcmVxMSA/IHJlcTEt
PnJlcXVlc3QtPmN0eCA6IE5VTEwsCi0JCQkJICByZXExID8gcmVxMS0+cmVxdWVzdC0+dGFpbCA6
IDApOworCWV4ZWNsaXN0c19zdWJtaXRfY29udGV4dHMocmluZywgcmVxMC0+Y3R4LCByZXEwLT50
YWlsLAorCQkJCSAgcmVxMSA/IHJlcTEtPmN0eCA6IE5VTEwsCisJCQkJICByZXExID8gcmVxMS0+
dGFpbCA6IDApOwogCiAJcmVxMC0+ZWxzcF9zdWJtaXR0ZWQrKzsKIAlpZiAocmVxMSkKQEAgLTQ0
NSwxNyArNDQ1LDE3IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19jb250ZXh0X3VucXVldWUoc3Ry
dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIHN0YXRpYyBib29sIGV4ZWNsaXN0c19jaGVja19y
ZW1vdmVfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQkJCQkgICB1MzIg
cmVxdWVzdF9pZCkKIHsKLQlzdHJ1Y3QgaW50ZWxfY3R4X3N1Ym1pdF9yZXF1ZXN0ICpoZWFkX3Jl
cTsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKmhlYWRfcmVxOwogCiAJYXNzZXJ0X3Nw
aW5fbG9ja2VkKCZyaW5nLT5leGVjbGlzdF9sb2NrKTsKIAogCWhlYWRfcmVxID0gbGlzdF9maXJz
dF9lbnRyeV9vcl9udWxsKCZyaW5nLT5leGVjbGlzdF9xdWV1ZSwKLQkJCQkJICAgIHN0cnVjdCBp
bnRlbF9jdHhfc3VibWl0X3JlcXVlc3QsCisJCQkJCSAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3Jl
cXVlc3QsCiAJCQkJCSAgICBleGVjbGlzdF9saW5rKTsKIAogCWlmIChoZWFkX3JlcSAhPSBOVUxM
KSB7CiAJCXN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpjdHhfb2JqID0KLQkJCQloZWFkX3Jl
cS0+cmVxdWVzdC0+Y3R4LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlOworCQkJCWhlYWRfcmVxLT5j
dHgtPmVuZ2luZVtyaW5nLT5pZF0uc3RhdGU7CiAJCWlmIChpbnRlbF9leGVjbGlzdHNfY3R4X2lk
KGN0eF9vYmopID09IHJlcXVlc3RfaWQpIHsKIAkJCVdBUk4oaGVhZF9yZXEtPmVsc3Bfc3VibWl0
dGVkID09IDAsCiAJCQkgICAgICJOZXZlciBzdWJtaXR0ZWQgaGVhZCByZXF1ZXN0XG4iKTsKQEAg
LTUzNywxNyArNTM3LDExIEBAIHN0YXRpYyBpbnQgZXhlY2xpc3RzX2NvbnRleHRfcXVldWUoc3Ry
dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkJCQkgICB1MzIgdGFpbCwKIAkJCQkgICBzdHJ1
Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiB7Ci0Jc3RydWN0IGludGVsX2N0eF9z
dWJtaXRfcmVxdWVzdCAqcmVxID0gTlVMTCwgKmN1cnNvcjsKKwlzdHJ1Y3QgZHJtX2k5MTVfZ2Vt
X3JlcXVlc3QgKmN1cnNvcjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBy
aW5nLT5kZXYtPmRldl9wcml2YXRlOwogCXVuc2lnbmVkIGxvbmcgZmxhZ3M7CiAJaW50IG51bV9l
bGVtZW50cyA9IDA7CiAKLQlyZXEgPSBremFsbG9jKHNpemVvZigqcmVxKSwgR0ZQX0tFUk5FTCk7
Ci0JaWYgKHJlcSA9PSBOVUxMKQotCQlyZXR1cm4gLUVOT01FTTsKLQlyZXEtPmN0eCA9IHRvOwot
CWk5MTVfZ2VtX2NvbnRleHRfcmVmZXJlbmNlKHJlcS0+Y3R4KTsKLQogCWlmICh0byAhPSByaW5n
LT5kZWZhdWx0X2NvbnRleHQpCiAJCWludGVsX2xyX2NvbnRleHRfcGluKHJpbmcsIHRvKTsKIApA
QCAtNTY1LDkgKzU1OSw4IEBAIHN0YXRpYyBpbnQgZXhlY2xpc3RzX2NvbnRleHRfcXVldWUoc3Ry
dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAl9IGVsc2UgewogCQlXQVJOX09OKHRvICE9IHJl
cXVlc3QtPmN0eCk7CiAJfQotCXJlcS0+cmVxdWVzdCA9IHJlcXVlc3Q7CiAJaTkxNV9nZW1fcmVx
dWVzdF9yZWZlcmVuY2UocmVxdWVzdCk7Ci0JaTkxNV9nZW1fY29udGV4dF9yZWZlcmVuY2UocmVx
LT5yZXF1ZXN0LT5jdHgpOworCWk5MTVfZ2VtX2NvbnRleHRfcmVmZXJlbmNlKHJlcXVlc3QtPmN0
eCk7CiAKIAlpbnRlbF9ydW50aW1lX3BtX2dldChkZXZfcHJpdik7CiAKQEAgLTU3OCwxMyArNTcx
LDEzIEBAIHN0YXRpYyBpbnQgZXhlY2xpc3RzX2NvbnRleHRfcXVldWUoc3RydWN0IGludGVsX2Vu
Z2luZV9jcyAqcmluZywKIAkJCWJyZWFrOwogCiAJaWYgKG51bV9lbGVtZW50cyA+IDIpIHsKLQkJ
c3RydWN0IGludGVsX2N0eF9zdWJtaXRfcmVxdWVzdCAqdGFpbF9yZXE7CisJCXN0cnVjdCBkcm1f
aTkxNV9nZW1fcmVxdWVzdCAqdGFpbF9yZXE7CiAKIAkJdGFpbF9yZXEgPSBsaXN0X2xhc3RfZW50
cnkoJnJpbmctPmV4ZWNsaXN0X3F1ZXVlLAotCQkJCQkgICBzdHJ1Y3QgaW50ZWxfY3R4X3N1Ym1p
dF9yZXF1ZXN0LAorCQkJCQkgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QsCiAJCQkJCSAg
IGV4ZWNsaXN0X2xpbmspOwogCi0JCWlmICh0byA9PSB0YWlsX3JlcS0+cmVxdWVzdC0+Y3R4KSB7
CisJCWlmICh0byA9PSB0YWlsX3JlcS0+Y3R4KSB7CiAJCQlXQVJOKHRhaWxfcmVxLT5lbHNwX3N1
Ym1pdHRlZCAhPSAwLAogCQkJCSJNb3JlIHRoYW4gMiBhbHJlYWR5LXN1Ym1pdHRlZCByZXFzIHF1
ZXVlZFxuIik7CiAJCQlsaXN0X2RlbCgmdGFpbF9yZXEtPmV4ZWNsaXN0X2xpbmspOwpAQCAtNTkz
LDcgKzU4Niw3IEBAIHN0YXRpYyBpbnQgZXhlY2xpc3RzX2NvbnRleHRfcXVldWUoc3RydWN0IGlu
dGVsX2VuZ2luZV9jcyAqcmluZywKIAkJfQogCX0KIAotCWxpc3RfYWRkX3RhaWwoJnJlcS0+ZXhl
Y2xpc3RfbGluaywgJnJpbmctPmV4ZWNsaXN0X3F1ZXVlKTsKKwlsaXN0X2FkZF90YWlsKCZyZXF1
ZXN0LT5leGVjbGlzdF9saW5rLCAmcmluZy0+ZXhlY2xpc3RfcXVldWUpOwogCWlmIChudW1fZWxl
bWVudHMgPT0gMCkKIAkJZXhlY2xpc3RzX2NvbnRleHRfdW5xdWV1ZShyaW5nKTsKIApAQCAtNzYy
LDcgKzc1NSw3IEBAIGludCBpbnRlbF9leGVjbGlzdHNfc3VibWlzc2lvbihzdHJ1Y3QgZHJtX2Rl
dmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGUsCiAKIHZvaWQgaW50ZWxfZXhlY2xpc3Rz
X3JldGlyZV9yZXF1ZXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogewotCXN0cnVj
dCBpbnRlbF9jdHhfc3VibWl0X3JlcXVlc3QgKnJlcSwgKnRtcDsKKwlzdHJ1Y3QgZHJtX2k5MTVf
Z2VtX3JlcXVlc3QgKnJlcSwgKnRtcDsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By
aXYgPSByaW5nLT5kZXYtPmRldl9wcml2YXRlOwogCXVuc2lnbmVkIGxvbmcgZmxhZ3M7CiAJc3Ry
dWN0IGxpc3RfaGVhZCByZXRpcmVkX2xpc3Q7CkBAIC03NzcsNyArNzcwLDcgQEAgdm9pZCBpbnRl
bF9leGVjbGlzdHNfcmV0aXJlX3JlcXVlc3RzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcp
CiAJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmcmluZy0+ZXhlY2xpc3RfbG9jaywgZmxhZ3MpOwog
CiAJbGlzdF9mb3JfZWFjaF9lbnRyeV9zYWZlKHJlcSwgdG1wLCAmcmV0aXJlZF9saXN0LCBleGVj
bGlzdF9saW5rKSB7Ci0JCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHggPSByZXEtPnJlcXVlc3Qt
PmN0eDsKKwkJc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCA9IHJlcS0+Y3R4OwogCQlzdHJ1Y3Qg
ZHJtX2k5MTVfZ2VtX29iamVjdCAqY3R4X29iaiA9CiAJCQkJY3R4LT5lbmdpbmVbcmluZy0+aWRd
LnN0YXRlOwogCkBAIC03ODUsOSArNzc4LDggQEAgdm9pZCBpbnRlbF9leGVjbGlzdHNfcmV0aXJl
X3JlcXVlc3RzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJCQlpbnRlbF9scl9jb250
ZXh0X3VucGluKHJpbmcsIGN0eCk7CiAJCWludGVsX3J1bnRpbWVfcG1fcHV0KGRldl9wcml2KTsK
IAkJaTkxNV9nZW1fY29udGV4dF91bnJlZmVyZW5jZShjdHgpOwotCQlpOTE1X2dlbV9yZXF1ZXN0
X3VucmVmZXJlbmNlKHJlcS0+cmVxdWVzdCk7CisJCWk5MTVfZ2VtX3JlcXVlc3RfdW5yZWZlcmVu
Y2UocmVxKTsKIAkJbGlzdF9kZWwoJnJlcS0+ZXhlY2xpc3RfbGluayk7Ci0JCWtmcmVlKHJlcSk7
CiAJfQogfQogCi0tIAoyLjEuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl
c2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p
bnRlbC1nZngK