From: Nick Hoath Subject: [PATCH 3/6] drm/i915: Unify execlist and legacy request life-cycles Date: Tue, 20 Oct 2015 10:23:53 +0100 Message-ID: <1445333036-22164-4-git-send-email-nicholas.hoath@intel.com> References: <1445333036-22164-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: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 52D926E78C for ; Tue, 20 Oct 2015 02:28:04 -0700 (PDT) In-Reply-To: <1445333036-22164-1-git-send-email-nicholas.hoath@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 Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org VGhlcmUgaXMgYSBkZXNpcmUgdG8gc2ltcGxpZnkgdGhlIGk5MTUgZHJpdmVyIGJ5IHJlZHVjaW5n IHRoZSBudW1iZXIgb2YKZGlmZmVyZW50IGNvZGUgcGF0aHMgaW50cm9kdWNlZCBieSB0aGUgTFJD IC8gZXhlY2xpc3RzIHN1cHBvcnQuICBBcyB0aGUKZXhlY2xpc3RzIHJlcXVlc3QgaXMgbm93IHBh cnQgb2YgdGhlIGdlbSByZXF1ZXN0IGl0IGlzIHBvc3NpYmxlIGFuZApkZXNpcmFibGUgdG8gdW5p ZnkgdGhlIHJlcXVlc3QgbGlmZS1jeWNsZXMgZm9yIGV4ZWNsaXN0IGFuZCBsZWdhY3kKcmVxdWVz dHMuCgpBIHJlcXVlc3QgaXMgY29uc2lkZXJlZCByZXRpcmVhYmxlIGlmIGl0cyBzZXFubyBwYXNz ZWQgKGkuZS4gdGhlIHJlcXVlc3QKaGFzIGNvbXBsZXRlZCkgYW5kIGVpdGhlciBpdCB3YXMgbmV2 ZXIgc3VibWl0dGVkIHRvIHRoZSBFTFNQIG9yIGl0cwpjb250ZXh0IGNvbXBsZXRlZC4gIFRoaXMg ZW5zdXJlcyB0aGF0IGNvbnRleHQgc2F2ZSBpcyBjYXJyaWVkIG91dCBiZWZvcmUKdGhlIGxhc3Qg cmVxdWVzdCBmb3IgYSBjb250ZXh0IGlzIGNvbnNpZGVyZWQgcmV0aXJlYWJsZS4gcmVxdWVzdF9j b21wbGV0ZSgpCm5vdyBjaGVja3MgdGhlIGVsc3Bfc3VibWl0dGVkIGNvdW50IHdoZW4gZGVjaWRp bmcgaWYgYSByZXF1ZXN0IGlzIGNvbXBsZXRlLgpSZXF1ZXN0cyB0aGF0IHdlcmUgbm90IHdhaXRp bmcgZm9yIGEgY29udGV4dApzd2l0Y2ggaW50ZXJydXB0IChlaXRoZXIgYXMgYSByZXN1bHQgb2Yg YmVpbmcgbWVyZ2VkIGludG8gYSBmb2xsb3dpbmcKcmVxdWVzdCBvciBieSBiZWluZyBhIGxlZ2Fj eSByZXF1ZXN0KSB3aWxsIGJlIGNvbnNpZGVyZWQgcmV0aXJlYWJsZSBhcwpzb29uIGFzIHRoZWly IHNlcW5vIGhhcyBwYXNzZWQuCgpSZW1vdmVkIHRoZSBleHRyYSByZXF1ZXN0IHJlZmVyZW5jZSBo ZWxkIGZvciB0aGUgZXhlY2xpc3QgcmVxdWVzdC4KClJlbW92ZWQgaW50ZWxfZXhlY2xpc3RzX3Jl dGlyZV9yZXF1ZXN0cygpIGFuZCBhbGwgcmVmZXJlbmNlcyB0bwppbnRlbF9lbmdpbmVfY3MuZXhl Y2xpc3RfcmV0aXJlZF9yZXFfbGlzdC4KCkNoYW5nZWQgZ2VuOF9jc19pcnFfaGFuZGxlcigpIHNv IHRoYXQgbm90aWZ5X3JpbmcoKSBpcyBjYWxsZWQgd2hlbgpjb250ZXh0cyBjb21wbGV0ZSBhcyB3 ZWxsIGFzIHdoZW4gYSB1c2VyIGludGVycnVwdCBvY2N1cnMgc28gdGhhdApub3RpZmljYXRpb24g aGFwcGVucyB3aGVuIGEgcmVxdWVzdCBpcyBjb21wbGV0ZSBhbmQgY29udGV4dCBzYXZlIGhhcwpm aW5pc2hlZC4KCnYyOiBSZWJhc2Ugb3ZlciB0aGUgcmVhZC1yZWFkIG9wdGltaXNhdGlvbiBjaGFu Z2VzCgp2MzogUmV3b3JrZWQgSVJRIGhhbmRsZXIgYWZ0ZXIgcmVtb3ZpbmcgSVJRIGhhbmRsZXIg Y2xlYW51cCBwYXRjaAoKdjQ6IEZpeGVkIHZhcmlvdXMgcGluIGxlYWtzCgp2NTogUmVtb3ZlZCBj dHhfY29tcGxldGUgZmxhZyAmIGFzc29jaWF0ZWQgY2hhbmdlcy4gUmVtb3ZlZCBleHRyYW5lb3Vz CglyZXF1ZXN0IHBpbiBvZiBjb250ZXh0LgoJKENocmlzIFdpbHNvbi9EYW5pZWwgVmV0dGVyKQoK SXNzdWU6IFZJWi00Mjc3ClNpZ25lZC1vZmYtYnk6IFRob21hcyBEYW5pZWwgPHRob21hcy5kYW5p ZWxAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBOaWNrIEhvYXRoIDxuaWNob2xhcy5ob2F0aEBp bnRlbC5jb20+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgpDYzog Q2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+Ci0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMgICAgICAgICB8IDIzICsrKysrKysrLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2lycS5jICAgICAgICAgfCAgNyArKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfbHJjLmMgICAgICAgIHwgNDUgKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaCAgICAgICAgfCAgMiArLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5oIHwgIDEgLQogNiBmaWxlcyBjaGFu Z2VkLCAyMSBpbnNlcnRpb25zKCspLCA1OSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaAppbmRleCA4YWZkYTQ1Li5hZTA4ZTU3IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAg LTI5MTQsNyArMjkxNCw3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpOTE1X2dlbV9yZXF1ZXN0X2Nv bXBsZXRlZChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwKIAogCXNlcW5vID0gcmVx LT5yaW5nLT5nZXRfc2Vxbm8ocmVxLT5yaW5nLCBsYXp5X2NvaGVyZW5jeSk7CiAKLQlyZXR1cm4g aTkxNV9zZXFub19wYXNzZWQoc2Vxbm8sIHJlcS0+c2Vxbm8pOworCXJldHVybiBpOTE1X3NlcW5v X3Bhc3NlZChzZXFubywgcmVxLT5zZXFubykgJiYgIXJlcS0+ZWxzcF9zdWJtaXR0ZWQ7CiB9CiAK IGludCBfX211c3RfY2hlY2sgaTkxNV9nZW1fZ2V0X3NlcW5vKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsIHUzMiAqc2Vxbm8pOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggZTU3MDYxYS4uMjkw YTFhYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0yODQ4LDEyICsyODQ4LDE2IEBAIGk5 MTVfZ2VtX3JldGlyZV9yZXF1ZXN0c19yaW5nKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcp CiAKIAkJaWYgKCFsaXN0X2VtcHR5KCZvYmotPmxhc3RfcmVhZF9yZXFbcmluZy0+aWRdLT5saXN0 KSkKIAkJCWJyZWFrOworCQlpZiAoIWk5MTVfZ2VtX3JlcXVlc3RfY29tcGxldGVkKG9iai0+bGFz dF9yZWFkX3JlcVtyaW5nLT5pZF0sCisJCQkJdHJ1ZSkpCisJCQlicmVhazsKIAogCQlpOTE1X2dl bV9vYmplY3RfcmV0aXJlX19yZWFkKG9iaiwgcmluZy0+aWQpOwogCX0KIAogCWlmICh1bmxpa2Vs eShyaW5nLT50cmFjZV9pcnFfcmVxICYmCi0JCSAgICAgaTkxNV9nZW1fcmVxdWVzdF9jb21wbGV0 ZWQocmluZy0+dHJhY2VfaXJxX3JlcSwgdHJ1ZSkpKSB7CisJCSAgICAgaTkxNV9nZW1fcmVxdWVz dF9jb21wbGV0ZWQocmluZy0+dHJhY2VfaXJxX3JlcSwKKwkJCQl0cnVlKSkpIHsKIAkJcmluZy0+ aXJxX3B1dChyaW5nKTsKIAkJaTkxNV9nZW1fcmVxdWVzdF9hc3NpZ24oJnJpbmctPnRyYWNlX2ly cV9yZXEsIE5VTEwpOwogCX0KQEAgLTI4NzIsMTUgKzI4NzYsNiBAQCBpOTE1X2dlbV9yZXRpcmVf cmVxdWVzdHMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlmb3JfZWFjaF9yaW5nKHJpbmcsIGRl dl9wcml2LCBpKSB7CiAJCWk5MTVfZ2VtX3JldGlyZV9yZXF1ZXN0c19yaW5nKHJpbmcpOwogCQlp ZGxlICY9IGxpc3RfZW1wdHkoJnJpbmctPnJlcXVlc3RfbGlzdCk7Ci0JCWlmIChpOTE1LmVuYWJs ZV9leGVjbGlzdHMpIHsKLQkJCXVuc2lnbmVkIGxvbmcgZmxhZ3M7Ci0KLQkJCXNwaW5fbG9ja19p cnFzYXZlKCZyaW5nLT5leGVjbGlzdF9sb2NrLCBmbGFncyk7Ci0JCQlpZGxlICY9IGxpc3RfZW1w dHkoJnJpbmctPmV4ZWNsaXN0X3F1ZXVlKTsKLQkJCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUoJnJp bmctPmV4ZWNsaXN0X2xvY2ssIGZsYWdzKTsKLQotCQkJaW50ZWxfZXhlY2xpc3RzX3JldGlyZV9y ZXF1ZXN0cyhyaW5nKTsKLQkJfQogCX0KIAogCWlmIChpZGxlKQpAQCAtMjk1NiwxMiArMjk1MSwx NCBAQCBpOTE1X2dlbV9vYmplY3RfZmx1c2hfYWN0aXZlKHN0cnVjdCBkcm1faTkxNV9nZW1fb2Jq ZWN0ICpvYmopCiAJCWlmIChyZXEgPT0gTlVMTCkKIAkJCWNvbnRpbnVlOwogCi0JCWlmIChsaXN0 X2VtcHR5KCZyZXEtPmxpc3QpKQotCQkJZ290byByZXRpcmU7CisJCWlmIChsaXN0X2VtcHR5KCZy ZXEtPmxpc3QpKSB7CisJCQlpZiAoaTkxNV9nZW1fcmVxdWVzdF9jb21wbGV0ZWQocmVxLCB0cnVl KSkKKwkJCQlpOTE1X2dlbV9vYmplY3RfcmV0aXJlX19yZWFkKG9iaiwgaSk7CisJCQljb250aW51 ZTsKKwkJfQogCiAJCWlmIChpOTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRlZChyZXEsIHRydWUpKSB7 CiAJCQlfX2k5MTVfZ2VtX3JlcXVlc3RfcmV0aXJlX191cHRvKHJlcSk7Ci1yZXRpcmU6CiAJCQlp OTE1X2dlbV9vYmplY3RfcmV0aXJlX19yZWFkKG9iaiwgaSk7CiAJCX0KIAl9CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9pcnEuYwppbmRleCA3ODM3ZjVlLi44NmE2NjYyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2lycS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJx LmMKQEAgLTEyOTQsMTAgKzEyOTQsMTEgQEAgc3RhdGljIF9fYWx3YXlzX2lubGluZSB2b2lkCiAJ CWdlbjhfY3NfaXJxX2hhbmRsZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywgdTMyIGlp ciwKIAkJCQkgICAgaW50IHRlc3Rfc2hpZnQpCiB7Ci0JaWYgKGlpciAmIChHVF9SRU5ERVJfVVNF Ul9JTlRFUlJVUFQgPDwgdGVzdF9zaGlmdCkpCi0JCW5vdGlmeV9yaW5nKHJpbmcpOworCWJvb2wg bmVlZF9ub3RpZnkgPSBmYWxzZTsKIAlpZiAoaWlyICYgKEdUX0NPTlRFWFRfU1dJVENIX0lOVEVS UlVQVCA8PCB0ZXN0X3NoaWZ0KSkKLQkJaW50ZWxfbHJjX2lycV9oYW5kbGVyKHJpbmcpOworCQlu ZWVkX25vdGlmeSA9IGludGVsX2xyY19pcnFfaGFuZGxlcihyaW5nKTsKKwlpZiAoKGlpciAmIChH VF9SRU5ERVJfVVNFUl9JTlRFUlJVUFQgPDwgdGVzdF9zaGlmdCkpIHx8IG5lZWRfbm90aWZ5KQor CQlub3RpZnlfcmluZyhyaW5nKTsKIH0KIAogc3RhdGljIGlycXJldHVybl90IGdlbjhfZ3RfaXJx X2hhbmRsZXIoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LApkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9scmMuYwppbmRleCA4OGUxMmJkLi44NDI4ZWJkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s cmMuYwpAQCAtNDI2LDkgKzQyNiw4IEBAIHN0YXRpYyB2b2lkIGV4ZWNsaXN0c19jb250ZXh0X3Vu cXVldWUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAkJCS8qIFNhbWUgY3R4OiBpZ25v cmUgZmlyc3QgcmVxdWVzdCwgYXMgc2Vjb25kIHJlcXVlc3QKIAkJCSAqIHdpbGwgdXBkYXRlIHRh aWwgcGFzdCBmaXJzdCByZXF1ZXN0J3Mgd29ya2xvYWQgKi8KIAkJCWN1cnNvci0+ZWxzcF9zdWJt aXR0ZWQgPSByZXEwLT5lbHNwX3N1Ym1pdHRlZDsKKwkJCXJlcTAtPmVsc3Bfc3VibWl0dGVkID0g MDsKIAkJCWxpc3RfZGVsKCZyZXEwLT5leGVjbGlzdF9saW5rKTsKLQkJCWxpc3RfYWRkX3RhaWwo JnJlcTAtPmV4ZWNsaXN0X2xpbmssCi0JCQkJJnJpbmctPmV4ZWNsaXN0X3JldGlyZWRfcmVxX2xp c3QpOwogCQkJcmVxMCA9IGN1cnNvcjsKIAkJfSBlbHNlIHsKIAkJCXJlcTEgPSBjdXJzb3I7CkBA IC00NzgsMTEgKzQ3Nyw4IEBAIHN0YXRpYyBib29sIGV4ZWNsaXN0c19jaGVja19yZW1vdmVfcmVx dWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQlpZiAoaW50ZWxfZXhlY2xpc3Rz X2N0eF9pZChjdHhfb2JqKSA9PSByZXF1ZXN0X2lkKSB7CiAJCQlXQVJOKGhlYWRfcmVxLT5lbHNw X3N1Ym1pdHRlZCA9PSAwLAogCQkJICAgICAiTmV2ZXIgc3VibWl0dGVkIGhlYWQgcmVxdWVzdFxu Iik7Ci0KIAkJCWlmICgtLWhlYWRfcmVxLT5lbHNwX3N1Ym1pdHRlZCA8PSAwKSB7CiAJCQkJbGlz dF9kZWwoJmhlYWRfcmVxLT5leGVjbGlzdF9saW5rKTsKLQkJCQlsaXN0X2FkZF90YWlsKCZoZWFk X3JlcS0+ZXhlY2xpc3RfbGluaywKLQkJCQkJJnJpbmctPmV4ZWNsaXN0X3JldGlyZWRfcmVxX2xp c3QpOwogCQkJCXJldHVybiB0cnVlOwogCQkJfQogCQl9CkBAIC00OTcsOCArNDkzLDkgQEAgc3Rh dGljIGJvb2wgZXhlY2xpc3RzX2NoZWNrX3JlbW92ZV9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnJpbmcsCiAgKgogICogQ2hlY2sgdGhlIHVucmVhZCBDb250ZXh0IFN0YXR1cyBCdWZm ZXJzIGFuZCBtYW5hZ2UgdGhlIHN1Ym1pc3Npb24gb2YgbmV3CiAgKiBjb250ZXh0cyB0byB0aGUg RUxTUCBhY2NvcmRpbmdseS4KKyAqIEByZXR1cm4gd2hldGhlciBhIGNvbnRleHQgY29tcGxldGVk CiAgKi8KLXZvaWQgaW50ZWxfbHJjX2lycV9oYW5kbGVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcpCitib29sIGludGVsX2xyY19pcnFfaGFuZGxlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHJpbmctPmRl di0+ZGV2X3ByaXZhdGU7CiAJdTMyIHN0YXR1c19wb2ludGVyOwpAQCAtNTU4LDYgKzU1NSw4IEBA IHZvaWQgaW50ZWxfbHJjX2lycV9oYW5kbGVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcp CiAJCSAgIF9NQVNLRURfRklFTEQoR0VOOF9DU0JfUFRSX01BU0sgPDwgOCwKIAkJCQkgKCh1MzIp cmluZy0+bmV4dF9jb250ZXh0X3N0YXR1c19idWZmZXIgJgogCQkJCSAgR0VOOF9DU0JfUFRSX01B U0spIDw8IDgpKTsKKworCXJldHVybiAoc3VibWl0X2NvbnRleHRzICE9IDApOwogfQogCiBzdGF0 aWMgaW50IGV4ZWNsaXN0c19jb250ZXh0X3F1ZXVlKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz dCAqcmVxdWVzdCkKQEAgLTU2NiwxMSArNTY1LDYgQEAgc3RhdGljIGludCBleGVjbGlzdHNfY29u dGV4dF9xdWV1ZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiAJc3RydWN0 IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpjdXJzb3I7CiAJaW50IG51bV9lbGVtZW50cyA9IDA7CiAK LQlpZiAocmVxdWVzdC0+Y3R4ICE9IHJpbmctPmRlZmF1bHRfY29udGV4dCkKLQkJaW50ZWxfbHJf Y29udGV4dF9waW4ocmVxdWVzdCk7Ci0KLQlpOTE1X2dlbV9yZXF1ZXN0X3JlZmVyZW5jZShyZXF1 ZXN0KTsKLQogCXNwaW5fbG9ja19pcnEoJnJpbmctPmV4ZWNsaXN0X2xvY2spOwogCiAJbGlzdF9m b3JfZWFjaF9lbnRyeShjdXJzb3IsICZyaW5nLT5leGVjbGlzdF9xdWV1ZSwgZXhlY2xpc3RfbGlu aykKQEAgLTU4OCw4ICs1ODIsNiBAQCBzdGF0aWMgaW50IGV4ZWNsaXN0c19jb250ZXh0X3F1ZXVl KHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCkKIAkJCVdBUk4odGFpbF9yZXEt PmVsc3Bfc3VibWl0dGVkICE9IDAsCiAJCQkJIk1vcmUgdGhhbiAyIGFscmVhZHktc3VibWl0dGVk IHJlcXMgcXVldWVkXG4iKTsKIAkJCWxpc3RfZGVsKCZ0YWlsX3JlcS0+ZXhlY2xpc3RfbGluayk7 Ci0JCQlsaXN0X2FkZF90YWlsKCZ0YWlsX3JlcS0+ZXhlY2xpc3RfbGluaywKLQkJCQkmcmluZy0+ ZXhlY2xpc3RfcmV0aXJlZF9yZXFfbGlzdCk7CiAJCX0KIAl9CiAKQEAgLTk0MywzMiArOTM1LDYg QEAgaW50IGludGVsX2V4ZWNsaXN0c19zdWJtaXNzaW9uKHN0cnVjdCBpOTE1X2V4ZWNidWZmZXJf cGFyYW1zICpwYXJhbXMsCiAJcmV0dXJuIDA7CiB9CiAKLXZvaWQgaW50ZWxfZXhlY2xpc3RzX3Jl dGlyZV9yZXF1ZXN0cyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQotewotCXN0cnVjdCBk cm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxLCAqdG1wOwotCXN0cnVjdCBsaXN0X2hlYWQgcmV0aXJl ZF9saXN0OwotCi0JV0FSTl9PTighbXV0ZXhfaXNfbG9ja2VkKCZyaW5nLT5kZXYtPnN0cnVjdF9t dXRleCkpOwotCWlmIChsaXN0X2VtcHR5KCZyaW5nLT5leGVjbGlzdF9yZXRpcmVkX3JlcV9saXN0 KSkKLQkJcmV0dXJuOwotCi0JSU5JVF9MSVNUX0hFQUQoJnJldGlyZWRfbGlzdCk7Ci0Jc3Bpbl9s b2NrX2lycSgmcmluZy0+ZXhlY2xpc3RfbG9jayk7Ci0JbGlzdF9yZXBsYWNlX2luaXQoJnJpbmct PmV4ZWNsaXN0X3JldGlyZWRfcmVxX2xpc3QsICZyZXRpcmVkX2xpc3QpOwotCXNwaW5fdW5sb2Nr X2lycSgmcmluZy0+ZXhlY2xpc3RfbG9jayk7Ci0KLQlsaXN0X2Zvcl9lYWNoX2VudHJ5X3NhZmUo cmVxLCB0bXAsICZyZXRpcmVkX2xpc3QsIGV4ZWNsaXN0X2xpbmspIHsKLQkJc3RydWN0IGludGVs X2NvbnRleHQgKmN0eCA9IHJlcS0+Y3R4OwotCQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAq Y3R4X29iaiA9Ci0JCQkJY3R4LT5lbmdpbmVbcmluZy0+aWRdLnN0YXRlOwotCi0JCWlmIChjdHhf b2JqICYmIChjdHggIT0gcmluZy0+ZGVmYXVsdF9jb250ZXh0KSkKLQkJCWludGVsX2xyX2NvbnRl eHRfdW5waW4ocmVxKTsKLQkJbGlzdF9kZWwoJnJlcS0+ZXhlY2xpc3RfbGluayk7Ci0JCWk5MTVf Z2VtX3JlcXVlc3RfdW5yZWZlcmVuY2UocmVxKTsKLQl9Ci19Ci0KIHZvaWQgaW50ZWxfbG9naWNh bF9yaW5nX3N0b3Aoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIHsKIAlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSByaW5nLT5kZXYtPmRldl9wcml2YXRlOwpAQCAtMTky NCw3ICsxODkwLDYgQEAgc3RhdGljIGludCBsb2dpY2FsX3JpbmdfaW5pdChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LCBzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW4KIAlpbml0X3dhaXRxdWV1ZV9o ZWFkKCZyaW5nLT5pcnFfcXVldWUpOwogCiAJSU5JVF9MSVNUX0hFQUQoJnJpbmctPmV4ZWNsaXN0 X3F1ZXVlKTsKLQlJTklUX0xJU1RfSEVBRCgmcmluZy0+ZXhlY2xpc3RfcmV0aXJlZF9yZXFfbGlz dCk7CiAJc3Bpbl9sb2NrX2luaXQoJnJpbmctPmV4ZWNsaXN0X2xvY2spOwogCiAJcmV0ID0gaTkx NV9jbWRfcGFyc2VyX2luaXRfcmluZyhyaW5nKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgKaW5k ZXggNGU2MGQ1NC4uZTZhNDkwMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfbHJjLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmgKQEAgLTk1LDcg Kzk1LDcgQEAgaW50IGludGVsX2V4ZWNsaXN0c19zdWJtaXNzaW9uKHN0cnVjdCBpOTE1X2V4ZWNi dWZmZXJfcGFyYW1zICpwYXJhbXMsCiAJCQkgICAgICAgc3RydWN0IGxpc3RfaGVhZCAqdm1hcyk7 CiB1MzIgaW50ZWxfZXhlY2xpc3RzX2N0eF9pZChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAq Y3R4X29iaik7CiAKLXZvaWQgaW50ZWxfbHJjX2lycV9oYW5kbGVyKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnJpbmcpOworYm9vbCBpbnRlbF9scmNfaXJxX2hhbmRsZXIoc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqcmluZyk7CiB2b2lkIGludGVsX2V4ZWNsaXN0c19yZXRpcmVfcmVxdWVzdHMoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CiAKICNlbmRpZiAvKiBfSU5URUxfTFJDX0hfICov CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXggNDlmYTQxZC4uZDk5 YjE2NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5o CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaApAQCAtMjY0LDcg KzI2NCw2IEBAIHN0cnVjdCAgaW50ZWxfZW5naW5lX2NzIHsKIAkvKiBFeGVjbGlzdHMgKi8KIAlz cGlubG9ja190IGV4ZWNsaXN0X2xvY2s7CiAJc3RydWN0IGxpc3RfaGVhZCBleGVjbGlzdF9xdWV1 ZTsKLQlzdHJ1Y3QgbGlzdF9oZWFkIGV4ZWNsaXN0X3JldGlyZWRfcmVxX2xpc3Q7CiAJdTggbmV4 dF9jb250ZXh0X3N0YXR1c19idWZmZXI7CiAJdTMyICAgICAgICAgICAgIGlycV9rZWVwX21hc2s7 IC8qIGJpdG1hc2sgZm9yIGludGVycnVwdHMgdGhhdCBzaG91bGQgbm90IGJlIG1hc2tlZCAqLwog CWludAkJKCplbWl0X3JlcXVlc3QpKHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVz dCk7Ci0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1n ZngK