From: Nick Hoath Subject: [RFC 2/5] drm/i915: Unify execlist and legacy request life-cycles Date: Thu, 9 Jul 2015 11:57:41 +0100 Message-ID: <1436439464-17122-2-git-send-email-nicholas.hoath@intel.com> References: <1436439464-17122-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id CF3FB6E238 for ; Thu, 9 Jul 2015 03:57:53 -0700 (PDT) In-Reply-To: <1436439464-17122-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 List-Id: intel-gfx@lists.freedesktop.org VGhlcmUgaXMgYSBkZXNpcmUgdG8gc2ltcGxpZnkgdGhlIGk5MTUgZHJpdmVyIGJ5IHJlZHVjaW5n IHRoZSBudW1iZXIgb2YKZGlmZmVyZW50IGNvZGUgcGF0aHMgaW50cm9kdWNlZCBieSB0aGUgTFJD IC8gZXhlY2xpc3RzIHN1cHBvcnQuICBBcyB0aGUKZXhlY2xpc3RzIHJlcXVlc3QgaXMgbm93IHBh cnQgb2YgdGhlIGdlbSByZXF1ZXN0IGl0IGlzIHBvc3NpYmxlIGFuZApkZXNpcmFibGUgdG8gdW5p ZnkgdGhlIHJlcXVlc3QgbGlmZS1jeWNsZXMgZm9yIGV4ZWNsaXN0IGFuZCBsZWdhY3kKcmVxdWVz dHMuCgpBZGRlZCBhIGNvbnRleHQgY29tcGxldGUgZmxhZyB0byBhIHJlcXVlc3Qgd2hpY2ggZ2V0 cyBzZXQgZHVyaW5nIHRoZQpjb250ZXh0IHN3aXRjaCBpbnRlcnJ1cHQuCgpBZGRlZCBhIGZ1bmN0 aW9uIGk5MTVfZ2VtX3JlcXVlc3RfcmV0aXJlYWJsZSgpLiAgQSByZXF1ZXN0IGlzIGNvbnNpZGVy ZWQKcmV0aXJlYWJsZSBpZiBpdHMgc2Vxbm8gcGFzc2VkIChpLmUuIHRoZSByZXF1ZXN0IGhhcyBj b21wbGV0ZWQpIGFuZCBlaXRoZXIKaXQgd2FzIG5ldmVyIHN1Ym1pdHRlZCB0byB0aGUgRUxTUCBv ciBpdHMgY29udGV4dCBjb21wbGV0ZWQuICBUaGlzIGVuc3VyZXMKdGhhdCBjb250ZXh0IHNhdmUg aXMgY2FycmllZCBvdXQgYmVmb3JlIHRoZSBsYXN0IHJlcXVlc3QgZm9yIGEgY29udGV4dCBpcwpj b25zaWRlcmVkIHJldGlyZWFibGUuICByZXRpcmVfcmVxdWVzdHNfcmluZygpIG5vdyB1c2VzCmk5 MTVfZ2VtX3JlcXVlc3RfcmV0aXJlYWJsZSgpIHJhdGhlciB0aGFuIHJlcXVlc3RfY29tcGxldGUo KSB3aGVuIGRlY2lkaW5nCndoaWNoIHJlcXVlc3RzIHRvIHJldGlyZS4gUmVxdWVzdHMgdGhhdCB3 ZXJlIG5vdCB3YWl0aW5nIGZvciBhIGNvbnRleHQKc3dpdGNoIGludGVycnVwdCAoZWl0aGVyIGFz IGEgcmVzdWx0IG9mIGJlaW5nIG1lcmdlZCBpbnRvIGEgZm9sbG93aW5nCnJlcXVlc3Qgb3IgYnkg YmVpbmcgYSBsZWdhY3kgcmVxdWVzdCkgd2lsbCBiZSBjb25zaWRlcmVkIHJldGlyZWFibGUgYXMK c29vbiBhcyB0aGVpciBzZXFubyBoYXMgcGFzc2VkLgoKUmVtb3ZlZCB0aGUgZXh0cmEgcmVxdWVz dCByZWZlcmVuY2UgaGVsZCBmb3IgdGhlIGV4ZWNsaXN0IHJlcXVlc3QuCgpSZW1vdmVkIGludGVs X2V4ZWNsaXN0c19yZXRpcmVfcmVxdWVzdHMoKSBhbmQgYWxsIHJlZmVyZW5jZXMgdG8KaW50ZWxf ZW5naW5lX2NzLmV4ZWNsaXN0X3JldGlyZWRfcmVxX2xpc3QuCgpNb3ZlZCBjb250ZXh0IHVucGlu bmluZyBpbnRvIHJldGlyZV9yZXF1ZXN0c19yaW5nKCkgZm9yIG5vdy4gIEZ1cnRoZXIgd29yawpp cyBwZW5kaW5nIGZvciB0aGUgY29udGV4dCBwaW5uaW5nIC0gdGhpcyBwYXRjaCBzaG91bGQgYWxs b3cgdXMgdG8gdXNlIHRoZQphY3RpdmUgbGlzdCB0byB0cmFjayBjb250ZXh0IGFuZCByaW5nIGJ1 ZmZlciBvYmplY3RzIGxhdGVyLgoKQ2hhbmdlZCBnZW44X2NzX2lycV9oYW5kbGVyKCkgc28gdGhh dCBub3RpZnlfcmluZygpIGlzIGNhbGxlZCB3aGVuCmNvbnRleHRzIGNvbXBsZXRlIGFzIHdlbGwg YXMgd2hlbiBhIHVzZXIgaW50ZXJydXB0IG9jY3VycyBzbyB0aGF0Cm5vdGlmaWNhdGlvbiBoYXBw ZW5zIHdoZW4gYSByZXF1ZXN0IGlzIGNvbXBsZXRlIGFuZCBjb250ZXh0IHNhdmUgaGFzCmZpbmlz aGVkLgoKdjI6IFJlYmFzZSBvdmVyIHRoZSByZWFkLXJlYWQgb3B0aW1pc2F0aW9uIGNoYW5nZXMK ClNpZ25lZC1vZmYtYnk6IFRob21hcyBEYW5pZWwgPHRob21hcy5kYW5pZWxAaW50ZWwuY29tPgpT aWduZWQtb2ZmLWJ5OiBOaWNrIEhvYXRoIDxuaWNob2xhcy5ob2F0aEBpbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgIHwgIDYgKysrKwogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgIHwgNDkgKysrKysrKysrKysrKysrKysr KysrKystLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jICAgICAgICAg fCAgNiArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgfCA0NCAr KysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf bHJjLmggICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZm ZXIuaCB8ICAxIC0KIDYgZmlsZXMgY2hhbmdlZCwgNTMgaW5zZXJ0aW9ucygrKSwgNTUgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggMWRiZDk1Ny4uZWYwMjM3OCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yMjEzLDYgKzIyMTMsMTIgQEAgc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0IHsKIAkvKiogRXhlY2xpc3RzIG5vLiBvZiB0aW1lcyB0aGlzIHJlcXVl c3QgaGFzIGJlZW4gc2VudCB0byB0aGUgRUxTUCAqLwogCWludCBlbHNwX3N1Ym1pdHRlZDsKIAor CS8qKgorCSAqIEV4ZWNsaXN0czogd2hldGhlciB0aGlzIHJlcXVlc3RzJ3MgY29udGV4dCBoYXMg Y29tcGxldGVkIGFmdGVyCisJICogc3VibWlzc2lvbiB0byB0aGUgRUxTUAorCSAqLworCWJvb2wg Y3R4X2NvbXBsZXRlOworCiB9OwogCiBpbnQgaTkxNV9nZW1fcmVxdWVzdF9hbGxvYyhzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICpyaW5nLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggNDkwMTZl MC4uMzY4MWEzMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0yMzY4LDYgKzIzNjgsMTIg QEAgdm9pZCBpOTE1X3ZtYV9tb3ZlX3RvX2FjdGl2ZShzdHJ1Y3QgaTkxNV92bWEgKnZtYSwKIAls aXN0X21vdmVfdGFpbCgmdm1hLT5tbV9saXN0LCAmdm1hLT52bS0+YWN0aXZlX2xpc3QpOwogfQog CitzdGF0aWMgYm9vbCBpOTE1X2dlbV9yZXF1ZXN0X3JldGlyZWFibGUoc3RydWN0IGRybV9pOTE1 X2dlbV9yZXF1ZXN0ICpyZXEpCit7CisJcmV0dXJuIChpOTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRl ZChyZXEsIHRydWUpICYmCisJCSghcmVxLT5lbHNwX3N1Ym1pdHRlZCB8fCByZXEtPmN0eF9jb21w bGV0ZSkpOworfQorCiBzdGF0aWMgdm9pZAogaTkxNV9nZW1fb2JqZWN0X3JldGlyZV9fd3JpdGUo c3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaikKIHsKQEAgLTI4NTMsMTAgKzI4NTksMjgg QEAgaTkxNV9nZW1fcmV0aXJlX3JlcXVlc3RzX3Jpbmcoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq cmluZykKIAkJCQkJICAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0LAogCQkJCQkgICBsaXN0 KTsKIAotCQlpZiAoIWk5MTVfZ2VtX3JlcXVlc3RfY29tcGxldGVkKHJlcXVlc3QsIHRydWUpKQor CQlpZiAoIWk5MTVfZ2VtX3JlcXVlc3RfcmV0aXJlYWJsZShyZXF1ZXN0KSkKIAkJCWJyZWFrOwog CiAJCWk5MTVfZ2VtX3JlcXVlc3RfcmV0aXJlKHJlcXVlc3QpOworCisJCWlmIChpOTE1LmVuYWJs ZV9leGVjbGlzdHMpIHsKKwkJCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHggPSByZXF1ZXN0LT5j dHg7CisJCQlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPQorCQkJCXJpbmctPmRl di0+ZGV2X3ByaXZhdGU7CisJCQl1bnNpZ25lZCBsb25nIGZsYWdzOworCQkJc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKmN0eF9vYmogPQorCQkJCWN0eC0+ZW5naW5lW3JpbmctPmlkXS5zdGF0 ZTsKKworCQkJc3Bpbl9sb2NrX2lycXNhdmUoJnJpbmctPmV4ZWNsaXN0X2xvY2ssIGZsYWdzKTsK KworCQkJaWYgKGN0eF9vYmogJiYgKGN0eCAhPSByaW5nLT5kZWZhdWx0X2NvbnRleHQpKQorCQkJ CWludGVsX2xyX2NvbnRleHRfdW5waW4ocmluZywgY3R4KTsKKworCQkJaW50ZWxfcnVudGltZV9w bV9wdXQoZGV2X3ByaXYpOworCQkJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmcmluZy0+ZXhlY2xp c3RfbG9jaywgZmxhZ3MpOworCQl9CisKIAl9CiAKIAkvKiBNb3ZlIGFueSBidWZmZXJzIG9uIHRo ZSBhY3RpdmUgbGlzdCB0aGF0IGFyZSBubyBsb25nZXIgcmVmZXJlbmNlZApAQCAtMjg3MiwxMiAr Mjg5NiwxNCBAQCBpOTE1X2dlbV9yZXRpcmVfcmVxdWVzdHNfcmluZyhzdHJ1Y3QgaW50ZWxfZW5n aW5lX2NzICpyaW5nKQogCiAJCWlmICghbGlzdF9lbXB0eSgmb2JqLT5sYXN0X3JlYWRfcmVxW3Jp bmctPmlkXS0+bGlzdCkpCiAJCQlicmVhazsKKwkJaWYgKCFpOTE1X2dlbV9yZXF1ZXN0X3JldGly ZWFibGUob2JqLT5sYXN0X3JlYWRfcmVxW3JpbmctPmlkXSkpCisJCQlicmVhazsKIAogCQlpOTE1 X2dlbV9vYmplY3RfcmV0aXJlX19yZWFkKG9iaiwgcmluZy0+aWQpOwogCX0KIAogCWlmICh1bmxp a2VseShyaW5nLT50cmFjZV9pcnFfcmVxICYmCi0JCSAgICAgaTkxNV9nZW1fcmVxdWVzdF9jb21w bGV0ZWQocmluZy0+dHJhY2VfaXJxX3JlcSwgdHJ1ZSkpKSB7CisJCSAgICAgaTkxNV9nZW1fcmVx dWVzdF9yZXRpcmVhYmxlKHJpbmctPnRyYWNlX2lycV9yZXEpKSkgewogCQlyaW5nLT5pcnFfcHV0 KHJpbmcpOwogCQlpOTE1X2dlbV9yZXF1ZXN0X2Fzc2lnbigmcmluZy0+dHJhY2VfaXJxX3JlcSwg TlVMTCk7CiAJfQpAQCAtMjg5NiwxNSArMjkyMiw2IEBAIGk5MTVfZ2VtX3JldGlyZV9yZXF1ZXN0 cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWZvcl9lYWNoX3JpbmcocmluZywgZGV2X3ByaXYs IGkpIHsKIAkJaTkxNV9nZW1fcmV0aXJlX3JlcXVlc3RzX3JpbmcocmluZyk7CiAJCWlkbGUgJj0g bGlzdF9lbXB0eSgmcmluZy0+cmVxdWVzdF9saXN0KTsKLQkJaWYgKGk5MTUuZW5hYmxlX2V4ZWNs aXN0cykgewotCQkJdW5zaWduZWQgbG9uZyBmbGFnczsKLQotCQkJc3Bpbl9sb2NrX2lycXNhdmUo JnJpbmctPmV4ZWNsaXN0X2xvY2ssIGZsYWdzKTsKLQkJCWlkbGUgJj0gbGlzdF9lbXB0eSgmcmlu Zy0+ZXhlY2xpc3RfcXVldWUpOwotCQkJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmcmluZy0+ZXhl Y2xpc3RfbG9jaywgZmxhZ3MpOwotCi0JCQlpbnRlbF9leGVjbGlzdHNfcmV0aXJlX3JlcXVlc3Rz KHJpbmcpOwotCQl9CiAJfQogCiAJaWYgKGlkbGUpCkBAIC0yOTgwLDEyICsyOTk3LDE0IEBAIGk5 MTVfZ2VtX29iamVjdF9mbHVzaF9hY3RpdmUoc3RydWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9i aikKIAkJaWYgKHJlcSA9PSBOVUxMKQogCQkJY29udGludWU7CiAKLQkJaWYgKGxpc3RfZW1wdHko JnJlcS0+bGlzdCkpCi0JCQlnb3RvIHJldGlyZTsKKwkJaWYgKGxpc3RfZW1wdHkoJnJlcS0+bGlz dCkpIHsKKwkJCWlmIChpOTE1X2dlbV9yZXF1ZXN0X3JldGlyZWFibGUocmVxKSkKKwkJCQlpOTE1 X2dlbV9vYmplY3RfcmV0aXJlX19yZWFkKG9iaiwgaSk7CisJCQljb250aW51ZTsKKwkJfQogCi0J CWlmIChpOTE1X2dlbV9yZXF1ZXN0X2NvbXBsZXRlZChyZXEsIHRydWUpKSB7CisJCWlmIChpOTE1 X2dlbV9yZXF1ZXN0X3JldGlyZWFibGUocmVxKSkgewogCQkJX19pOTE1X2dlbV9yZXF1ZXN0X3Jl dGlyZV9fdXB0byhyZXEpOwotcmV0aXJlOgogCQkJaTkxNV9nZW1fb2JqZWN0X3JldGlyZV9fcmVh ZChvYmosIGkpOwogCQl9CiAJfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKaW5kZXggM2FjMzBiOC4u ZGZhMjM3OSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCkBAIC0xMTU4LDkgKzExNTgsMTEgQEAg c3RhdGljIHZvaWQgc25iX2d0X2lycV9oYW5kbGVyKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAK IHN0YXRpYyB2b2lkIGdlbjhfY3NfaXJxX2hhbmRsZXIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAq cmluZywgdTMyIGlpcikKIHsKKwlib29sIG5lZWRfbm90aWZ5ID0gZmFsc2U7CisKIAlpZiAoaWly ICYgR1RfQ09OVEVYVF9TV0lUQ0hfSU5URVJSVVBUKQotCQlpbnRlbF9scmNfaXJxX2hhbmRsZXIo cmluZyk7Ci0JaWYgKGlpciAmIEdUX1JFTkRFUl9VU0VSX0lOVEVSUlVQVCkKKwkJbmVlZF9ub3Rp ZnkgPSBpbnRlbF9scmNfaXJxX2hhbmRsZXIocmluZyk7CisJaWYgKChpaXIgJiBHVF9SRU5ERVJf VVNFUl9JTlRFUlJVUFQpIHx8IG5lZWRfbm90aWZ5KQogCQlub3RpZnlfcmluZyhyaW5nKTsKIH0K IApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCA5YjkyOGFiLi44MzczOTAwIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtNDExLDkgKzQxMSw4IEBAIHN0YXRpYyB2b2lkIGV4ZWNs aXN0c19jb250ZXh0X3VucXVldWUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAkJCS8q IFNhbWUgY3R4OiBpZ25vcmUgZmlyc3QgcmVxdWVzdCwgYXMgc2Vjb25kIHJlcXVlc3QKIAkJCSAq IHdpbGwgdXBkYXRlIHRhaWwgcGFzdCBmaXJzdCByZXF1ZXN0J3Mgd29ya2xvYWQgKi8KIAkJCWN1 cnNvci0+ZWxzcF9zdWJtaXR0ZWQgPSByZXEwLT5lbHNwX3N1Ym1pdHRlZDsKKwkJCXJlcTAtPmVs c3Bfc3VibWl0dGVkID0gMDsKIAkJCWxpc3RfZGVsKCZyZXEwLT5leGVjbGlzdF9saW5rKTsKLQkJ CWxpc3RfYWRkX3RhaWwoJnJlcTAtPmV4ZWNsaXN0X2xpbmssCi0JCQkJJnJpbmctPmV4ZWNsaXN0 X3JldGlyZWRfcmVxX2xpc3QpOwogCQkJcmVxMCA9IGN1cnNvcjsKIAkJfSBlbHNlIHsKIAkJCXJl cTEgPSBjdXJzb3I7CkBAIC00NTAsNiArNDQ5LDcgQEAgc3RhdGljIHZvaWQgZXhlY2xpc3RzX2Nv bnRleHRfdW5xdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogCXJlcTAtPmVsc3Bf c3VibWl0dGVkKys7CiAJaWYgKHJlcTEpCiAJCXJlcTEtPmVsc3Bfc3VibWl0dGVkKys7CisKIH0K IAogc3RhdGljIGJvb2wgZXhlY2xpc3RzX2NoZWNrX3JlbW92ZV9yZXF1ZXN0KHN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKnJpbmcsCkBAIC00NjksMTEgKzQ2OSw5IEBAIHN0YXRpYyBib29sIGV4ZWNs aXN0c19jaGVja19yZW1vdmVfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAog CQlpZiAoaW50ZWxfZXhlY2xpc3RzX2N0eF9pZChjdHhfb2JqKSA9PSByZXF1ZXN0X2lkKSB7CiAJ CQlXQVJOKGhlYWRfcmVxLT5lbHNwX3N1Ym1pdHRlZCA9PSAwLAogCQkJICAgICAiTmV2ZXIgc3Vi bWl0dGVkIGhlYWQgcmVxdWVzdFxuIik7Ci0KIAkJCWlmICgtLWhlYWRfcmVxLT5lbHNwX3N1Ym1p dHRlZCA8PSAwKSB7CisJCQkJaGVhZF9yZXEtPmN0eF9jb21wbGV0ZSA9IDE7CiAJCQkJbGlzdF9k ZWwoJmhlYWRfcmVxLT5leGVjbGlzdF9saW5rKTsKLQkJCQlsaXN0X2FkZF90YWlsKCZoZWFkX3Jl cS0+ZXhlY2xpc3RfbGluaywKLQkJCQkJJnJpbmctPmV4ZWNsaXN0X3JldGlyZWRfcmVxX2xpc3Qp OwogCQkJCXJldHVybiB0cnVlOwogCQkJfQogCQl9CkBAIC00ODgsOCArNDg2LDkgQEAgc3RhdGlj IGJvb2wgZXhlY2xpc3RzX2NoZWNrX3JlbW92ZV9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVf Y3MgKnJpbmcsCiAgKgogICogQ2hlY2sgdGhlIHVucmVhZCBDb250ZXh0IFN0YXR1cyBCdWZmZXJz IGFuZCBtYW5hZ2UgdGhlIHN1Ym1pc3Npb24gb2YgbmV3CiAgKiBjb250ZXh0cyB0byB0aGUgRUxT UCBhY2NvcmRpbmdseS4KKyAqIEByZXR1cm4gd2hldGhlciBhIGNvbnRleHQgY29tcGxldGVkCiAg Ki8KLXZvaWQgaW50ZWxfbHJjX2lycV9oYW5kbGVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJp bmcpCitib29sIGludGVsX2xyY19pcnFfaGFuZGxlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpy aW5nKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHJpbmctPmRldi0+ ZGV2X3ByaXZhdGU7CiAJdTMyIHN0YXR1c19wb2ludGVyOwpAQCAtNTQwLDYgKzUzOSw4IEBAIHZv aWQgaW50ZWxfbHJjX2lycV9oYW5kbGVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAK IAlJOTE1X1dSSVRFKFJJTkdfQ09OVEVYVF9TVEFUVVNfUFRSKHJpbmcpLAogCQkgICAoKHUzMily aW5nLT5uZXh0X2NvbnRleHRfc3RhdHVzX2J1ZmZlciAmIDB4MDcpIDw8IDgpOworCisJcmV0dXJu IChzdWJtaXRfY29udGV4dHMgIT0gMCk7CiB9CiAKIHN0YXRpYyBpbnQgZXhlY2xpc3RzX2NvbnRl eHRfcXVldWUoc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQpAQCAtNTUxLDcg KzU1Miw3IEBAIHN0YXRpYyBpbnQgZXhlY2xpc3RzX2NvbnRleHRfcXVldWUoc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogCWlmIChyZXF1ZXN0LT5jdHggIT0gcmluZy0+ZGVm YXVsdF9jb250ZXh0KQogCQlpbnRlbF9scl9jb250ZXh0X3BpbihyaW5nLCByZXF1ZXN0LT5jdHgp OwogCi0JaTkxNV9nZW1fcmVxdWVzdF9yZWZlcmVuY2UocmVxdWVzdCk7CisJaTkxNV9nZW1fY29u dGV4dF9yZWZlcmVuY2UocmVxdWVzdC0+Y3R4KTsKIAogCXJlcXVlc3QtPnRhaWwgPSByZXF1ZXN0 LT5yaW5nYnVmLT50YWlsOwogCkBAIC01NzIsOCArNTczLDYgQEAgc3RhdGljIGludCBleGVjbGlz dHNfY29udGV4dF9xdWV1ZShzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiAJ CQlXQVJOKHRhaWxfcmVxLT5lbHNwX3N1Ym1pdHRlZCAhPSAwLAogCQkJCSJNb3JlIHRoYW4gMiBh bHJlYWR5LXN1Ym1pdHRlZCByZXFzIHF1ZXVlZFxuIik7CiAJCQlsaXN0X2RlbCgmdGFpbF9yZXEt PmV4ZWNsaXN0X2xpbmspOwotCQkJbGlzdF9hZGRfdGFpbCgmdGFpbF9yZXEtPmV4ZWNsaXN0X2xp bmssCi0JCQkJJnJpbmctPmV4ZWNsaXN0X3JldGlyZWRfcmVxX2xpc3QpOwogCQl9CiAJfQogCkBA IC05MzgsMzIgKzkzNyw2IEBAIGludCBpbnRlbF9leGVjbGlzdHNfc3VibWlzc2lvbihzdHJ1Y3Qg aTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zLAogCXJldHVybiAwOwogfQogCi12b2lkIGlu dGVsX2V4ZWNsaXN0c19yZXRpcmVfcmVxdWVzdHMoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmlu ZykKLXsKLQlzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcSwgKnRtcDsKLQlzdHJ1Y3Qg bGlzdF9oZWFkIHJldGlyZWRfbGlzdDsKLQotCVdBUk5fT04oIW11dGV4X2lzX2xvY2tlZCgmcmlu Zy0+ZGV2LT5zdHJ1Y3RfbXV0ZXgpKTsKLQlpZiAobGlzdF9lbXB0eSgmcmluZy0+ZXhlY2xpc3Rf cmV0aXJlZF9yZXFfbGlzdCkpCi0JCXJldHVybjsKLQotCUlOSVRfTElTVF9IRUFEKCZyZXRpcmVk X2xpc3QpOwotCXNwaW5fbG9ja19pcnEoJnJpbmctPmV4ZWNsaXN0X2xvY2spOwotCWxpc3RfcmVw bGFjZV9pbml0KCZyaW5nLT5leGVjbGlzdF9yZXRpcmVkX3JlcV9saXN0LCAmcmV0aXJlZF9saXN0 KTsKLQlzcGluX3VubG9ja19pcnEoJnJpbmctPmV4ZWNsaXN0X2xvY2spOwotCi0JbGlzdF9mb3Jf ZWFjaF9lbnRyeV9zYWZlKHJlcSwgdG1wLCAmcmV0aXJlZF9saXN0LCBleGVjbGlzdF9saW5rKSB7 Ci0JCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHggPSByZXEtPmN0eDsKLQkJc3RydWN0IGRybV9p OTE1X2dlbV9vYmplY3QgKmN0eF9vYmogPQotCQkJCWN0eC0+ZW5naW5lW3JpbmctPmlkXS5zdGF0 ZTsKLQotCQlpZiAoY3R4X29iaiAmJiAoY3R4ICE9IHJpbmctPmRlZmF1bHRfY29udGV4dCkpCi0J CQlpbnRlbF9scl9jb250ZXh0X3VucGluKHJpbmcsIGN0eCk7Ci0JCWxpc3RfZGVsKCZyZXEtPmV4 ZWNsaXN0X2xpbmspOwotCQlpOTE1X2dlbV9yZXF1ZXN0X3VucmVmZXJlbmNlKHJlcSk7Ci0JfQot fQotCiB2b2lkIGludGVsX2xvZ2ljYWxfcmluZ19zdG9wKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gcmluZy0+ZGV2 LT5kZXZfcHJpdmF0ZTsKQEAgLTE3MDYsNyArMTY3OSw2IEBAIHN0YXRpYyBpbnQgbG9naWNhbF9y aW5nX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGludGVsX2VuZ2luZV9jcyAq cmluCiAJaW5pdF93YWl0cXVldWVfaGVhZCgmcmluZy0+aXJxX3F1ZXVlKTsKIAogCUlOSVRfTElT VF9IRUFEKCZyaW5nLT5leGVjbGlzdF9xdWV1ZSk7Ci0JSU5JVF9MSVNUX0hFQUQoJnJpbmctPmV4 ZWNsaXN0X3JldGlyZWRfcmVxX2xpc3QpOwogCXNwaW5fbG9ja19pbml0KCZyaW5nLT5leGVjbGlz dF9sb2NrKTsKIAogCXJldCA9IGk5MTVfY21kX3BhcnNlcl9pbml0X3JpbmcocmluZyk7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaCBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2xyYy5oCmluZGV4IGY1OTk0MGEuLjlkMmU5OGEgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5oCkBAIC04Miw3ICs4Miw3IEBAIGludCBpbnRlbF9leGVjbGlzdHNfc3VibWlz c2lvbihzdHJ1Y3QgaTkxNV9leGVjYnVmZmVyX3BhcmFtcyAqcGFyYW1zLAogCQkJICAgICAgIHN0 cnVjdCBsaXN0X2hlYWQgKnZtYXMpOwogdTMyIGludGVsX2V4ZWNsaXN0c19jdHhfaWQoc3RydWN0 IGRybV9pOTE1X2dlbV9vYmplY3QgKmN0eF9vYmopOwogCi12b2lkIGludGVsX2xyY19pcnFfaGFu ZGxlcihzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKK2Jvb2wgaW50ZWxfbHJjX2lycV9o YW5kbGVyKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwogdm9pZCBpbnRlbF9leGVjbGlz dHNfcmV0aXJlX3JlcXVlc3RzKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwogCiAjZW5k aWYgLyogX0lOVEVMX0xSQ19IXyAqLwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZl ci5oCmluZGV4IDMwNGNhYzQuLjczYjBiZDggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9y aW5nYnVmZmVyLmgKQEAgLTI2Myw3ICsyNjMsNiBAQCBzdHJ1Y3QgIGludGVsX2VuZ2luZV9jcyB7 CiAJLyogRXhlY2xpc3RzICovCiAJc3BpbmxvY2tfdCBleGVjbGlzdF9sb2NrOwogCXN0cnVjdCBs aXN0X2hlYWQgZXhlY2xpc3RfcXVldWU7Ci0Jc3RydWN0IGxpc3RfaGVhZCBleGVjbGlzdF9yZXRp cmVkX3JlcV9saXN0OwogCXU4IG5leHRfY29udGV4dF9zdGF0dXNfYnVmZmVyOwogCXUzMiAgICAg ICAgICAgICBpcnFfa2VlcF9tYXNrOyAvKiBiaXRtYXNrIGZvciBpbnRlcnJ1cHRzIHRoYXQgc2hv dWxkIG5vdCBiZSBtYXNrZWQgKi8KIAlpbnQJCSgqZW1pdF9yZXF1ZXN0KShzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpOwotLSAKMi4xLjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==