From: Nick Hoath Subject: [PATCH 3/4] drm/i915: Remove FIXME_lrc_ctx backpointer Date: Tue, 16 Dec 2014 12:32:29 +0000 Message-ID: <1418733150-6259-4-git-send-email-nicholas.hoath@intel.com> References: <1418733150-6259-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id A2C746E890 for ; Tue, 16 Dec 2014 04:32:39 -0800 (PST) In-Reply-To: <1418733150-6259-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 VGhlIGZpcnN0IHBhc3MgaW1wbGVtZW50YXRpb24gb2YgZXhlY2xpc3RzIHJlcXVpcmVkIGEgYmFj a3BvaW50ZXIgdG8gdGhlIGNvbnRleHQgdG8gYmUgaGVsZAppbiB0aGUgaW50ZWxfcmluZ2J1ZmZl ci4gSG93ZXZlciB0aGUgY29udGV4dCBwb2ludGVyIGlzIGF2YWlsYWJsZSBoaWdoZXIgaW4gdGhl IGNhbGwgc3RhY2suClJlbW92ZSB0aGUgYmFja3BvaW50ZXIgZnJvbSB0aGUgcmluZyBidWZmZXIg c3RydWN0dXJlIGFuZCBpbnN0ZWFkIHBhc3MgaXQgZG93biB0aHJvdWdoIHRoZQpjYWxsIHN0YWNr LgoKdjI6IEludGVncmF0ZSB0aGlzIGNoYW5nZXNldCB3aXRoIHRoZSByZW1vdmFsIG9mIGR1cGxp Y2F0ZSByZXF1ZXN0L2V4ZWNsaXN0IHF1ZXVlIGl0ZW0gbWVtYmVycy4KdjM6IFJlYmFzZQpTaWdu ZWQtb2ZmLWJ5OiBOaWNrIEhvYXRoIDxuaWNob2xhcy5ob2F0aEBpbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgIHwgIDcgKystLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgIHwgNjggKysrKysrKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaCAgICAgICAgfCAg OCArKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggfCAxNSArKysr LS0tLQogNCBmaWxlcyBjaGFuZ2VkLCA1NyBpbnNlcnRpb25zKCspLCA0MSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCBjYTk4YjFiLi41MDAzNGM0IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMKQEAgLTI0MzIsOCArMjQzMiw3IEBAIGludCBfX2k5MTVfYWRkX3JlcXVl c3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkJcmV0dXJuIC1FTk9NRU07CiAKIAlp ZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKSB7Ci0JCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgg PSByZXF1ZXN0LT5jdHg7Ci0JCXJpbmdidWYgPSBjdHgtPmVuZ2luZVtyaW5nLT5pZF0ucmluZ2J1 ZjsKKwkJcmluZ2J1ZiA9IHJlcXVlc3QtPmN0eC0+ZW5naW5lW3JpbmctPmlkXS5yaW5nYnVmOwog CX0gZWxzZQogCQlyaW5nYnVmID0gcmluZy0+YnVmZmVyOwogCkBAIC0yNDQ2LDcgKzI0NDUsNyBA QCBpbnQgX19pOTE1X2FkZF9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJ ICogd2hhdC4KIAkgKi8KIAlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKSB7Ci0JCXJldCA9IGxv Z2ljYWxfcmluZ19mbHVzaF9hbGxfY2FjaGVzKHJpbmdidWYpOworCQlyZXQgPSBsb2dpY2FsX3Jp bmdfZmx1c2hfYWxsX2NhY2hlcyhyaW5nYnVmLCByZXF1ZXN0LT5jdHgpOwogCQlpZiAocmV0KQog CQkJcmV0dXJuIHJldDsKIAl9IGVsc2UgewpAQCAtMjQ2Myw3ICsyNDYyLDcgQEAgaW50IF9faTkx NV9hZGRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCXJlcXVlc3Rfcmlu Z19wb3NpdGlvbiA9IGludGVsX3JpbmdfZ2V0X3RhaWwocmluZ2J1Zik7CiAKIAlpZiAoaTkxNS5l bmFibGVfZXhlY2xpc3RzKSB7Ci0JCXJldCA9IHJpbmctPmVtaXRfcmVxdWVzdChyaW5nYnVmKTsK KwkJcmV0ID0gcmluZy0+ZW1pdF9yZXF1ZXN0KHJpbmdidWYsIHJlcXVlc3QtPmN0eCwgcmVxdWVz dCk7CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwogCX0gZWxzZSB7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2xyYy5jCmluZGV4IGNiYmQzMjcuLjk5ZmNiNTYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy Yy5jCkBAIC01NjMsNiArNTYzLDggQEAgc3RhdGljIGludCBleGVjbGlzdHNfY29udGV4dF9xdWV1 ZShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nLAogCQkJcmV0dXJuIC1FTk9NRU07CiAJCXJl cXVlc3QtPmN0eCA9IHRvOwogCQlyZXF1ZXN0LT5yaW5nID0gcmluZzsKKwl9IGVsc2UgeworCQlX QVJOX09OKHRvICE9IHJlcXVlc3QtPmN0eCk7CiAJfQogCXJlcS0+cmVxdWVzdCA9IHJlcXVlc3Q7 CiAJaTkxNV9nZW1fcmVxdWVzdF9yZWZlcmVuY2UocmVxdWVzdCk7CkBAIC02MDEsNyArNjAzLDgg QEAgc3RhdGljIGludCBleGVjbGlzdHNfY29udGV4dF9xdWV1ZShzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICpyaW5nLAogCXJldHVybiAwOwogfQogCi1zdGF0aWMgaW50IGxvZ2ljYWxfcmluZ19pbnZh bGlkYXRlX2FsbF9jYWNoZXMoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYpCitzdGF0 aWMgaW50IGxvZ2ljYWxfcmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMoc3RydWN0IGludGVsX3Jp bmdidWZmZXIgKnJpbmdidWYsCisJCQkJCSAgICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgp CiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJpbmdidWYtPnJpbmc7CiAJdWlu dDMyX3QgZmx1c2hfZG9tYWluczsKQEAgLTYxMSw3ICs2MTQsOCBAQCBzdGF0aWMgaW50IGxvZ2lj YWxfcmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJp bmdidWYpCiAJaWYgKHJpbmctPmdwdV9jYWNoZXNfZGlydHkpCiAJCWZsdXNoX2RvbWFpbnMgPSBJ OTE1X0dFTV9HUFVfRE9NQUlOUzsKIAotCXJldCA9IHJpbmctPmVtaXRfZmx1c2gocmluZ2J1Ziwg STkxNV9HRU1fR1BVX0RPTUFJTlMsIGZsdXNoX2RvbWFpbnMpOworCXJldCA9IHJpbmctPmVtaXRf Zmx1c2gocmluZ2J1ZiwgY3R4LAorCQkJICAgICAgIEk5MTVfR0VNX0dQVV9ET01BSU5TLCBmbHVz aF9kb21haW5zKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCkBAIC02MjAsNiArNjI0LDcg QEAgc3RhdGljIGludCBsb2dpY2FsX3JpbmdfaW52YWxpZGF0ZV9hbGxfY2FjaGVzKHN0cnVjdCBp bnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmKQogfQogCiBzdGF0aWMgaW50IGV4ZWNsaXN0c19tb3Zl X3RvX2dwdShzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKKwkJCQkgc3RydWN0IGlu dGVsX2NvbnRleHQgKmN0eCwKIAkJCQkgc3RydWN0IGxpc3RfaGVhZCAqdm1hcykKIHsKIAlzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcmluZ2J1Zi0+cmluZzsKQEAgLTY0Nyw3ICs2NTIs NyBAQCBzdGF0aWMgaW50IGV4ZWNsaXN0c19tb3ZlX3RvX2dwdShzdHJ1Y3QgaW50ZWxfcmluZ2J1 ZmZlciAqcmluZ2J1ZiwKIAkvKiBVbmNvbmRpdGlvbmFsbHkgaW52YWxpZGF0ZSBncHUgY2FjaGVz IGFuZCBlbnN1cmUgdGhhdCB3ZSBkbyBmbHVzaAogCSAqIGFueSByZXNpZHVhbCB3cml0ZXMgZnJv bSB0aGUgcHJldmlvdXMgYmF0Y2guCiAJICovCi0JcmV0dXJuIGxvZ2ljYWxfcmluZ19pbnZhbGlk YXRlX2FsbF9jYWNoZXMocmluZ2J1Zik7CisJcmV0dXJuIGxvZ2ljYWxfcmluZ19pbnZhbGlkYXRl X2FsbF9jYWNoZXMocmluZ2J1ZiwgY3R4KTsKIH0KIAogLyoqCkBAIC03MjcsMTMgKzczMiwxMyBA QCBpbnQgaW50ZWxfZXhlY2xpc3RzX3N1Ym1pc3Npb24oc3RydWN0IGRybV9kZXZpY2UgKmRldiwg c3RydWN0IGRybV9maWxlICpmaWxlLAogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKLQlyZXQgPSBl eGVjbGlzdHNfbW92ZV90b19ncHUocmluZ2J1Ziwgdm1hcyk7CisJcmV0ID0gZXhlY2xpc3RzX21v dmVfdG9fZ3B1KHJpbmdidWYsIGN0eCwgdm1hcyk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsK IAogCWlmIChyaW5nID09ICZkZXZfcHJpdi0+cmluZ1tSQ1NdICYmCiAJICAgIGluc3RwX21vZGUg IT0gZGV2X3ByaXYtPnJlbGF0aXZlX2NvbnN0YW50c19tb2RlKSB7Ci0JCXJldCA9IGludGVsX2xv Z2ljYWxfcmluZ19iZWdpbihyaW5nYnVmLCA0KTsKKwkJcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5n X2JlZ2luKHJpbmdidWYsIGN0eCwgNCk7CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwogCkBA IC03NDYsNyArNzUxLDcgQEAgaW50IGludGVsX2V4ZWNsaXN0c19zdWJtaXNzaW9uKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwKIAkJZGV2X3ByaXYtPnJlbGF0 aXZlX2NvbnN0YW50c19tb2RlID0gaW5zdHBfbW9kZTsKIAl9CiAKLQlyZXQgPSByaW5nLT5lbWl0 X2JiX3N0YXJ0KHJpbmdidWYsIGV4ZWNfc3RhcnQsIGZsYWdzKTsKKwlyZXQgPSByaW5nLT5lbWl0 X2JiX3N0YXJ0KHJpbmdidWYsIGN0eCwgZXhlY19zdGFydCwgZmxhZ3MpOwogCWlmIChyZXQpCiAJ CXJldHVybiByZXQ7CiAKQEAgLTgwOSw3ICs4MTQsOCBAQCB2b2lkIGludGVsX2xvZ2ljYWxfcmlu Z19zdG9wKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpCiAJSTkxNV9XUklURV9NT0RFKHJp bmcsIF9NQVNLRURfQklUX0RJU0FCTEUoU1RPUF9SSU5HKSk7CiB9CiAKLWludCBsb2dpY2FsX3Jp bmdfZmx1c2hfYWxsX2NhY2hlcyhzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZikKK2lu dCBsb2dpY2FsX3JpbmdfZmx1c2hfYWxsX2NhY2hlcyhzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAq cmluZ2J1ZiwKKwkJCQkgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgpCiB7CiAJc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqcmluZyA9IHJpbmdidWYtPnJpbmc7CiAJaW50IHJldDsKQEAgLTgxNyw3 ICs4MjMsNyBAQCBpbnQgbG9naWNhbF9yaW5nX2ZsdXNoX2FsbF9jYWNoZXMoc3RydWN0IGludGVs X3JpbmdidWZmZXIgKnJpbmdidWYpCiAJaWYgKCFyaW5nLT5ncHVfY2FjaGVzX2RpcnR5KQogCQly ZXR1cm4gMDsKIAotCXJldCA9IHJpbmctPmVtaXRfZmx1c2gocmluZ2J1ZiwgMCwgSTkxNV9HRU1f R1BVX0RPTUFJTlMpOworCXJldCA9IHJpbmctPmVtaXRfZmx1c2gocmluZ2J1ZiwgY3R4LCAwLCBJ OTE1X0dFTV9HUFVfRE9NQUlOUyk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtODM1 LDEwICs4NDEsMTAgQEAgaW50IGxvZ2ljYWxfcmluZ19mbHVzaF9hbGxfY2FjaGVzKHN0cnVjdCBp bnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmKQogICogcG9pbnQsIHRoZSB0YWlsICppbnNpZGUqIHRo ZSBjb250ZXh0IGlzIHVwZGF0ZWQgYW5kIHRoZSBFTFNQIHdyaXR0ZW4gdG8uCiAgKi8KIHZvaWQg aW50ZWxfbG9naWNhbF9yaW5nX2FkdmFuY2VfYW5kX3N1Ym1pdChzdHJ1Y3QgaW50ZWxfcmluZ2J1 ZmZlciAqcmluZ2J1ZiwKKwkJCQkJICAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAkJCQkJ ICAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogewogCXN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKnJpbmcgPSByaW5nYnVmLT5yaW5nOwotCXN0cnVjdCBpbnRlbF9jb250ZXh0 ICpjdHggPSByaW5nYnVmLT5GSVhNRV9scmNfY3R4OwogCiAJaW50ZWxfbG9naWNhbF9yaW5nX2Fk dmFuY2UocmluZ2J1Zik7CiAKQEAgLTk3Niw2ICs5ODIsNyBAQCBzdGF0aWMgaW50IGxvZ2ljYWxf cmluZ193YWl0X3JlcXVlc3Qoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCiB9CiAK IHN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX3dhaXRfZm9yX3NwYWNlKHN0cnVjdCBpbnRlbF9yaW5n YnVmZmVyICpyaW5nYnVmLAorCQkJCSAgICAgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAog CQkJCSAgICAgICBpbnQgYnl0ZXMpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9 IHJpbmdidWYtPnJpbmc7CkBAIC05ODksNyArOTk2LDcgQEAgc3RhdGljIGludCBsb2dpY2FsX3Jp bmdfd2FpdF9mb3Jfc3BhY2Uoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCiAJCXJl dHVybiByZXQ7CiAKIAkvKiBGb3JjZSB0aGUgY29udGV4dCBzdWJtaXNzaW9uIGluIGNhc2Ugd2Ug aGF2ZSBiZWVuIHNraXBwaW5nIGl0ICovCi0JaW50ZWxfbG9naWNhbF9yaW5nX2FkdmFuY2VfYW5k X3N1Ym1pdChyaW5nYnVmLCBOVUxMKTsKKwlpbnRlbF9sb2dpY2FsX3JpbmdfYWR2YW5jZV9hbmRf c3VibWl0KHJpbmdidWYsIGN0eCwgTlVMTCk7CiAKIAkvKiBXaXRoIEdFTSB0aGUgaGFuZ2NoZWNr IHRpbWVyIHNob3VsZCBraWNrIHVzIG91dCBvZiB0aGUgbG9vcCwKIAkgKiBsZWF2aW5nIGl0IGVh cmx5IHJ1bnMgdGhlIHJpc2sgb2YgY29ycnVwdGluZyBHRU0gc3RhdGUgKGR1ZQpAQCAtMTAyNCwx MyArMTAzMSwxNCBAQCBzdGF0aWMgaW50IGxvZ2ljYWxfcmluZ193YWl0X2Zvcl9zcGFjZShzdHJ1 Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKIAlyZXR1cm4gcmV0OwogfQogCi1zdGF0aWMg aW50IGxvZ2ljYWxfcmluZ193cmFwX2J1ZmZlcihzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmlu Z2J1ZikKK3N0YXRpYyBpbnQgbG9naWNhbF9yaW5nX3dyYXBfYnVmZmVyKHN0cnVjdCBpbnRlbF9y aW5nYnVmZmVyICpyaW5nYnVmLAorCQkJCSAgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4KQog ewogCXVpbnQzMl90IF9faW9tZW0gKnZpcnQ7CiAJaW50IHJlbSA9IHJpbmdidWYtPnNpemUgLSBy aW5nYnVmLT50YWlsOwogCiAJaWYgKHJpbmdidWYtPnNwYWNlIDwgcmVtKSB7Ci0JCWludCByZXQg PSBsb2dpY2FsX3Jpbmdfd2FpdF9mb3Jfc3BhY2UocmluZ2J1ZiwgcmVtKTsKKwkJaW50IHJldCA9 IGxvZ2ljYWxfcmluZ193YWl0X2Zvcl9zcGFjZShyaW5nYnVmLCBjdHgsIHJlbSk7CiAKIAkJaWYg KHJldCkKIAkJCXJldHVybiByZXQ7CkBAIC0xMDQ3LDE4ICsxMDU1LDE5IEBAIHN0YXRpYyBpbnQg bG9naWNhbF9yaW5nX3dyYXBfYnVmZmVyKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVm KQogCXJldHVybiAwOwogfQogCi1zdGF0aWMgaW50IGxvZ2ljYWxfcmluZ19wcmVwYXJlKHN0cnVj dCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLCBpbnQgYnl0ZXMpCitzdGF0aWMgaW50IGxvZ2lj YWxfcmluZ19wcmVwYXJlKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAorCQkJCXN0 cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsIGludCBieXRlcykKIHsKIAlpbnQgcmV0OwogCiAJaWYg KHVubGlrZWx5KHJpbmdidWYtPnRhaWwgKyBieXRlcyA+IHJpbmdidWYtPmVmZmVjdGl2ZV9zaXpl KSkgewotCQlyZXQgPSBsb2dpY2FsX3Jpbmdfd3JhcF9idWZmZXIocmluZ2J1Zik7CisJCXJldCA9 IGxvZ2ljYWxfcmluZ193cmFwX2J1ZmZlcihyaW5nYnVmLCBjdHgpOwogCQlpZiAodW5saWtlbHko cmV0KSkKIAkJCXJldHVybiByZXQ7CiAJfQogCiAJaWYgKHVubGlrZWx5KHJpbmdidWYtPnNwYWNl IDwgYnl0ZXMpKSB7Ci0JCXJldCA9IGxvZ2ljYWxfcmluZ193YWl0X2Zvcl9zcGFjZShyaW5nYnVm LCBieXRlcyk7CisJCXJldCA9IGxvZ2ljYWxfcmluZ193YWl0X2Zvcl9zcGFjZShyaW5nYnVmLCBj dHgsIGJ5dGVzKTsKIAkJaWYgKHVubGlrZWx5KHJldCkpCiAJCQlyZXR1cm4gcmV0OwogCX0KQEAg LTEwNzksNyArMTA4OCw4IEBAIHN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX3ByZXBhcmUoc3RydWN0 IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsIGludCBieXRlcykKICAqCiAgKiBSZXR1cm46IG5v bi16ZXJvIGlmIHRoZSByaW5nYnVmZmVyIGlzIG5vdCByZWFkeSB0byBiZSB3cml0dGVuIHRvLgog ICovCi1pbnQgaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVy ICpyaW5nYnVmLCBpbnQgbnVtX2R3b3JkcykKK2ludCBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4o c3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCisJCQkgICAgIHN0cnVjdCBpbnRlbF9j b250ZXh0ICpjdHgsIGludCBudW1fZHdvcmRzKQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcgPSByaW5nYnVmLT5yaW5nOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSByaW5nLT5k ZXY7CkBAIC0xMDkxLDEyICsxMTAxLDEyIEBAIGludCBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4o c3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsIGludCBudW1fZHdvcmRzKQogCWlmIChy ZXQpCiAJCXJldHVybiByZXQ7CiAKLQlyZXQgPSBsb2dpY2FsX3JpbmdfcHJlcGFyZShyaW5nYnVm LCBudW1fZHdvcmRzICogc2l6ZW9mKHVpbnQzMl90KSk7CisJcmV0ID0gbG9naWNhbF9yaW5nX3By ZXBhcmUocmluZ2J1ZiwgY3R4LCBudW1fZHdvcmRzICogc2l6ZW9mKHVpbnQzMl90KSk7CiAJaWYg KHJldCkKIAkJcmV0dXJuIHJldDsKIAogCS8qIFByZWFsbG9jYXRlIHRoZSBvbHIgYmVmb3JlIHRv dWNoaW5nIHRoZSByaW5nICovCi0JcmV0ID0gbG9naWNhbF9yaW5nX2FsbG9jX3JlcXVlc3Qocmlu ZywgcmluZ2J1Zi0+RklYTUVfbHJjX2N0eCk7CisJcmV0ID0gbG9naWNhbF9yaW5nX2FsbG9jX3Jl cXVlc3QocmluZywgY3R4KTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCkBAIC0xMTE3LDEx ICsxMTI3LDExIEBAIHN0YXRpYyBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX3dvcmthcm91bmRzX2Vt aXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkJcmV0dXJuIDA7CiAKIAlyaW5nLT5n cHVfY2FjaGVzX2RpcnR5ID0gdHJ1ZTsKLQlyZXQgPSBsb2dpY2FsX3JpbmdfZmx1c2hfYWxsX2Nh Y2hlcyhyaW5nYnVmKTsKKwlyZXQgPSBsb2dpY2FsX3JpbmdfZmx1c2hfYWxsX2NhY2hlcyhyaW5n YnVmLCBjdHgpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKLQlyZXQgPSBpbnRlbF9sb2dp Y2FsX3JpbmdfYmVnaW4ocmluZ2J1Ziwgdy0+Y291bnQgKiAyICsgMik7CisJcmV0ID0gaW50ZWxf bG9naWNhbF9yaW5nX2JlZ2luKHJpbmdidWYsIGN0eCwgdy0+Y291bnQgKiAyICsgMik7CiAJaWYg KHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMTEzNSw3ICsxMTQ1LDcgQEAgc3RhdGljIGludCBp bnRlbF9sb2dpY2FsX3Jpbmdfd29ya2Fyb3VuZHNfZW1pdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nLAogCWludGVsX2xvZ2ljYWxfcmluZ19hZHZhbmNlKHJpbmdidWYpOwogCiAJcmluZy0+ Z3B1X2NhY2hlc19kaXJ0eSA9IHRydWU7Ci0JcmV0ID0gbG9naWNhbF9yaW5nX2ZsdXNoX2FsbF9j YWNoZXMocmluZ2J1Zik7CisJcmV0ID0gbG9naWNhbF9yaW5nX2ZsdXNoX2FsbF9jYWNoZXMocmlu Z2J1ZiwgY3R4KTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCkBAIC0xMTg1LDEyICsxMTk1 LDEzIEBAIHN0YXRpYyBpbnQgZ2VuOF9pbml0X3JlbmRlcl9yaW5nKHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnJpbmcpCiB9CiAKIHN0YXRpYyBpbnQgZ2VuOF9lbWl0X2JiX3N0YXJ0KHN0cnVjdCBp bnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAorCQkJICAgICAgc3RydWN0IGludGVsX2NvbnRleHQg KmN0eCwKIAkJCSAgICAgIHU2NCBvZmZzZXQsIHVuc2lnbmVkIGZsYWdzKQogewogCWJvb2wgcHBn dHQgPSAhKGZsYWdzICYgSTkxNV9ESVNQQVRDSF9TRUNVUkUpOwogCWludCByZXQ7CiAKLQlyZXQg PSBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4ocmluZ2J1ZiwgNCk7CisJcmV0ID0gaW50ZWxfbG9n aWNhbF9yaW5nX2JlZ2luKHJpbmdidWYsIGN0eCwgNCk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJl dDsKIApAQCAtMTIzOCw2ICsxMjQ5LDcgQEAgc3RhdGljIHZvaWQgZ2VuOF9sb2dpY2FsX3Jpbmdf cHV0X2lycShzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogfQogCiBzdGF0aWMgaW50IGdl bjhfZW1pdF9mbHVzaChzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKKwkJCSAgIHN0 cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCiAJCQkgICB1MzIgaW52YWxpZGF0ZV9kb21haW5zLAog CQkJICAgdTMyIHVudXNlZCkKIHsKQEAgLTEyNDcsNyArMTI1OSw3IEBAIHN0YXRpYyBpbnQgZ2Vu OF9lbWl0X2ZsdXNoKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAogCXVpbnQzMl90 IGNtZDsKIAlpbnQgcmV0OwogCi0JcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJpbmdi dWYsIDQpOworCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyaW5nYnVmLCBjdHgsIDQp OwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTEyNzYsNiArMTI4OCw3IEBAIHN0YXRp YyBpbnQgZ2VuOF9lbWl0X2ZsdXNoKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAog fQogCiBzdGF0aWMgaW50IGdlbjhfZW1pdF9mbHVzaF9yZW5kZXIoc3RydWN0IGludGVsX3Jpbmdi dWZmZXIgKnJpbmdidWYsCisJCQkJICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAogCQkJCSAg dTMyIGludmFsaWRhdGVfZG9tYWlucywKIAkJCQkgIHUzMiBmbHVzaF9kb21haW5zKQogewpAQCAt MTMwMiw3ICsxMzE1LDcgQEAgc3RhdGljIGludCBnZW44X2VtaXRfZmx1c2hfcmVuZGVyKHN0cnVj dCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAogCQlmbGFncyB8PSBQSVBFX0NPTlRST0xfR0xP QkFMX0dUVF9JVkI7CiAJfQogCi0JcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJpbmdi dWYsIDYpOworCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyaW5nYnVmLCBjdHgsIDYp OwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTEzMjgsMTMgKzEzNDEsMTQgQEAgc3Rh dGljIHZvaWQgZ2VuOF9zZXRfc2Vxbm8oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywgdTMy IHNlcW5vKQogfQogCiBzdGF0aWMgaW50IGdlbjhfZW1pdF9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9y aW5nYnVmZmVyICpyaW5nYnVmLAorCQkJICAgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAog CQkJICAgICBzdHJ1Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiB7CiAJc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJpbmdidWYtPnJpbmc7CiAJdTMyIGNtZDsKIAlpbnQg cmV0OwogCi0JcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJpbmdidWYsIDYpOworCXJl dCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyaW5nYnVmLCBjdHgsIDYpOwogCWlmIChyZXQp CiAJCXJldHVybiByZXQ7CiAKQEAgLTEzNTAsNyArMTM2NCw3IEBAIHN0YXRpYyBpbnQgZ2VuOF9l bWl0X3JlcXVlc3Qoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCiAJCWk5MTVfZ2Vt X3JlcXVlc3RfZ2V0X3NlcW5vKHJpbmctPm91dHN0YW5kaW5nX2xhenlfcmVxdWVzdCkpOwogCWlu dGVsX2xvZ2ljYWxfcmluZ19lbWl0KHJpbmdidWYsIE1JX1VTRVJfSU5URVJSVVBUKTsKIAlpbnRl bF9sb2dpY2FsX3JpbmdfZW1pdChyaW5nYnVmLCBNSV9OT09QKTsKLQlpbnRlbF9sb2dpY2FsX3Jp bmdfYWR2YW5jZV9hbmRfc3VibWl0KHJpbmdidWYsIHJlcXVlc3QpOworCWludGVsX2xvZ2ljYWxf cmluZ19hZHZhbmNlX2FuZF9zdWJtaXQocmluZ2J1ZiwgY3R4LCByZXF1ZXN0KTsKIAogCXJldHVy biAwOwogfQpAQCAtMTYzOCw2ICsxNjUyLDcgQEAgaW50IGludGVsX2xyX2NvbnRleHRfcmVuZGVy X3N0YXRlX2luaXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkJcmV0dXJuIDA7CiAK IAlyZXQgPSByaW5nLT5lbWl0X2JiX3N0YXJ0KHJpbmdidWYsCisJCQljdHgsCiAJCQlzby5nZ3R0 X29mZnNldCwKIAkJCUk5MTVfRElTUEFUQ0hfU0VDVVJFKTsKIAlpZiAocmV0KQpAQCAtMTg5NCw3 ICsxOTA5LDYgQEAgaW50IGludGVsX2xyX2NvbnRleHRfZGVmZXJyZWRfY3JlYXRlKHN0cnVjdCBp bnRlbF9jb250ZXh0ICpjdHgsCiAJfQogCiAJcmluZ2J1Zi0+cmluZyA9IHJpbmc7Ci0JcmluZ2J1 Zi0+RklYTUVfbHJjX2N0eCA9IGN0eDsKIAogCXJpbmdidWYtPnNpemUgPSAzMiAqIFBBR0VfU0la RTsKIAlyaW5nYnVmLT5lZmZlY3RpdmVfc2l6ZSA9IHJpbmdidWYtPnNpemU7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5oCmluZGV4IDM3NmMzMDcuLjgwYTgwZWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2xyYy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2xyYy5oCkBAIC0zOCw5ICszOCwxMSBAQCB2b2lkIGludGVsX2xvZ2ljYWxfcmluZ19zdG9wKHN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcpOwogdm9pZCBpbnRlbF9sb2dpY2FsX3JpbmdfY2xl YW51cChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKIGludCBpbnRlbF9sb2dpY2FsX3Jp bmdzX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldik7CiAKLWludCBsb2dpY2FsX3JpbmdfZmx1 c2hfYWxsX2NhY2hlcyhzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1Zik7CitpbnQgbG9n aWNhbF9yaW5nX2ZsdXNoX2FsbF9jYWNoZXMoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdi dWYsCisJCQkJICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4KTsKIHZvaWQgaW50ZWxfbG9naWNh bF9yaW5nX2FkdmFuY2VfYW5kX3N1Ym1pdCgKIAkJCQlzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAq cmluZ2J1ZiwKKwkJCQlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAogCQkJCXN0cnVjdCBkcm1f aTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCk7CiAvKioKICAqIGludGVsX2xvZ2ljYWxfcmluZ19h ZHZhbmNlKCkgLSBhZHZhbmNlIHRoZSByaW5nYnVmZmVyIHRhaWwKQEAgLTYzLDcgKzY1LDkgQEAg c3RhdGljIGlubGluZSB2b2lkIGludGVsX2xvZ2ljYWxfcmluZ19lbWl0KHN0cnVjdCBpbnRlbF9y aW5nYnVmZmVyICpyaW5nYnVmLAogCWlvd3JpdGUzMihkYXRhLCByaW5nYnVmLT52aXJ0dWFsX3N0 YXJ0ICsgcmluZ2J1Zi0+dGFpbCk7CiAJcmluZ2J1Zi0+dGFpbCArPSA0OwogfQotaW50IGludGVs X2xvZ2ljYWxfcmluZ19iZWdpbihzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwgaW50 IG51bV9kd29yZHMpOworaW50IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihzdHJ1Y3QgaW50ZWxf cmluZ2J1ZmZlciAqcmluZ2J1ZiwKKwkJCSAgICAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwK KwkJCSAgICAgaW50IG51bV9kd29yZHMpOwogCiAvKiBMb2dpY2FsIFJpbmcgQ29udGV4dHMgKi8K IGludCBpbnRlbF9scl9jb250ZXh0X3JlbmRlcl9zdGF0ZV9pbml0KHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnJpbmcsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n YnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXgg NmRiYjZmNC4uY2FiZjQ4ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIu aApAQCAtOTksMTMgKzk5LDYgQEAgc3RydWN0IGludGVsX3JpbmdidWZmZXIgewogCiAJc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZzsKIAotCS8qCi0JICogRklYTUU6IFRoaXMgYmFja3BvaW50 ZXIgaXMgYW4gYXJ0aWZhY3Qgb2YgdGhlIGhpc3Rvcnkgb2YgaG93IHRoZQotCSAqIGV4ZWNsaXN0 IHBhdGNoZXMgY2FtZSBpbnRvIGJlaW5nLiBJdCB3aWxsIGdldCByZW1vdmVkIG9uY2UgdGhlIGJh c2ljCi0JICogY29kZSBoYXMgbGFuZGVkLgotCSAqLwotCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpG SVhNRV9scmNfY3R4OwotCiAJdTMyIGhlYWQ7CiAJdTMyIHRhaWw7CiAJaW50IHNwYWNlOwpAQCAt MTIzLDYgKzExNiw4IEBAIHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyIHsKIAl1MzIgbGFzdF9yZXRp cmVkX2hlYWQ7CiB9OwogCitzdHJ1Y3QJaW50ZWxfY29udGV4dDsKKwogc3RydWN0ICBpbnRlbF9l bmdpbmVfY3MgewogCWNvbnN0IGNoYXIJKm5hbWU7CiAJZW51bSBpbnRlbF9yaW5nX2lkIHsKQEAg LTIzOSwxMSArMjM0LDE1IEBAIHN0cnVjdCAgaW50ZWxfZW5naW5lX2NzIHsKIAlzdHJ1Y3QgbGlz dF9oZWFkIGV4ZWNsaXN0X3JldGlyZWRfcmVxX2xpc3Q7CiAJdTggbmV4dF9jb250ZXh0X3N0YXR1 c19idWZmZXI7CiAJdTMyICAgICAgICAgICAgIGlycV9rZWVwX21hc2s7IC8qIGJpdG1hc2sgZm9y IGludGVycnVwdHMgdGhhdCBzaG91bGQgbm90IGJlIG1hc2tlZCAqLwotCWludAkJKCplbWl0X3Jl cXVlc3QpKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmKTsKKwlpbnQJCSgqZW1pdF9y ZXF1ZXN0KShzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKKwkJCQkJc3RydWN0IGlu dGVsX2NvbnRleHQgKmN0eCwKKwkJCQkJc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1 ZXN0KTsKIAlpbnQJCSgqZW1pdF9mbHVzaCkoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdi dWYsCisJCQkJICAgICAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAkJCQkgICAgICB1MzIg aW52YWxpZGF0ZV9kb21haW5zLAogCQkJCSAgICAgIHUzMiBmbHVzaF9kb21haW5zKTsKIAlpbnQJ CSgqZW1pdF9iYl9zdGFydCkoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCisJCQkJ CSBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAogCQkJCQkgdTY0IG9mZnNldCwgdW5zaWduZWQg ZmxhZ3MpOwogCiAJLyoqCi0tIAoyLjEuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK