From: Nick Hoath Subject: [PATCH 3/5] drm/i915: Remove FIXME_lrc_ctx backpointer Date: Wed, 12 Nov 2014 10:53:25 +0000 Message-ID: <1415789607-10243-4-git-send-email-nicholas.hoath@intel.com> References: <1415789607-10243-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id EA3F46E481 for ; Wed, 12 Nov 2014 02:57:34 -0800 (PST) In-Reply-To: <1415789607-10243-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 Y2F0ZSByZXF1ZXN0L2V4ZWNsaXN0IHF1ZXVlIGl0ZW0gbWVtYmVycy4KClNpZ25lZC1vZmYtYnk6 IE5pY2sgSG9hdGggPG5pY2hvbGFzLmhvYXRoQGludGVsLmNvbT4KSXNzdWU6IFZJWi00MjY4Ci0t LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgIHwgIDcgKystLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgICAgICAgIHwgNjcgKysrKysrKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaCAgICAg ICAgfCAgOCArKystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmggfCAx MiArKystLS0KIDQgZmlsZXMgY2hhbmdlZCwgNTYgaW5zZXJ0aW9ucygrKSwgMzggZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggZTVmNTIxZi4uYmQ1YTFlMiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbS5jCkBAIC0yNDUxLDggKzI0NTEsNyBAQCBpbnQgX19pOTE1X2FkZF9y ZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCXJldHVybiAtRU5PTUVNOwog CiAJaWYgKGk5MTUuZW5hYmxlX2V4ZWNsaXN0cykgewotCQlzdHJ1Y3QgaW50ZWxfY29udGV4dCAq Y3R4ID0gcmVxdWVzdC0+Y3R4OwotCQlyaW5nYnVmID0gY3R4LT5lbmdpbmVbcmluZy0+aWRdLnJp bmdidWY7CisJCXJpbmdidWYgPSByZXF1ZXN0LT5jdHgtPmVuZ2luZVtyaW5nLT5pZF0ucmluZ2J1 ZjsKIAl9IGVsc2UKIAkJcmluZ2J1ZiA9IHJpbmctPmJ1ZmZlcjsKIApAQCAtMjQ2NSw3ICsyNDY0 LDcgQEAgaW50IF9faTkxNV9hZGRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5n LAogCSAqIHdoYXQuCiAJICovCiAJaWYgKGk5MTUuZW5hYmxlX2V4ZWNsaXN0cykgewotCQlyZXQg PSBsb2dpY2FsX3JpbmdfZmx1c2hfYWxsX2NhY2hlcyhyaW5nYnVmKTsKKwkJcmV0ID0gbG9naWNh bF9yaW5nX2ZsdXNoX2FsbF9jYWNoZXMocmluZ2J1ZiwgcmVxdWVzdC0+Y3R4KTsKIAkJaWYgKHJl dCkKIAkJCXJldHVybiByZXQ7CiAJfSBlbHNlIHsKQEAgLTI0ODcsNyArMjQ4Niw3IEBAIGludCBf X2k5MTVfYWRkX3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAlyZXF1ZXN0 X3JpbmdfcG9zaXRpb24gPSBpbnRlbF9yaW5nX2dldF90YWlsKHJpbmdidWYpOwogCiAJaWYgKGk5 MTUuZW5hYmxlX2V4ZWNsaXN0cykgewotCQlyZXQgPSByaW5nLT5lbWl0X3JlcXVlc3QocmluZ2J1 ZiwgcmVxdWVzdCk7CisJCXJldCA9IHJpbmctPmVtaXRfcmVxdWVzdChyaW5nYnVmLCByZXF1ZXN0 LT5jdHgsIHJlcXVlc3QpOwogCQlpZiAocmV0KQogCQkJcmV0dXJuIHJldDsKIAl9IGVsc2Ugewpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9scmMuYwppbmRleCAwZTJlMzNiLi40YmQ5NTcyIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuYwpAQCAtNTU1LDYgKzU1NSwxMCBAQCBzdGF0aWMgaW50IGV4ZWNsaXN0 c19jb250ZXh0X3F1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCXJlcXVlc3Qt PmN0eCA9IHRvOwogCQlyZXF1ZXN0LT5yaW5nID0gcmluZzsKIAl9CisJZWxzZQorCXsKKwkJV0FS Tl9PTih0byAhPSByZXF1ZXN0LT5jdHgpOworCX0KIAlyZXEtPnJlcXVlc3QgPSByZXF1ZXN0Owog CWk5MTVfZ2VtX3JlcXVlc3RfcmVmZXJlbmNlKHJlcXVlc3QpOwogCWk5MTVfZ2VtX2NvbnRleHRf cmVmZXJlbmNlKHJlcS0+cmVxdWVzdC0+Y3R4KTsKQEAgLTU5MSw3ICs1OTUsOCBAQCBzdGF0aWMg aW50IGV4ZWNsaXN0c19jb250ZXh0X3F1ZXVlKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcs CiAJcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX2ludmFsaWRhdGVfYWxs X2NhY2hlcyhzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZikKK3N0YXRpYyBpbnQgbG9n aWNhbF9yaW5nX2ludmFsaWRhdGVfYWxsX2NhY2hlcyhzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAq cmluZ2J1ZiwKKwkJCQkJICAgICAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCkKIHsKIAlzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcmluZ2J1Zi0+cmluZzsKIAl1aW50MzJfdCBmbHVz aF9kb21haW5zOwpAQCAtNjAxLDcgKzYwNiw4IEBAIHN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX2lu dmFsaWRhdGVfYWxsX2NhY2hlcyhzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZikKIAlp ZiAocmluZy0+Z3B1X2NhY2hlc19kaXJ0eSkKIAkJZmx1c2hfZG9tYWlucyA9IEk5MTVfR0VNX0dQ VV9ET01BSU5TOwogCi0JcmV0ID0gcmluZy0+ZW1pdF9mbHVzaChyaW5nYnVmLCBJOTE1X0dFTV9H UFVfRE9NQUlOUywgZmx1c2hfZG9tYWlucyk7CisJcmV0ID0gcmluZy0+ZW1pdF9mbHVzaChyaW5n YnVmLCBjdHgsCisJCQkgICAgICAgSTkxNV9HRU1fR1BVX0RPTUFJTlMsIGZsdXNoX2RvbWFpbnMp OwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTYxMCw2ICs2MTYsNyBAQCBzdGF0aWMg aW50IGxvZ2ljYWxfcmluZ19pbnZhbGlkYXRlX2FsbF9jYWNoZXMoc3RydWN0IGludGVsX3Jpbmdi dWZmZXIgKnJpbmdidWYpCiB9CiAKIHN0YXRpYyBpbnQgZXhlY2xpc3RzX21vdmVfdG9fZ3B1KHN0 cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAorCQkJCSBzdHJ1Y3QgaW50ZWxfY29udGV4 dCAqY3R4LAogCQkJCSBzdHJ1Y3QgbGlzdF9oZWFkICp2bWFzKQogewogCXN0cnVjdCBpbnRlbF9l bmdpbmVfY3MgKnJpbmcgPSByaW5nYnVmLT5yaW5nOwpAQCAtNjM3LDcgKzY0NCw3IEBAIHN0YXRp YyBpbnQgZXhlY2xpc3RzX21vdmVfdG9fZ3B1KHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5n YnVmLAogCS8qIFVuY29uZGl0aW9uYWxseSBpbnZhbGlkYXRlIGdwdSBjYWNoZXMgYW5kIGVuc3Vy ZSB0aGF0IHdlIGRvIGZsdXNoCiAJICogYW55IHJlc2lkdWFsIHdyaXRlcyBmcm9tIHRoZSBwcmV2 aW91cyBiYXRjaC4KIAkgKi8KLQlyZXR1cm4gbG9naWNhbF9yaW5nX2ludmFsaWRhdGVfYWxsX2Nh Y2hlcyhyaW5nYnVmKTsKKwlyZXR1cm4gbG9naWNhbF9yaW5nX2ludmFsaWRhdGVfYWxsX2NhY2hl cyhyaW5nYnVmLCBjdHgpOwogfQogCiAvKioKQEAgLTcxNywxMyArNzI0LDEzIEBAIGludCBpbnRl bF9leGVjbGlzdHNfc3VibWlzc2lvbihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJt X2ZpbGUgKmZpbGUsCiAJCXJldHVybiAtRUlOVkFMOwogCX0KIAotCXJldCA9IGV4ZWNsaXN0c19t b3ZlX3RvX2dwdShyaW5nYnVmLCB2bWFzKTsKKwlyZXQgPSBleGVjbGlzdHNfbW92ZV90b19ncHUo cmluZ2J1ZiwgY3R4LCB2bWFzKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCiAJaWYgKHJp bmcgPT0gJmRldl9wcml2LT5yaW5nW1JDU10gJiYKIAkgICAgaW5zdHBfbW9kZSAhPSBkZXZfcHJp di0+cmVsYXRpdmVfY29uc3RhbnRzX21vZGUpIHsKLQkJcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5n X2JlZ2luKHJpbmdidWYsIDQpOworCQlyZXQgPSBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4ocmlu Z2J1ZiwgY3R4LCA0KTsKIAkJaWYgKHJldCkKIAkJCXJldHVybiByZXQ7CiAKQEAgLTczNiw3ICs3 NDMsNyBAQCBpbnQgaW50ZWxfZXhlY2xpc3RzX3N1Ym1pc3Npb24oc3RydWN0IGRybV9kZXZpY2Ug KmRldiwgc3RydWN0IGRybV9maWxlICpmaWxlLAogCQlkZXZfcHJpdi0+cmVsYXRpdmVfY29uc3Rh bnRzX21vZGUgPSBpbnN0cF9tb2RlOwogCX0KIAotCXJldCA9IHJpbmctPmVtaXRfYmJfc3RhcnQo cmluZ2J1ZiwgZXhlY19zdGFydCwgZmxhZ3MpOworCXJldCA9IHJpbmctPmVtaXRfYmJfc3RhcnQo cmluZ2J1ZiwgY3R4LCBleGVjX3N0YXJ0LCBmbGFncyk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJl dDsKIApAQCAtNzY4LDcgKzc3NSw4IEBAIHZvaWQgaW50ZWxfbG9naWNhbF9yaW5nX3N0b3Aoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIAlJOTE1X1dSSVRFX01PREUocmluZywgX01BU0tF RF9CSVRfRElTQUJMRShTVE9QX1JJTkcpKTsKIH0KIAotaW50IGxvZ2ljYWxfcmluZ19mbHVzaF9h bGxfY2FjaGVzKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmKQoraW50IGxvZ2ljYWxf cmluZ19mbHVzaF9hbGxfY2FjaGVzKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAor CQkJCSAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCkKIHsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5l X2NzICpyaW5nID0gcmluZ2J1Zi0+cmluZzsKIAlpbnQgcmV0OwpAQCAtNzc2LDcgKzc4NCw3IEBA IGludCBsb2dpY2FsX3JpbmdfZmx1c2hfYWxsX2NhY2hlcyhzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZl ciAqcmluZ2J1ZikKIAlpZiAoIXJpbmctPmdwdV9jYWNoZXNfZGlydHkpCiAJCXJldHVybiAwOwog Ci0JcmV0ID0gcmluZy0+ZW1pdF9mbHVzaChyaW5nYnVmLCAwLCBJOTE1X0dFTV9HUFVfRE9NQUlO Uyk7CisJcmV0ID0gcmluZy0+ZW1pdF9mbHVzaChyaW5nYnVmLCBjdHgsIDAsIEk5MTVfR0VNX0dQ VV9ET01BSU5TKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCkBAIC03OTQsMTAgKzgwMiwx MCBAQCBpbnQgbG9naWNhbF9yaW5nX2ZsdXNoX2FsbF9jYWNoZXMoc3RydWN0IGludGVsX3Jpbmdi dWZmZXIgKnJpbmdidWYpCiAgKiBwb2ludCwgdGhlIHRhaWwgKmluc2lkZSogdGhlIGNvbnRleHQg aXMgdXBkYXRlZCBhbmQgdGhlIEVMU1Agd3JpdHRlbiB0by4KICAqLwogdm9pZCBpbnRlbF9sb2dp Y2FsX3JpbmdfYWR2YW5jZV9hbmRfc3VibWl0KHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5n YnVmLAorCQkJCQkgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAogCQkJCQkgICBzdHJ1Y3Qg ZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZyA9IHJpbmdidWYtPnJpbmc7Ci0Jc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCA9IHJp bmdidWYtPkZJWE1FX2xyY19jdHg7CiAKIAlpbnRlbF9sb2dpY2FsX3JpbmdfYWR2YW5jZShyaW5n YnVmKTsKIApAQCAtODc5LDYgKzg4Nyw3IEBAIHN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX3dhaXRf cmVxdWVzdChzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKIH0KIAogc3RhdGljIGlu dCBsb2dpY2FsX3Jpbmdfd2FpdF9mb3Jfc3BhY2Uoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJp bmdidWYsCisJCQkJICAgICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCiAJCQkJICAgICAg IGludCBieXRlcykKIHsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcmluZ2J1Zi0+ cmluZzsKQEAgLTg5Miw3ICs5MDEsNyBAQCBzdGF0aWMgaW50IGxvZ2ljYWxfcmluZ193YWl0X2Zv cl9zcGFjZShzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKIAkJcmV0dXJuIHJldDsK IAogCS8qIEZvcmNlIHRoZSBjb250ZXh0IHN1Ym1pc3Npb24gaW4gY2FzZSB3ZSBoYXZlIGJlZW4g c2tpcHBpbmcgaXQgKi8KLQlpbnRlbF9sb2dpY2FsX3JpbmdfYWR2YW5jZV9hbmRfc3VibWl0KHJp bmdidWYsIE5VTEwpOworCWludGVsX2xvZ2ljYWxfcmluZ19hZHZhbmNlX2FuZF9zdWJtaXQocmlu Z2J1ZiwgY3R4LCBOVUxMKTsKIAogCS8qIFdpdGggR0VNIHRoZSBoYW5nY2hlY2sgdGltZXIgc2hv dWxkIGtpY2sgdXMgb3V0IG9mIHRoZSBsb29wLAogCSAqIGxlYXZpbmcgaXQgZWFybHkgcnVucyB0 aGUgcmlzayBvZiBjb3JydXB0aW5nIEdFTSBzdGF0ZSAoZHVlCkBAIC05MzAsMTMgKzkzOSwxNCBA QCBzdGF0aWMgaW50IGxvZ2ljYWxfcmluZ193YWl0X2Zvcl9zcGFjZShzdHJ1Y3QgaW50ZWxfcmlu Z2J1ZmZlciAqcmluZ2J1ZiwKIAlyZXR1cm4gcmV0OwogfQogCi1zdGF0aWMgaW50IGxvZ2ljYWxf cmluZ193cmFwX2J1ZmZlcihzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZikKK3N0YXRp YyBpbnQgbG9naWNhbF9yaW5nX3dyYXBfYnVmZmVyKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpy aW5nYnVmLAorCQkJCSAgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4KQogewogCXVpbnQzMl90 IF9faW9tZW0gKnZpcnQ7CiAJaW50IHJlbSA9IHJpbmdidWYtPnNpemUgLSByaW5nYnVmLT50YWls OwogCiAJaWYgKHJpbmdidWYtPnNwYWNlIDwgcmVtKSB7Ci0JCWludCByZXQgPSBsb2dpY2FsX3Jp bmdfd2FpdF9mb3Jfc3BhY2UocmluZ2J1ZiwgcmVtKTsKKwkJaW50IHJldCA9IGxvZ2ljYWxfcmlu Z193YWl0X2Zvcl9zcGFjZShyaW5nYnVmLCBjdHgsIHJlbSk7CiAKIAkJaWYgKHJldCkKIAkJCXJl dHVybiByZXQ7CkBAIC05NTMsMTggKzk2MywxOSBAQCBzdGF0aWMgaW50IGxvZ2ljYWxfcmluZ193 cmFwX2J1ZmZlcihzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZikKIAlyZXR1cm4gMDsK IH0KIAotc3RhdGljIGludCBsb2dpY2FsX3JpbmdfcHJlcGFyZShzdHJ1Y3QgaW50ZWxfcmluZ2J1 ZmZlciAqcmluZ2J1ZiwgaW50IGJ5dGVzKQorc3RhdGljIGludCBsb2dpY2FsX3JpbmdfcHJlcGFy ZShzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKKwkJCQlzdHJ1Y3QgaW50ZWxfY29u dGV4dCAqY3R4LCBpbnQgYnl0ZXMpCiB7CiAJaW50IHJldDsKIAogCWlmICh1bmxpa2VseShyaW5n YnVmLT50YWlsICsgYnl0ZXMgPiByaW5nYnVmLT5lZmZlY3RpdmVfc2l6ZSkpIHsKLQkJcmV0ID0g bG9naWNhbF9yaW5nX3dyYXBfYnVmZmVyKHJpbmdidWYpOworCQlyZXQgPSBsb2dpY2FsX3Jpbmdf d3JhcF9idWZmZXIocmluZ2J1ZiwgY3R4KTsKIAkJaWYgKHVubGlrZWx5KHJldCkpCiAJCQlyZXR1 cm4gcmV0OwogCX0KIAogCWlmICh1bmxpa2VseShyaW5nYnVmLT5zcGFjZSA8IGJ5dGVzKSkgewot CQlyZXQgPSBsb2dpY2FsX3Jpbmdfd2FpdF9mb3Jfc3BhY2UocmluZ2J1ZiwgYnl0ZXMpOworCQly ZXQgPSBsb2dpY2FsX3Jpbmdfd2FpdF9mb3Jfc3BhY2UocmluZ2J1ZiwgY3R4LCBieXRlcyk7CiAJ CWlmICh1bmxpa2VseShyZXQpKQogCQkJcmV0dXJuIHJldDsKIAl9CkBAIC05ODUsNyArOTk2LDgg QEAgc3RhdGljIGludCBsb2dpY2FsX3JpbmdfcHJlcGFyZShzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZl ciAqcmluZ2J1ZiwgaW50IGJ5dGVzKQogICoKICAqIFJldHVybjogbm9uLXplcm8gaWYgdGhlIHJp bmdidWZmZXIgaXMgbm90IHJlYWR5IHRvIGJlIHdyaXR0ZW4gdG8uCiAgKi8KLWludCBpbnRlbF9s b2dpY2FsX3JpbmdfYmVnaW4oc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsIGludCBu dW1fZHdvcmRzKQoraW50IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihzdHJ1Y3QgaW50ZWxfcmlu Z2J1ZmZlciAqcmluZ2J1ZiwKKwkJCSAgICAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwgaW50 IG51bV9kd29yZHMpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJpbmdidWYt PnJpbmc7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHJpbmctPmRldjsKQEAgLTk5NywxMiAr MTAwOSwxMiBAQCBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHN0cnVjdCBpbnRlbF9yaW5n YnVmZmVyICpyaW5nYnVmLCBpbnQgbnVtX2R3b3JkcykKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0 OwogCi0JcmV0ID0gbG9naWNhbF9yaW5nX3ByZXBhcmUocmluZ2J1ZiwgbnVtX2R3b3JkcyAqIHNp emVvZih1aW50MzJfdCkpOworCXJldCA9IGxvZ2ljYWxfcmluZ19wcmVwYXJlKHJpbmdidWYsIGN0 eCwgbnVtX2R3b3JkcyAqIHNpemVvZih1aW50MzJfdCkpOwogCWlmIChyZXQpCiAJCXJldHVybiBy ZXQ7CiAKIAkvKiBQcmVhbGxvY2F0ZSB0aGUgb2xyIGJlZm9yZSB0b3VjaGluZyB0aGUgcmluZyAq LwotCXJldCA9IGxvZ2ljYWxfcmluZ19hbGxvY19yZXF1ZXN0KHJpbmcsIHJpbmdidWYtPkZJWE1F X2xyY19jdHgpOworCXJldCA9IGxvZ2ljYWxfcmluZ19hbGxvY19yZXF1ZXN0KHJpbmcsIGN0eCk7 CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApAQCAtMTA5NSwxMiArMTEwNywxMyBAQCBzdGF0 aWMgaW50IGdlbjhfaW5pdF9yZW5kZXJfcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5n KQogfQogCiBzdGF0aWMgaW50IGdlbjhfZW1pdF9iYl9zdGFydChzdHJ1Y3QgaW50ZWxfcmluZ2J1 ZmZlciAqcmluZ2J1ZiwKKwkJCSAgICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCiAJCQkg ICAgICB1NjQgb2Zmc2V0LCB1bnNpZ25lZCBmbGFncykKIHsKIAlib29sIHBwZ3R0ID0gIShmbGFn cyAmIEk5MTVfRElTUEFUQ0hfU0VDVVJFKTsKIAlpbnQgcmV0OwogCi0JcmV0ID0gaW50ZWxfbG9n aWNhbF9yaW5nX2JlZ2luKHJpbmdidWYsIDQpOworCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19i ZWdpbihyaW5nYnVmLCBjdHgsIDQpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTEx NDgsNiArMTE2MSw3IEBAIHN0YXRpYyB2b2lkIGdlbjhfbG9naWNhbF9yaW5nX3B1dF9pcnEoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqcmluZykKIH0KIAogc3RhdGljIGludCBnZW44X2VtaXRfZmx1 c2goc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCisJCQkgICBzdHJ1Y3QgaW50ZWxf Y29udGV4dCAqY3R4LAogCQkJICAgdTMyIGludmFsaWRhdGVfZG9tYWlucywKIAkJCSAgIHUzMiB1 bnVzZWQpCiB7CkBAIC0xMTU3LDcgKzExNzEsNyBAQCBzdGF0aWMgaW50IGdlbjhfZW1pdF9mbHVz aChzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKIAl1aW50MzJfdCBjbWQ7CiAJaW50 IHJldDsKIAotCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyaW5nYnVmLCA0KTsKKwly ZXQgPSBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4ocmluZ2J1ZiwgY3R4LCA0KTsKIAlpZiAocmV0 KQogCQlyZXR1cm4gcmV0OwogCkBAIC0xMTg2LDYgKzEyMDAsNyBAQCBzdGF0aWMgaW50IGdlbjhf ZW1pdF9mbHVzaChzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKIH0KIAogc3RhdGlj IGludCBnZW44X2VtaXRfZmx1c2hfcmVuZGVyKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5n YnVmLAorCQkJCSAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAkJCQkgIHUzMiBpbnZhbGlk YXRlX2RvbWFpbnMsCiAJCQkJICB1MzIgZmx1c2hfZG9tYWlucykKIHsKQEAgLTEyMTIsNyArMTIy Nyw3IEBAIHN0YXRpYyBpbnQgZ2VuOF9lbWl0X2ZsdXNoX3JlbmRlcihzdHJ1Y3QgaW50ZWxfcmlu Z2J1ZmZlciAqcmluZ2J1ZiwKIAkJZmxhZ3MgfD0gUElQRV9DT05UUk9MX0dMT0JBTF9HVFRfSVZC OwogCX0KIAotCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyaW5nYnVmLCA2KTsKKwly ZXQgPSBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4ocmluZ2J1ZiwgY3R4LCA2KTsKIAlpZiAocmV0 KQogCQlyZXR1cm4gcmV0OwogCkBAIC0xMjM3LDEzICsxMjUyLDE1IEBAIHN0YXRpYyB2b2lkIGdl bjhfc2V0X3NlcW5vKHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsIHUzMiBzZXFubykKIAlp bnRlbF93cml0ZV9zdGF0dXNfcGFnZShyaW5nLCBJOTE1X0dFTV9IV1NfSU5ERVgsIHNlcW5vKTsK IH0KIAotc3RhdGljIGludCBnZW44X2VtaXRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZl ciAqcmluZ2J1Ziwgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQorc3RhdGlj IGludCBnZW44X2VtaXRfcmVxdWVzdChzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwK KwkJCSAgICAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKKwkJCSAgICAgc3RydWN0IGRybV9p OTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJp bmcgPSByaW5nYnVmLT5yaW5nOwogCXUzMiBjbWQ7CiAJaW50IHJldDsKIAotCXJldCA9IGludGVs X2xvZ2ljYWxfcmluZ19iZWdpbihyaW5nYnVmLCA2KTsKKwlyZXQgPSBpbnRlbF9sb2dpY2FsX3Jp bmdfYmVnaW4ocmluZ2J1ZiwgY3R4LCA2KTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCkBA IC0xMjU5LDcgKzEyNzYsNyBAQCBzdGF0aWMgaW50IGdlbjhfZW1pdF9yZXF1ZXN0KHN0cnVjdCBp bnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLCBzdHJ1Y3QgZHJtX2k5MTVfZwogCQlpOTE1X2dlbV9y ZXF1ZXN0X2dldF9zZXFubyhyaW5nLT5vdXRzdGFuZGluZ19sYXp5X3JlcXVlc3QpKTsKIAlpbnRl bF9sb2dpY2FsX3JpbmdfZW1pdChyaW5nYnVmLCBNSV9VU0VSX0lOVEVSUlVQVCk7CiAJaW50ZWxf bG9naWNhbF9yaW5nX2VtaXQocmluZ2J1ZiwgTUlfTk9PUCk7Ci0JaW50ZWxfbG9naWNhbF9yaW5n X2FkdmFuY2VfYW5kX3N1Ym1pdChyaW5nYnVmLCByZXF1ZXN0KTsKKwlpbnRlbF9sb2dpY2FsX3Jp bmdfYWR2YW5jZV9hbmRfc3VibWl0KHJpbmdidWYsIGN0eCwgcmVxdWVzdCk7CiAKIAlyZXR1cm4g MDsKIH0KQEAgLTE1MzYsNiArMTU1Myw3IEBAIGludCBpbnRlbF9scl9jb250ZXh0X3JlbmRlcl9z dGF0ZV9pbml0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCXJldHVybiAwOwogCiAJ cmV0ID0gcmluZy0+ZW1pdF9iYl9zdGFydChyaW5nYnVmLAorCQkJY3R4LAogCQkJc28uZ2d0dF9v ZmZzZXQsCiAJCQlJOTE1X0RJU1BBVENIX1NFQ1VSRSk7CiAJaWYgKHJldCkKQEAgLTE3ODUsNyAr MTgwMyw2IEBAIGludCBpbnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2NyZWF0ZShzdHJ1Y3QgaW50 ZWxfY29udGV4dCAqY3R4LAogCX0KIAogCXJpbmdidWYtPnJpbmcgPSByaW5nOwotCXJpbmdidWYt PkZJWE1FX2xyY19jdHggPSBjdHg7CiAKIAlyaW5nYnVmLT5zaXplID0gMzIgKiBQQUdFX1NJWkU7 CiAJcmluZ2J1Zi0+ZWZmZWN0aXZlX3NpemUgPSByaW5nYnVmLT5zaXplOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9scmMuaAppbmRleCA3NjE0MWNlLi5iYzZmZjBkIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9scmMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9s cmMuaApAQCAtMzYsOCArMzYsMTAgQEAgdm9pZCBpbnRlbF9sb2dpY2FsX3Jpbmdfc3RvcChzdHJ1 Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKIHZvaWQgaW50ZWxfbG9naWNhbF9yaW5nX2NsZWFu dXAoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CiBpbnQgaW50ZWxfbG9naWNhbF9yaW5n c19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogCi1pbnQgbG9naWNhbF9yaW5nX2ZsdXNo X2FsbF9jYWNoZXMoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYpOworaW50IGxvZ2lj YWxfcmluZ19mbHVzaF9hbGxfY2FjaGVzKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVm LAorCQkJCSAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCk7CiB2b2lkIGludGVsX2xvZ2ljYWxf cmluZ19hZHZhbmNlX2FuZF9zdWJtaXQoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYs CisJCQkJCSAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCiAJCQkJCSAgIHN0cnVjdCBkcm1f aTkxNV9nZW1fcmVxdWVzdCAqcmVxdWVzdCk7CiAvKioKICAqIGludGVsX2xvZ2ljYWxfcmluZ19h ZHZhbmNlKCkgLSBhZHZhbmNlIHRoZSByaW5nYnVmZmVyIHRhaWwKQEAgLTYwLDcgKzYyLDkgQEAg c3RhdGljIGlubGluZSB2b2lkIGludGVsX2xvZ2ljYWxfcmluZ19lbWl0KHN0cnVjdCBpbnRlbF9y aW5nYnVmZmVyICpyaW5nYnVmLAogCWlvd3JpdGUzMihkYXRhLCByaW5nYnVmLT52aXJ0dWFsX3N0 YXJ0ICsgcmluZ2J1Zi0+dGFpbCk7CiAJcmluZ2J1Zi0+dGFpbCArPSA0OwogfQotaW50IGludGVs X2xvZ2ljYWxfcmluZ19iZWdpbihzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwgaW50 IG51bV9kd29yZHMpOworaW50IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihzdHJ1Y3QgaW50ZWxf cmluZ2J1ZmZlciAqcmluZ2J1ZiwKKwkJCSAgICAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwK KwkJCSAgICAgaW50IG51bV9kd29yZHMpOwogCiAvKiBMb2dpY2FsIFJpbmcgQ29udGV4dHMgKi8K IGludCBpbnRlbF9scl9jb250ZXh0X3JlbmRlcl9zdGF0ZV9pbml0KHN0cnVjdCBpbnRlbF9lbmdp bmVfY3MgKnJpbmcsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n YnVmZmVyLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmgKaW5kZXgg YjY2OWY2OC4uNmFjYzI1NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cmluZ2J1ZmZlci5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIu aApAQCAtOTksMTMgKzk5LDYgQEAgc3RydWN0IGludGVsX3JpbmdidWZmZXIgewogCiAJc3RydWN0 IGludGVsX2VuZ2luZV9jcyAqcmluZzsKIAotCS8qCi0JICogRklYTUU6IFRoaXMgYmFja3BvaW50 ZXIgaXMgYW4gYXJ0aWZhY3Qgb2YgdGhlIGhpc3Rvcnkgb2YgaG93IHRoZQotCSAqIGV4ZWNsaXN0 IHBhdGNoZXMgY2FtZSBpbnRvIGJlaW5nLiBJdCB3aWxsIGdldCByZW1vdmVkIG9uY2UgdGhlIGJh c2ljCi0JICogY29kZSBoYXMgbGFuZGVkLgotCSAqLwotCXN0cnVjdCBpbnRlbF9jb250ZXh0ICpG SVhNRV9scmNfY3R4OwotCiAJdTMyIGhlYWQ7CiAJdTMyIHRhaWw7CiAJaW50IHNwYWNlOwpAQCAt MTIzLDYgKzExNiw4IEBAIHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyIHsKIAl1MzIgbGFzdF9yZXRp cmVkX2hlYWQ7CiB9OwogCitzdHJ1Y3QJaW50ZWxfY29udGV4dDsKKwogc3RydWN0ICBpbnRlbF9l bmdpbmVfY3MgewogCWNvbnN0IGNoYXIJKm5hbWU7CiAJZW51bSBpbnRlbF9yaW5nX2lkIHsKQEAg LTIzOSwxMSArMjM0LDE0IEBAIHN0cnVjdCAgaW50ZWxfZW5naW5lX2NzIHsKIAl1OCBuZXh0X2Nv bnRleHRfc3RhdHVzX2J1ZmZlcjsKIAl1MzIgICAgICAgICAgICAgaXJxX2tlZXBfbWFzazsgLyog Yml0bWFzayBmb3IgaW50ZXJydXB0cyB0aGF0IHNob3VsZCBub3QgYmUgbWFza2VkICovCiAJaW50 CQkoKmVtaXRfcmVxdWVzdCkoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCisJCQkJ CXN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCiAJCQkJCXN0cnVjdCBkcm1faTkxNV9nZW1fcmVx dWVzdCAqcmVxdWVzdCk7CiAJaW50CQkoKmVtaXRfZmx1c2gpKHN0cnVjdCBpbnRlbF9yaW5nYnVm ZmVyICpyaW5nYnVmLAorCQkJCSAgICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCiAJCQkJ ICAgICAgdTMyIGludmFsaWRhdGVfZG9tYWlucywKIAkJCQkgICAgICB1MzIgZmx1c2hfZG9tYWlu cyk7CiAJaW50CQkoKmVtaXRfYmJfc3RhcnQpKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5n YnVmLAorCQkJCQkgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAkJCQkJIHU2NCBvZmZzZXQs IHVuc2lnbmVkIGZsYWdzKTsKIAogCS8qKgotLSAKMi4xLjEKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwt Z2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==