From: Nick Hoath Subject: [PATCH 3/4] drm/i915: Remove FIXME_lrc_ctx backpointer Date: Mon, 12 Jan 2015 15:33:11 +0000 Message-ID: <1421076792-23578-4-git-send-email-nicholas.hoath@intel.com> References: <1421076792-23578-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 9EE286E500 for ; Mon, 12 Jan 2015 07:33:32 -0800 (PST) In-Reply-To: <1421076792-23578-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@ffwll.ch List-Id: intel-gfx@lists.freedesktop.org VGhlIGZpcnN0IHBhc3MgaW1wbGVtZW50YXRpb24gb2YgZXhlY2xpc3RzIHJlcXVpcmVkIGEgYmFj a3BvaW50ZXIgdG8gdGhlIGNvbnRleHQgdG8gYmUgaGVsZAppbiB0aGUgaW50ZWxfcmluZ2J1ZmZl ci4gSG93ZXZlciB0aGUgY29udGV4dCBwb2ludGVyIGlzIGF2YWlsYWJsZSBoaWdoZXIgaW4gdGhl IGNhbGwgc3RhY2suClJlbW92ZSB0aGUgYmFja3BvaW50ZXIgZnJvbSB0aGUgcmluZyBidWZmZXIg c3RydWN0dXJlIGFuZCBpbnN0ZWFkIHBhc3MgaXQgZG93biB0aHJvdWdoIHRoZQpjYWxsIHN0YWNr LgoKdjI6IEludGVncmF0ZSB0aGlzIGNoYW5nZXNldCB3aXRoIHRoZSByZW1vdmFsIG9mIGR1cGxp Y2F0ZSByZXF1ZXN0L2V4ZWNsaXN0IHF1ZXVlIGl0ZW0gbWVtYmVycy4KdjM6IFJlYmFzZQp2NDog UmViYXNlLiBSZW1vdmUgcGFzc2luZyBvZiBjb250ZXh0IHdoZW4gdGhlIHJlcXVlc3QgaXMgcGFz c2VkLgpTaWduZWQtb2ZmLWJ5OiBOaWNrIEhvYXRoIDxuaWNob2xhcy5ob2F0aEBpbnRlbC5jb20+ Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAgICAgIHwgIDUgKy0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYyAgICAgICAgfCA2NyArKysrKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5oICAg ICAgICB8ICA4ICsrKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuaCB8 IDExICsrLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCA1MiBpbnNlcnRpb25zKCspLCAzOSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRleCBlNjc2OGQzLi4wNjQ5NTU5IDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTI0MjIsOCArMjQyMiw3IEBAIGludCBfX2k5MTVfYWRk X3JlcXVlc3Qoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAkJcmV0dXJuIC1FTk9NRU07 CiAKIAlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKSB7Ci0JCXN0cnVjdCBpbnRlbF9jb250ZXh0 ICpjdHggPSByZXF1ZXN0LT5jdHg7Ci0JCXJpbmdidWYgPSBjdHgtPmVuZ2luZVtyaW5nLT5pZF0u cmluZ2J1ZjsKKwkJcmluZ2J1ZiA9IHJlcXVlc3QtPmN0eC0+ZW5naW5lW3JpbmctPmlkXS5yaW5n YnVmOwogCX0gZWxzZQogCQlyaW5nYnVmID0gcmluZy0+YnVmZmVyOwogCkBAIC0yNDM2LDcgKzI0 MzUsNyBAQCBpbnQgX19pOTE1X2FkZF9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJp bmcsCiAJICogd2hhdC4KIAkgKi8KIAlpZiAoaTkxNS5lbmFibGVfZXhlY2xpc3RzKSB7Ci0JCXJl dCA9IGxvZ2ljYWxfcmluZ19mbHVzaF9hbGxfY2FjaGVzKHJpbmdidWYpOworCQlyZXQgPSBsb2dp Y2FsX3JpbmdfZmx1c2hfYWxsX2NhY2hlcyhyaW5nYnVmLCByZXF1ZXN0LT5jdHgpOwogCQlpZiAo cmV0KQogCQkJcmV0dXJuIHJldDsKIAl9IGVsc2UgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfbHJjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpp bmRleCAzMTJiOGU4Li44Mjc1YjdhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9scmMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtNTU5 LDYgKzU1OSw4IEBAIHN0YXRpYyBpbnQgZXhlY2xpc3RzX2NvbnRleHRfcXVldWUoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqcmluZywKIAkJaWYgKHJlcXVlc3QgPT0gTlVMTCkKIAkJCXJldHVybiAt RU5PTUVNOwogCQlyZXF1ZXN0LT5yaW5nID0gcmluZzsKKwl9IGVsc2UgeworCQlXQVJOX09OKHRv ICE9IHJlcXVlc3QtPmN0eCk7CiAJfQogCXJlcXVlc3QtPmN0eCA9IHRvOwogCXJlcXVlc3QtPnRh aWwgPSB0YWlsOwpAQCAtNTk5LDcgKzYwMSw4IEBAIHN0YXRpYyBpbnQgZXhlY2xpc3RzX2NvbnRl eHRfcXVldWUoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAlyZXR1cm4gMDsKIH0KIAot c3RhdGljIGludCBsb2dpY2FsX3JpbmdfaW52YWxpZGF0ZV9hbGxfY2FjaGVzKHN0cnVjdCBpbnRl bF9yaW5nYnVmZmVyICpyaW5nYnVmKQorc3RhdGljIGludCBsb2dpY2FsX3JpbmdfaW52YWxpZGF0 ZV9hbGxfY2FjaGVzKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAorCQkJCQkgICAg ICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4KQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3Mg KnJpbmcgPSByaW5nYnVmLT5yaW5nOwogCXVpbnQzMl90IGZsdXNoX2RvbWFpbnM7CkBAIC02MDks NyArNjEyLDggQEAgc3RhdGljIGludCBsb2dpY2FsX3JpbmdfaW52YWxpZGF0ZV9hbGxfY2FjaGVz KHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmKQogCWlmIChyaW5nLT5ncHVfY2FjaGVz X2RpcnR5KQogCQlmbHVzaF9kb21haW5zID0gSTkxNV9HRU1fR1BVX0RPTUFJTlM7CiAKLQlyZXQg PSByaW5nLT5lbWl0X2ZsdXNoKHJpbmdidWYsIEk5MTVfR0VNX0dQVV9ET01BSU5TLCBmbHVzaF9k b21haW5zKTsKKwlyZXQgPSByaW5nLT5lbWl0X2ZsdXNoKHJpbmdidWYsIGN0eCwKKwkJCSAgICAg ICBJOTE1X0dFTV9HUFVfRE9NQUlOUywgZmx1c2hfZG9tYWlucyk7CiAJaWYgKHJldCkKIAkJcmV0 dXJuIHJldDsKIApAQCAtNjE4LDYgKzYyMiw3IEBAIHN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX2lu dmFsaWRhdGVfYWxsX2NhY2hlcyhzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZikKIH0K IAogc3RhdGljIGludCBleGVjbGlzdHNfbW92ZV90b19ncHUoc3RydWN0IGludGVsX3JpbmdidWZm ZXIgKnJpbmdidWYsCisJCQkJIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCiAJCQkJIHN0cnVj dCBsaXN0X2hlYWQgKnZtYXMpCiB7CiAJc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyA9IHJp bmdidWYtPnJpbmc7CkBAIC02NDUsNyArNjUwLDcgQEAgc3RhdGljIGludCBleGVjbGlzdHNfbW92 ZV90b19ncHUoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCiAJLyogVW5jb25kaXRp b25hbGx5IGludmFsaWRhdGUgZ3B1IGNhY2hlcyBhbmQgZW5zdXJlIHRoYXQgd2UgZG8gZmx1c2gK IAkgKiBhbnkgcmVzaWR1YWwgd3JpdGVzIGZyb20gdGhlIHByZXZpb3VzIGJhdGNoLgogCSAqLwot CXJldHVybiBsb2dpY2FsX3JpbmdfaW52YWxpZGF0ZV9hbGxfY2FjaGVzKHJpbmdidWYpOworCXJl dHVybiBsb2dpY2FsX3JpbmdfaW52YWxpZGF0ZV9hbGxfY2FjaGVzKHJpbmdidWYsIGN0eCk7CiB9 CiAKIC8qKgpAQCAtNzI1LDEzICs3MzAsMTMgQEAgaW50IGludGVsX2V4ZWNsaXN0c19zdWJtaXNz aW9uKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZSwKIAkJcmV0 dXJuIC1FSU5WQUw7CiAJfQogCi0JcmV0ID0gZXhlY2xpc3RzX21vdmVfdG9fZ3B1KHJpbmdidWYs IHZtYXMpOworCXJldCA9IGV4ZWNsaXN0c19tb3ZlX3RvX2dwdShyaW5nYnVmLCBjdHgsIHZtYXMp OwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKIAlpZiAocmluZyA9PSAmZGV2X3ByaXYtPnJp bmdbUkNTXSAmJgogCSAgICBpbnN0cF9tb2RlICE9IGRldl9wcml2LT5yZWxhdGl2ZV9jb25zdGFu dHNfbW9kZSkgewotCQlyZXQgPSBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4ocmluZ2J1ZiwgNCk7 CisJCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyaW5nYnVmLCBjdHgsIDQpOwogCQlp ZiAocmV0KQogCQkJcmV0dXJuIHJldDsKIApAQCAtNzQ0LDcgKzc0OSw3IEBAIGludCBpbnRlbF9l eGVjbGlzdHNfc3VibWlzc2lvbihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJtX2Zp bGUgKmZpbGUsCiAJCWRldl9wcml2LT5yZWxhdGl2ZV9jb25zdGFudHNfbW9kZSA9IGluc3RwX21v ZGU7CiAJfQogCi0JcmV0ID0gcmluZy0+ZW1pdF9iYl9zdGFydChyaW5nYnVmLCBleGVjX3N0YXJ0 LCBmbGFncyk7CisJcmV0ID0gcmluZy0+ZW1pdF9iYl9zdGFydChyaW5nYnVmLCBjdHgsIGV4ZWNf c3RhcnQsIGZsYWdzKTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCkBAIC04MDcsNyArODEy LDggQEAgdm9pZCBpbnRlbF9sb2dpY2FsX3Jpbmdfc3RvcChzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICpyaW5nKQogCUk5MTVfV1JJVEVfTU9ERShyaW5nLCBfTUFTS0VEX0JJVF9ESVNBQkxFKFNUT1Bf UklORykpOwogfQogCi1pbnQgbG9naWNhbF9yaW5nX2ZsdXNoX2FsbF9jYWNoZXMoc3RydWN0IGlu dGVsX3JpbmdidWZmZXIgKnJpbmdidWYpCitpbnQgbG9naWNhbF9yaW5nX2ZsdXNoX2FsbF9jYWNo ZXMoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCisJCQkJICBzdHJ1Y3QgaW50ZWxf Y29udGV4dCAqY3R4KQogewogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByaW5nYnVm LT5yaW5nOwogCWludCByZXQ7CkBAIC04MTUsNyArODIxLDcgQEAgaW50IGxvZ2ljYWxfcmluZ19m bHVzaF9hbGxfY2FjaGVzKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmKQogCWlmICgh cmluZy0+Z3B1X2NhY2hlc19kaXJ0eSkKIAkJcmV0dXJuIDA7CiAKLQlyZXQgPSByaW5nLT5lbWl0 X2ZsdXNoKHJpbmdidWYsIDAsIEk5MTVfR0VNX0dQVV9ET01BSU5TKTsKKwlyZXQgPSByaW5nLT5l bWl0X2ZsdXNoKHJpbmdidWYsIGN0eCwgMCwgSTkxNV9HRU1fR1BVX0RPTUFJTlMpOwogCWlmIChy ZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTgzMywxMCArODM5LDEwIEBAIGludCBsb2dpY2FsX3Jp bmdfZmx1c2hfYWxsX2NhY2hlcyhzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZikKICAq IHBvaW50LCB0aGUgdGFpbCAqaW5zaWRlKiB0aGUgY29udGV4dCBpcyB1cGRhdGVkIGFuZCB0aGUg RUxTUCB3cml0dGVuIHRvLgogICovCiB2b2lkIGludGVsX2xvZ2ljYWxfcmluZ19hZHZhbmNlX2Fu ZF9zdWJtaXQoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCisJCQkJCSAgIHN0cnVj dCBpbnRlbF9jb250ZXh0ICpjdHgsCiAJCQkJCSAgIHN0cnVjdCBkcm1faTkxNV9nZW1fcmVxdWVz dCAqcmVxdWVzdCkKIHsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcmluZ2J1Zi0+ cmluZzsKLQlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4ID0gcmluZ2J1Zi0+RklYTUVfbHJjX2N0 eDsKIAogCWludGVsX2xvZ2ljYWxfcmluZ19hZHZhbmNlKHJpbmdidWYpOwogCkBAIC05NzQsNiAr OTgwLDcgQEAgc3RhdGljIGludCBsb2dpY2FsX3Jpbmdfd2FpdF9yZXF1ZXN0KHN0cnVjdCBpbnRl bF9yaW5nYnVmZmVyICpyaW5nYnVmLAogfQogCiBzdGF0aWMgaW50IGxvZ2ljYWxfcmluZ193YWl0 X2Zvcl9zcGFjZShzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKKwkJCQkgICAgICAg c3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAkJCQkgICAgICAgaW50IGJ5dGVzKQogewogCXN0 cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcgPSByaW5nYnVmLT5yaW5nOwpAQCAtOTg3LDcgKzk5 NCw3IEBAIHN0YXRpYyBpbnQgbG9naWNhbF9yaW5nX3dhaXRfZm9yX3NwYWNlKHN0cnVjdCBpbnRl bF9yaW5nYnVmZmVyICpyaW5nYnVmLAogCQlyZXR1cm4gcmV0OwogCiAJLyogRm9yY2UgdGhlIGNv bnRleHQgc3VibWlzc2lvbiBpbiBjYXNlIHdlIGhhdmUgYmVlbiBza2lwcGluZyBpdCAqLwotCWlu dGVsX2xvZ2ljYWxfcmluZ19hZHZhbmNlX2FuZF9zdWJtaXQocmluZ2J1ZiwgTlVMTCk7CisJaW50 ZWxfbG9naWNhbF9yaW5nX2FkdmFuY2VfYW5kX3N1Ym1pdChyaW5nYnVmLCBjdHgsIE5VTEwpOwog CiAJLyogV2l0aCBHRU0gdGhlIGhhbmdjaGVjayB0aW1lciBzaG91bGQga2ljayB1cyBvdXQgb2Yg dGhlIGxvb3AsCiAJICogbGVhdmluZyBpdCBlYXJseSBydW5zIHRoZSByaXNrIG9mIGNvcnJ1cHRp bmcgR0VNIHN0YXRlIChkdWUKQEAgLTEwMjIsMTMgKzEwMjksMTQgQEAgc3RhdGljIGludCBsb2dp Y2FsX3Jpbmdfd2FpdF9mb3Jfc3BhY2Uoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYs CiAJcmV0dXJuIHJldDsKIH0KIAotc3RhdGljIGludCBsb2dpY2FsX3Jpbmdfd3JhcF9idWZmZXIo c3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYpCitzdGF0aWMgaW50IGxvZ2ljYWxfcmlu Z193cmFwX2J1ZmZlcihzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKKwkJCQkgICAg c3RydWN0IGludGVsX2NvbnRleHQgKmN0eCkKIHsKIAl1aW50MzJfdCBfX2lvbWVtICp2aXJ0Owog CWludCByZW0gPSByaW5nYnVmLT5zaXplIC0gcmluZ2J1Zi0+dGFpbDsKIAogCWlmIChyaW5nYnVm LT5zcGFjZSA8IHJlbSkgewotCQlpbnQgcmV0ID0gbG9naWNhbF9yaW5nX3dhaXRfZm9yX3NwYWNl KHJpbmdidWYsIHJlbSk7CisJCWludCByZXQgPSBsb2dpY2FsX3Jpbmdfd2FpdF9mb3Jfc3BhY2Uo cmluZ2J1ZiwgY3R4LCByZW0pOwogCiAJCWlmIChyZXQpCiAJCQlyZXR1cm4gcmV0OwpAQCAtMTA0 NSwxOCArMTA1MywxOSBAQCBzdGF0aWMgaW50IGxvZ2ljYWxfcmluZ193cmFwX2J1ZmZlcihzdHJ1 Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZikKIAlyZXR1cm4gMDsKIH0KIAotc3RhdGljIGlu dCBsb2dpY2FsX3JpbmdfcHJlcGFyZShzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1Ziwg aW50IGJ5dGVzKQorc3RhdGljIGludCBsb2dpY2FsX3JpbmdfcHJlcGFyZShzdHJ1Y3QgaW50ZWxf cmluZ2J1ZmZlciAqcmluZ2J1ZiwKKwkJCQlzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LCBpbnQg Ynl0ZXMpCiB7CiAJaW50IHJldDsKIAogCWlmICh1bmxpa2VseShyaW5nYnVmLT50YWlsICsgYnl0 ZXMgPiByaW5nYnVmLT5lZmZlY3RpdmVfc2l6ZSkpIHsKLQkJcmV0ID0gbG9naWNhbF9yaW5nX3dy YXBfYnVmZmVyKHJpbmdidWYpOworCQlyZXQgPSBsb2dpY2FsX3Jpbmdfd3JhcF9idWZmZXIocmlu Z2J1ZiwgY3R4KTsKIAkJaWYgKHVubGlrZWx5KHJldCkpCiAJCQlyZXR1cm4gcmV0OwogCX0KIAog CWlmICh1bmxpa2VseShyaW5nYnVmLT5zcGFjZSA8IGJ5dGVzKSkgewotCQlyZXQgPSBsb2dpY2Fs X3Jpbmdfd2FpdF9mb3Jfc3BhY2UocmluZ2J1ZiwgYnl0ZXMpOworCQlyZXQgPSBsb2dpY2FsX3Jp bmdfd2FpdF9mb3Jfc3BhY2UocmluZ2J1ZiwgY3R4LCBieXRlcyk7CiAJCWlmICh1bmxpa2VseShy ZXQpKQogCQkJcmV0dXJuIHJldDsKIAl9CkBAIC0xMDc3LDcgKzEwODYsOCBAQCBzdGF0aWMgaW50 IGxvZ2ljYWxfcmluZ19wcmVwYXJlKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLCBp bnQgYnl0ZXMpCiAgKgogICogUmV0dXJuOiBub24temVybyBpZiB0aGUgcmluZ2J1ZmZlciBpcyBu b3QgcmVhZHkgdG8gYmUgd3JpdHRlbiB0by4KICAqLwotaW50IGludGVsX2xvZ2ljYWxfcmluZ19i ZWdpbihzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwgaW50IG51bV9kd29yZHMpCitp bnQgaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5n YnVmLAorCQkJICAgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LCBpbnQgbnVtX2R3b3JkcykK IHsKIAlzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nID0gcmluZ2J1Zi0+cmluZzsKIAlzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2ID0gcmluZy0+ZGV2OwpAQCAtMTA4OSwxMiArMTA5OSwxMiBAQCBp bnQgaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5n YnVmLCBpbnQgbnVtX2R3b3JkcykKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0OwogCi0JcmV0ID0g bG9naWNhbF9yaW5nX3ByZXBhcmUocmluZ2J1ZiwgbnVtX2R3b3JkcyAqIHNpemVvZih1aW50MzJf dCkpOworCXJldCA9IGxvZ2ljYWxfcmluZ19wcmVwYXJlKHJpbmdidWYsIGN0eCwgbnVtX2R3b3Jk cyAqIHNpemVvZih1aW50MzJfdCkpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKIAkvKiBQ cmVhbGxvY2F0ZSB0aGUgb2xyIGJlZm9yZSB0b3VjaGluZyB0aGUgcmluZyAqLwotCXJldCA9IGxv Z2ljYWxfcmluZ19hbGxvY19yZXF1ZXN0KHJpbmcsIHJpbmdidWYtPkZJWE1FX2xyY19jdHgpOwor CXJldCA9IGxvZ2ljYWxfcmluZ19hbGxvY19yZXF1ZXN0KHJpbmcsIGN0eCk7CiAJaWYgKHJldCkK IAkJcmV0dXJuIHJldDsKIApAQCAtMTExNSwxMSArMTEyNSwxMSBAQCBzdGF0aWMgaW50IGludGVs X2xvZ2ljYWxfcmluZ193b3JrYXJvdW5kc19lbWl0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJp bmcsCiAJCXJldHVybiAwOwogCiAJcmluZy0+Z3B1X2NhY2hlc19kaXJ0eSA9IHRydWU7Ci0JcmV0 ID0gbG9naWNhbF9yaW5nX2ZsdXNoX2FsbF9jYWNoZXMocmluZ2J1Zik7CisJcmV0ID0gbG9naWNh bF9yaW5nX2ZsdXNoX2FsbF9jYWNoZXMocmluZ2J1ZiwgY3R4KTsKIAlpZiAocmV0KQogCQlyZXR1 cm4gcmV0OwogCi0JcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJpbmdidWYsIHctPmNv dW50ICogMiArIDIpOworCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyaW5nYnVmLCBj dHgsIHctPmNvdW50ICogMiArIDIpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTEx MzMsNyArMTE0Myw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfbG9naWNhbF9yaW5nX3dvcmthcm91bmRz X2VtaXQoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZywKIAlpbnRlbF9sb2dpY2FsX3Jpbmdf YWR2YW5jZShyaW5nYnVmKTsKIAogCXJpbmctPmdwdV9jYWNoZXNfZGlydHkgPSB0cnVlOwotCXJl dCA9IGxvZ2ljYWxfcmluZ19mbHVzaF9hbGxfY2FjaGVzKHJpbmdidWYpOworCXJldCA9IGxvZ2lj YWxfcmluZ19mbHVzaF9hbGxfY2FjaGVzKHJpbmdidWYsIGN0eCk7CiAJaWYgKHJldCkKIAkJcmV0 dXJuIHJldDsKIApAQCAtMTE4MywxMiArMTE5MywxMyBAQCBzdGF0aWMgaW50IGdlbjhfaW5pdF9y ZW5kZXJfcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKQogfQogCiBzdGF0aWMgaW50 IGdlbjhfZW1pdF9iYl9zdGFydChzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKKwkJ CSAgICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpjdHgsCiAJCQkgICAgICB1NjQgb2Zmc2V0LCB1 bnNpZ25lZCBmbGFncykKIHsKIAlib29sIHBwZ3R0ID0gIShmbGFncyAmIEk5MTVfRElTUEFUQ0hf U0VDVVJFKTsKIAlpbnQgcmV0OwogCi0JcmV0ID0gaW50ZWxfbG9naWNhbF9yaW5nX2JlZ2luKHJp bmdidWYsIDQpOworCXJldCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyaW5nYnVmLCBjdHgs IDQpOwogCWlmIChyZXQpCiAJCXJldHVybiByZXQ7CiAKQEAgLTEyMzYsNiArMTI0Nyw3IEBAIHN0 YXRpYyB2b2lkIGdlbjhfbG9naWNhbF9yaW5nX3B1dF9pcnEoc3RydWN0IGludGVsX2VuZ2luZV9j cyAqcmluZykKIH0KIAogc3RhdGljIGludCBnZW44X2VtaXRfZmx1c2goc3RydWN0IGludGVsX3Jp bmdidWZmZXIgKnJpbmdidWYsCisJCQkgICBzdHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAogCQkJ ICAgdTMyIGludmFsaWRhdGVfZG9tYWlucywKIAkJCSAgIHUzMiB1bnVzZWQpCiB7CkBAIC0xMjQ1 LDcgKzEyNTcsNyBAQCBzdGF0aWMgaW50IGdlbjhfZW1pdF9mbHVzaChzdHJ1Y3QgaW50ZWxfcmlu Z2J1ZmZlciAqcmluZ2J1ZiwKIAl1aW50MzJfdCBjbWQ7CiAJaW50IHJldDsKIAotCXJldCA9IGlu dGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyaW5nYnVmLCA0KTsKKwlyZXQgPSBpbnRlbF9sb2dpY2Fs X3JpbmdfYmVnaW4ocmluZ2J1ZiwgY3R4LCA0KTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0Owog CkBAIC0xMjc0LDYgKzEyODYsNyBAQCBzdGF0aWMgaW50IGdlbjhfZW1pdF9mbHVzaChzdHJ1Y3Qg aW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKIH0KIAogc3RhdGljIGludCBnZW44X2VtaXRfZmx1 c2hfcmVuZGVyKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAorCQkJCSAgc3RydWN0 IGludGVsX2NvbnRleHQgKmN0eCwKIAkJCQkgIHUzMiBpbnZhbGlkYXRlX2RvbWFpbnMsCiAJCQkJ ICB1MzIgZmx1c2hfZG9tYWlucykKIHsKQEAgLTEzMDAsNyArMTMxMyw3IEBAIHN0YXRpYyBpbnQg Z2VuOF9lbWl0X2ZsdXNoX3JlbmRlcihzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwK IAkJZmxhZ3MgfD0gUElQRV9DT05UUk9MX0dMT0JBTF9HVFRfSVZCOwogCX0KIAotCXJldCA9IGlu dGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyaW5nYnVmLCA2KTsKKwlyZXQgPSBpbnRlbF9sb2dpY2Fs X3JpbmdfYmVnaW4ocmluZ2J1ZiwgY3R4LCA2KTsKIAlpZiAocmV0KQogCQlyZXR1cm4gcmV0Owog CkBAIC0xMzMyLDcgKzEzNDUsNyBAQCBzdGF0aWMgaW50IGdlbjhfZW1pdF9yZXF1ZXN0KHN0cnVj dCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAogCXUzMiBjbWQ7CiAJaW50IHJldDsKIAotCXJl dCA9IGludGVsX2xvZ2ljYWxfcmluZ19iZWdpbihyaW5nYnVmLCA2KTsKKwlyZXQgPSBpbnRlbF9s b2dpY2FsX3JpbmdfYmVnaW4ocmluZ2J1ZiwgcmVxdWVzdC0+Y3R4LCA2KTsKIAlpZiAocmV0KQog CQlyZXR1cm4gcmV0OwogCkBAIC0xMzQ4LDcgKzEzNjEsNyBAQCBzdGF0aWMgaW50IGdlbjhfZW1p dF9yZXF1ZXN0KHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyICpyaW5nYnVmLAogCQlpOTE1X2dlbV9y ZXF1ZXN0X2dldF9zZXFubyhyaW5nLT5vdXRzdGFuZGluZ19sYXp5X3JlcXVlc3QpKTsKIAlpbnRl bF9sb2dpY2FsX3JpbmdfZW1pdChyaW5nYnVmLCBNSV9VU0VSX0lOVEVSUlVQVCk7CiAJaW50ZWxf bG9naWNhbF9yaW5nX2VtaXQocmluZ2J1ZiwgTUlfTk9PUCk7Ci0JaW50ZWxfbG9naWNhbF9yaW5n X2FkdmFuY2VfYW5kX3N1Ym1pdChyaW5nYnVmLCByZXF1ZXN0KTsKKwlpbnRlbF9sb2dpY2FsX3Jp bmdfYWR2YW5jZV9hbmRfc3VibWl0KHJpbmdidWYsIHJlcXVlc3QtPmN0eCwgcmVxdWVzdCk7CiAK IAlyZXR1cm4gMDsKIH0KQEAgLTE2MzYsNiArMTY0OSw3IEBAIGludCBpbnRlbF9scl9jb250ZXh0 X3JlbmRlcl9zdGF0ZV9pbml0KHN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmcsCiAJCXJldHVy biAwOwogCiAJcmV0ID0gcmluZy0+ZW1pdF9iYl9zdGFydChyaW5nYnVmLAorCQkJY3R4LAogCQkJ c28uZ2d0dF9vZmZzZXQsCiAJCQlJOTE1X0RJU1BBVENIX1NFQ1VSRSk7CiAJaWYgKHJldCkKQEAg LTE4OTIsNyArMTkwNiw2IEBAIGludCBpbnRlbF9scl9jb250ZXh0X2RlZmVycmVkX2NyZWF0ZShz dHJ1Y3QgaW50ZWxfY29udGV4dCAqY3R4LAogCX0KIAogCXJpbmdidWYtPnJpbmcgPSByaW5nOwot CXJpbmdidWYtPkZJWE1FX2xyY19jdHggPSBjdHg7CiAKIAlyaW5nYnVmLT5zaXplID0gMzIgKiBQ QUdFX1NJWkU7CiAJcmluZ2J1Zi0+ZWZmZWN0aXZlX3NpemUgPSByaW5nYnVmLT5zaXplOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9scmMuaAppbmRleCAzNzZjMzA3Li44MGE4MGVhIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9scmMuaApAQCAtMzgsOSArMzgsMTEgQEAgdm9pZCBpbnRlbF9sb2dpY2FsX3Jpbmdf c3RvcChzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICpyaW5nKTsKIHZvaWQgaW50ZWxfbG9naWNhbF9y aW5nX2NsZWFudXAoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqcmluZyk7CiBpbnQgaW50ZWxfbG9n aWNhbF9yaW5nc19pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpOwogCi1pbnQgbG9naWNhbF9y aW5nX2ZsdXNoX2FsbF9jYWNoZXMoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYpOwor aW50IGxvZ2ljYWxfcmluZ19mbHVzaF9hbGxfY2FjaGVzKHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVy ICpyaW5nYnVmLAorCQkJCSAgc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCk7CiB2b2lkIGludGVs X2xvZ2ljYWxfcmluZ19hZHZhbmNlX2FuZF9zdWJtaXQoCiAJCQkJc3RydWN0IGludGVsX3Jpbmdi dWZmZXIgKnJpbmdidWYsCisJCQkJc3RydWN0IGludGVsX2NvbnRleHQgKmN0eCwKIAkJCQlzdHJ1 Y3QgZHJtX2k5MTVfZ2VtX3JlcXVlc3QgKnJlcXVlc3QpOwogLyoqCiAgKiBpbnRlbF9sb2dpY2Fs X3JpbmdfYWR2YW5jZSgpIC0gYWR2YW5jZSB0aGUgcmluZ2J1ZmZlciB0YWlsCkBAIC02Myw3ICs2 NSw5IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBpbnRlbF9sb2dpY2FsX3JpbmdfZW1pdChzdHJ1Y3Qg aW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKIAlpb3dyaXRlMzIoZGF0YSwgcmluZ2J1Zi0+dmly dHVhbF9zdGFydCArIHJpbmdidWYtPnRhaWwpOwogCXJpbmdidWYtPnRhaWwgKz0gNDsKIH0KLWlu dCBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4oc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdi dWYsIGludCBudW1fZHdvcmRzKTsKK2ludCBpbnRlbF9sb2dpY2FsX3JpbmdfYmVnaW4oc3RydWN0 IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCisJCQkgICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0 ICpjdHgsCisJCQkgICAgIGludCBudW1fZHdvcmRzKTsKIAogLyogTG9naWNhbCBSaW5nIENvbnRl eHRzICovCiBpbnQgaW50ZWxfbHJfY29udGV4dF9yZW5kZXJfc3RhdGVfaW5pdChzdHJ1Y3QgaW50 ZWxfZW5naW5lX2NzICpyaW5nLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcmluZ2J1ZmZlci5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5o CmluZGV4IDMyYWEzZjMuLjcxNGYzZmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3JpbmdidWZmZXIuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5n YnVmZmVyLmgKQEAgLTk5LDEzICs5OSw2IEBAIHN0cnVjdCBpbnRlbF9yaW5nYnVmZmVyIHsKIAog CXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKnJpbmc7CiAKLQkvKgotCSAqIEZJWE1FOiBUaGlzIGJh Y2twb2ludGVyIGlzIGFuIGFydGlmYWN0IG9mIHRoZSBoaXN0b3J5IG9mIGhvdyB0aGUKLQkgKiBl eGVjbGlzdCBwYXRjaGVzIGNhbWUgaW50byBiZWluZy4gSXQgd2lsbCBnZXQgcmVtb3ZlZCBvbmNl IHRoZSBiYXNpYwotCSAqIGNvZGUgaGFzIGxhbmRlZC4KLQkgKi8KLQlzdHJ1Y3QgaW50ZWxfY29u dGV4dCAqRklYTUVfbHJjX2N0eDsKLQogCXUzMiBoZWFkOwogCXUzMiB0YWlsOwogCWludCBzcGFj ZTsKQEAgLTEyMyw2ICsxMTYsOCBAQCBzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciB7CiAJdTMyIGxh c3RfcmV0aXJlZF9oZWFkOwogfTsKIAorc3RydWN0CWludGVsX2NvbnRleHQ7CisKIHN0cnVjdCAg aW50ZWxfZW5naW5lX2NzIHsKIAljb25zdCBjaGFyCSpuYW1lOwogCWVudW0gaW50ZWxfcmluZ19p ZCB7CkBAIC0yNDIsOSArMjM3LDExIEBAIHN0cnVjdCAgaW50ZWxfZW5naW5lX2NzIHsKIAlpbnQJ CSgqZW1pdF9yZXF1ZXN0KShzdHJ1Y3QgaW50ZWxfcmluZ2J1ZmZlciAqcmluZ2J1ZiwKIAkJCQkJ c3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpyZXF1ZXN0KTsKIAlpbnQJCSgqZW1pdF9mbHVz aCkoc3RydWN0IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCisJCQkJICAgICAgc3RydWN0IGlu dGVsX2NvbnRleHQgKmN0eCwKIAkJCQkgICAgICB1MzIgaW52YWxpZGF0ZV9kb21haW5zLAogCQkJ CSAgICAgIHUzMiBmbHVzaF9kb21haW5zKTsKIAlpbnQJCSgqZW1pdF9iYl9zdGFydCkoc3RydWN0 IGludGVsX3JpbmdidWZmZXIgKnJpbmdidWYsCisJCQkJCSBzdHJ1Y3QgaW50ZWxfY29udGV4dCAq Y3R4LAogCQkJCQkgdTY0IG9mZnNldCwgdW5zaWduZWQgZmxhZ3MpOwogCiAJLyoqCi0tIAoyLjEu MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK