From mboxrd@z Thu Jan 1 00:00:00 1970 From: yu.dai@intel.com Subject: [PATCH 2/2] drm/i915/guc: Simplify code by keeping vmap of guc_client object Date: Wed, 17 Feb 2016 15:18:28 -0800 Message-ID: <1455751108-17673-3-git-send-email-yu.dai@intel.com> References: <1455751108-17673-1-git-send-email-yu.dai@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 C8E746E1BB for ; Wed, 17 Feb 2016 23:23:14 +0000 (UTC) In-Reply-To: <1455751108-17673-1-git-send-email-yu.dai@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 RnJvbTogQWxleCBEYWkgPHl1LmRhaUBpbnRlbC5jb20+CgpHdUMgY2xpZW50IG9iamVjdCBpcyBh bHdheXMgcGlubmVkIGR1cmluZyBpdHMgbGlmZSBjeWNsZS4gV2UgY2FjaGUKdGhlIHZtYXAgb2Yg Y2xpZW50IG9iamVjdCwgd2hpY2ggaW5jbHVkZXMgZ3VjX3Byb2Nlc3NfZGVzYywgZG9vcmJlbGwK YW5kIHdvcmsgcXVldWUuIEJ5IGRvaW5nIHNvLCB3ZSBjYW4gc2ltcGxpZnkgdGhlIGNvZGUgd2hl cmUgZHJpdmVyCmNvbW11bmljYXRlIHdpdGggR3VDLgoKQXMgYSByZXN1bHQsIHRoaXMgcGF0Y2gg cmVtb3ZlcyB0aGUga21hcF9hdG9taWMgaW4gd3FfY2hlY2tfc3BhY2UsCndoZXJlIHVzbGVlcF9y YW5nZSBjb3VsZCBiZSBjYWxsZWQgd2hpbGUga21hcF9hdG9taWMgaXMgaGVsZC4gVGhpcwpmaXhl cyBpc3N1ZSBiZWxvdy4KClsgICAzNC4wOTg3OThdIEJVRzogc2NoZWR1bGluZyB3aGlsZSBhdG9t aWM6IGdlbV9jbG9zZV9yYWNlLzE5NDEvMHgwMDAwMDAwMgpbICAgMzQuMDk4ODIyXSBNb2R1bGVz IGxpbmtlZCBpbjogaGlkX2dlbmVyaWMgdXNiaGlkIGk5MTUgYXNpeCB1c2JuZXQgbGlicGh5IG1p aSBpMmNfYWxnb19iaXQgZHJtX2ttc19oZWxwZXIgY2ZiZmlsbHJlY3Qgc3lzY29weWFyZWEgY2Zi aW1nYmx0IHN5c2ZpbGxyZWN0IHN5c2ltZ2JsdCBmYl9zeXNfZm9wcyBjZmJjb3B5YXJlYSBkcm0g Y29yZXRlbXAgaTJjX2hpZCBoaWQgdmlkZW8gcGluY3RybF9zdW5yaXNlcG9pbnQgcGluY3RybF9p bnRlbCBhY3BpX3BhZCBubHNfaXNvODg1OV8xIGUxMDAwZSBwdHAgcHNtb3VzZSBwcHNfY29yZSBh aGNpIGxpYmFoY2kKWyAgIDM0LjA5ODgyNF0gQ1BVOiAwIFBJRDogMTk0MSBDb21tOiBnZW1fY2xv c2VfcmFjZSBUYWludGVkOiBHICAgICBVICAgICAgICAgIDQuNC4wLTE2MDEyMSsgIzEyMwpbICAg MzQuMDk4ODI0XSBIYXJkd2FyZSBuYW1lOiBJbnRlbCBDb3Jwb3JhdGlvbiBTa3lsYWtlIENsaWVu dCBwbGF0Zm9ybS9Ta3lsYWtlIEFJTyBERFIzTCBSVlAxMCwgQklPUyBTS0xTRTJSMS5SMDAuWDEw MC5CMDEuMTUwOTIyMDU1MSAwOS8yMi8yMDE1ClsgICAzNC4wOTg4MjVdICAwMDAwMDAwMDAwMDEz ZTQwIGZmZmY4ODAxNjZjMjdhNzggZmZmZmZmZmY4MTI4MGQwMiBmZmZmODgwMTcyYzEzZTQwClsg ICAzNC4wOTg4MjZdICBmZmZmODgwMTY2YzI3YTg4IGZmZmZmZmZmODEwYzIwM2EgZmZmZjg4MDE2 NmMyN2FjOCBmZmZmZmZmZjgxNGVjODA4ClsgICAzNC4wOTg4MjddICBmZmZmODgwMTZiN2M2MDAw IGZmZmY4ODAxNjZjMjgwMDAgMDAwMDAwMDAwMDBmNDI0MCAwMDAwMDAwMDAwMDAwMDAxClsgICAz NC4wOTg4MjddIENhbGwgVHJhY2U6ClsgICAzNC4wOTg4MzFdICBbPGZmZmZmZmZmODEyODBkMDI+ XSBkdW1wX3N0YWNrKzB4NGIvMHg3OQpbICAgMzQuMDk4ODMzXSAgWzxmZmZmZmZmZjgxMGMyMDNh Pl0gX19zY2hlZHVsZV9idWcrMHg0MS8weDRmClsgICAzNC4wOTg4MzRdICBbPGZmZmZmZmZmODE0 ZWM4MDg+XSBfX3NjaGVkdWxlKzB4NWE4LzB4NjkwClsgICAzNC4wOTg4MzVdICBbPGZmZmZmZmZm ODE0ZWM5Mjc+XSBzY2hlZHVsZSsweDM3LzB4ODAKWyAgIDM0LjA5ODgzNl0gIFs8ZmZmZmZmZmY4 MTRlZjNmZD5dIHNjaGVkdWxlX2hydGltZW91dF9yYW5nZV9jbG9jaysweGFkLzB4MTMwClsgICAz NC4wOTg4MzddICBbPGZmZmZmZmZmODEwOTBiZTA+XSA/IGhydGltZXJfaW5pdCsweDEwLzB4MTAK WyAgIDM0LjA5ODgzOF0gIFs8ZmZmZmZmZmY4MTRlZjNmMT5dID8gc2NoZWR1bGVfaHJ0aW1lb3V0 X3JhbmdlX2Nsb2NrKzB4YTEvMHgxMzAKWyAgIDM0LjA5ODgzOV0gIFs8ZmZmZmZmZmY4MTRlZjQ4 ZT5dIHNjaGVkdWxlX2hydGltZW91dF9yYW5nZSsweGUvMHgxMApbICAgMzQuMDk4ODQwXSAgWzxm ZmZmZmZmZjgxNGVlZjliPl0gdXNsZWVwX3JhbmdlKzB4M2IvMHg0MApbICAgMzQuMDk4ODUzXSAg WzxmZmZmZmZmZmEwMWVjMTA5Pl0gaTkxNV9ndWNfd3FfY2hlY2tfc3BhY2UrMHgxMTkvMHgyMTAg W2k5MTVdClsgICAzNC4wOTg4NjFdICBbPGZmZmZmZmZmYTAxZGE0N2M+XSBpbnRlbF9sb2dpY2Fs X3JpbmdfYWxsb2NfcmVxdWVzdF9leHRyYXMrMHg1Yy8weDcwIFtpOTE1XQpbICAgMzQuMDk4ODY5 XSAgWzxmZmZmZmZmZmEwMWNkYmYxPl0gaTkxNV9nZW1fcmVxdWVzdF9hbGxvYysweDkxLzB4MTcw IFtpOTE1XQpbICAgMzQuMDk4ODc1XSAgWzxmZmZmZmZmZmEwMWMxYzA3Pl0gaTkxNV9nZW1fZG9f ZXhlY2J1ZmZlci5pc3JhLjI1KzB4YmM3LzB4MTJhMCBbaTkxNV0KWyAgIDM0LjA5ODg4Ml0gIFs8 ZmZmZmZmZmZhMDFjYjc4NT5dID8gaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlc19ndHQrMHgyMjUv MHgzYzAgW2k5MTVdClsgICAzNC4wOTg4ODldICBbPGZmZmZmZmZmYTAxZDFmYjY+XSA/IGk5MTVf Z2VtX3B3cml0ZV9pb2N0bCsweGQ2LzB4OWYwIFtpOTE1XQpbICAgMzQuMDk4ODk1XSAgWzxmZmZm ZmZmZmEwMWMyZTY4Pl0gaTkxNV9nZW1fZXhlY2J1ZmZlcjIrMHhhOC8weDI1MCBbaTkxNV0KWyAg IDM0LjA5ODkwMF0gIFs8ZmZmZmZmZmZhMDBmNjVkOD5dIGRybV9pb2N0bCsweDI1OC8weDRmMCBb ZHJtXQpbICAgMzQuMDk4OTA2XSAgWzxmZmZmZmZmZmEwMWMyZGMwPl0gPyBpOTE1X2dlbV9leGVj YnVmZmVyKzB4MzQwLzB4MzQwIFtpOTE1XQpbICAgMzQuMDk4OTA4XSAgWzxmZmZmZmZmZjgxMTE1 OTBkPl0gZG9fdmZzX2lvY3RsKzB4MmNkLzB4NGEwClsgICAzNC4wOTg5MDldICBbPGZmZmZmZmZm ODExMWVhYzI+XSA/IF9fZmdldCsweDcyLzB4YjAKWyAgIDM0LjA5ODkxMF0gIFs8ZmZmZmZmZmY4 MTExNWIxYz5dIFN5U19pb2N0bCsweDNjLzB4NzAKWyAgIDM0LjA5ODkxMV0gIFs8ZmZmZmZmZmY4 MTRlZmZkNz5dIGVudHJ5X1NZU0NBTExfNjRfZmFzdHBhdGgrMHgxMi8weDZhClsgICAzNC4xMDAy MDhdIC0tLS0tLS0tLS0tLVsgY3V0IGhlcmUgXS0tLS0tLS0tLS0tLQoKQnVnemlsbGE6IGh0dHBz Oi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dpP2lkPTkzODQ3CkNjOiBEYXZlIEdv cmRvbiA8ZGF2aWQucy5nb3Jkb25AaW50ZWwuY29tPgpDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVs LnZldHRlckBmZndsbC5jaD4KQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRl bC5jb20+ClNpZ25lZC1vZmYtYnk6IEFsZXggRGFpIDx5dS5kYWlAaW50ZWwuY29tPgotLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3VjX3N1Ym1pc3Npb24uYyB8IDUzICsrKysrKysrKy0t LS0tLS0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmggICAg ICAgICAgIHwgIDMgKy0KIDIgZmlsZXMgY2hhbmdlZCwgMTggaW5zZXJ0aW9ucygrKSwgMzggZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3Vi bWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ndWNfc3VibWlzc2lvbi5jCmlu ZGV4IGQ3NTQzZWYuLjNkNmExZjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ3VjX3N1Ym1pc3Npb24uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2d1Y19z dWJtaXNzaW9uLmMKQEAgLTE5NSwxMSArMTk1LDkgQEAgc3RhdGljIGludCBndWNfcmluZ19kb29y YmVsbChzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYykKIAlzdHJ1Y3QgZ3VjX3Byb2Nlc3NfZGVz YyAqZGVzYzsKIAl1bmlvbiBndWNfZG9vcmJlbGxfcXcgZGJfY21wLCBkYl9leGMsIGRiX3JldDsK IAl1bmlvbiBndWNfZG9vcmJlbGxfcXcgKmRiOwotCXZvaWQgKmJhc2U7CiAJaW50IGF0dGVtcHQg PSAyLCByZXQgPSAtRUFHQUlOOwogCi0JYmFzZSA9IGttYXBfYXRvbWljKGk5MTVfZ2VtX29iamVj dF9nZXRfcGFnZShnYy0+Y2xpZW50X29iaiwgMCkpOwotCWRlc2MgPSBiYXNlICsgZ2MtPnByb2Nf ZGVzY19vZmZzZXQ7CisJZGVzYyA9IGdjLT5jbGllbnRfYmFzZSArIGdjLT5wcm9jX2Rlc2Nfb2Zm c2V0OwogCiAJLyogVXBkYXRlIHRoZSB0YWlsIHNvIGl0IGlzIHZpc2libGUgdG8gR3VDICovCiAJ ZGVzYy0+dGFpbCA9IGdjLT53cV90YWlsOwpAQCAtMjE1LDcgKzIxMyw3IEBAIHN0YXRpYyBpbnQg Z3VjX3JpbmdfZG9vcmJlbGwoc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqZ2MpCiAJCWRiX2V4Yy5j b29raWUgPSAxOwogCiAJLyogcG9pbnRlciBvZiBjdXJyZW50IGRvb3JiZWxsIGNhY2hlbGluZSAq LwotCWRiID0gYmFzZSArIGdjLT5kb29yYmVsbF9vZmZzZXQ7CisJZGIgPSBnYy0+Y2xpZW50X2Jh c2UgKyBnYy0+ZG9vcmJlbGxfb2Zmc2V0OwogCiAJd2hpbGUgKGF0dGVtcHQtLSkgewogCQkvKiBs ZXRzIHJpbmcgdGhlIGRvb3JiZWxsICovCkBAIC0yNDQsMTAgKzI0Miw2IEBAIHN0YXRpYyBpbnQg Z3VjX3JpbmdfZG9vcmJlbGwoc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqZ2MpCiAJCQlkYl9leGMu Y29va2llID0gMTsKIAl9CiAKLQkvKiBGaW5hbGx5LCB1cGRhdGUgdGhlIGNhY2hlZCBjb3B5IG9m IHRoZSBHdUMncyBXUSBoZWFkICovCi0JZ2MtPndxX2hlYWQgPSBkZXNjLT5oZWFkOwotCi0Ja3Vu bWFwX2F0b21pYyhiYXNlKTsKIAlyZXR1cm4gcmV0OwogfQogCkBAIC0zNDEsMTAgKzMzNSw4IEBA IHN0YXRpYyB2b2lkIGd1Y19pbml0X3Byb2NfZGVzYyhzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCiAJ CQkgICAgICAgc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqY2xpZW50KQogewogCXN0cnVjdCBndWNf cHJvY2Vzc19kZXNjICpkZXNjOwotCXZvaWQgKmJhc2U7CiAKLQliYXNlID0ga21hcF9hdG9taWMo aTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlKGNsaWVudC0+Y2xpZW50X29iaiwgMCkpOwotCWRlc2Mg PSBiYXNlICsgY2xpZW50LT5wcm9jX2Rlc2Nfb2Zmc2V0OworCWRlc2MgPSBjbGllbnQtPmNsaWVu dF9iYXNlICsgY2xpZW50LT5wcm9jX2Rlc2Nfb2Zmc2V0OwogCiAJbWVtc2V0KGRlc2MsIDAsIHNp emVvZigqZGVzYykpOwogCkBAIC0zNjEsOCArMzUzLDYgQEAgc3RhdGljIHZvaWQgZ3VjX2luaXRf cHJvY19kZXNjKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKIAlkZXNjLT53cV9zaXplX2J5dGVzID0g Y2xpZW50LT53cV9zaXplOwogCWRlc2MtPndxX3N0YXR1cyA9IFdRX1NUQVRVU19BQ1RJVkU7CiAJ ZGVzYy0+cHJpb3JpdHkgPSBjbGllbnQtPnByaW9yaXR5OwotCi0Ja3VubWFwX2F0b21pYyhiYXNl KTsKIH0KIAogLyoKQEAgLTQ3NCwyNSArNDY0LDE2IEBAIHN0YXRpYyB2b2lkIGd1Y19maW5pX2N0 eF9kZXNjKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKIGludCBpOTE1X2d1Y193cV9jaGVja19zcGFj ZShzdHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYykKIHsKIAlzdHJ1Y3QgZ3VjX3Byb2Nlc3NfZGVz YyAqZGVzYzsKLQl2b2lkICpiYXNlOwogCXUzMiBzaXplID0gc2l6ZW9mKHN0cnVjdCBndWNfd3Ff aXRlbSk7CiAJaW50IHJldCA9IC1FVElNRURPVVQsIHRpbWVvdXRfY291bnRlciA9IDIwMDsKIAog CWlmICghZ2MpCiAJCXJldHVybiAwOwogCi0JLyogUXVpY2tseSByZXR1cm4gaWYgd3Egc3BhY2Ug aXMgYXZhaWxhYmxlIHNpbmNlIGxhc3QgdGltZSB3ZSBjYWNoZSB0aGUKLQkgKiBoZWFkIHBvc2l0 aW9uLiAqLwotCWlmIChDSVJDX1NQQUNFKGdjLT53cV90YWlsLCBnYy0+d3FfaGVhZCwgZ2MtPndx X3NpemUpID49IHNpemUpCi0JCXJldHVybiAwOwotCi0JYmFzZSA9IGttYXBfYXRvbWljKGk5MTVf Z2VtX29iamVjdF9nZXRfcGFnZShnYy0+Y2xpZW50X29iaiwgMCkpOwotCWRlc2MgPSBiYXNlICsg Z2MtPnByb2NfZGVzY19vZmZzZXQ7CisJZGVzYyA9IGdjLT5jbGllbnRfYmFzZSArIGdjLT5wcm9j X2Rlc2Nfb2Zmc2V0OwogCiAJd2hpbGUgKHRpbWVvdXRfY291bnRlci0tID4gMCkgewotCQlnYy0+ d3FfaGVhZCA9IGRlc2MtPmhlYWQ7Ci0KLQkJaWYgKENJUkNfU1BBQ0UoZ2MtPndxX3RhaWwsIGdj LT53cV9oZWFkLCBnYy0+d3Ffc2l6ZSkgPj0gc2l6ZSkgeworCQlpZiAoQ0lSQ19TUEFDRShnYy0+ d3FfdGFpbCwgZGVzYy0+aGVhZCwgZ2MtPndxX3NpemUpID49IHNpemUpIHsKIAkJCXJldCA9IDA7 CiAJCQlicmVhazsKIAkJfQpAQCAtNTAxLDI0ICs0ODIsMjMgQEAgaW50IGk5MTVfZ3VjX3dxX2No ZWNrX3NwYWNlKHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgKmdjKQogCQkJdXNsZWVwX3JhbmdlKDEw MDAsIDIwMDApOwogCX07CiAKLQlrdW5tYXBfYXRvbWljKGJhc2UpOwotCiAJcmV0dXJuIHJldDsK IH0KIAogc3RhdGljIGludCBndWNfYWRkX3dvcmtxdWV1ZV9pdGVtKHN0cnVjdCBpOTE1X2d1Y19j bGllbnQgKmdjLAogCQkJCSAgc3RydWN0IGRybV9pOTE1X2dlbV9yZXF1ZXN0ICpycSkKIHsKKwlz dHJ1Y3QgZ3VjX3Byb2Nlc3NfZGVzYyAqZGVzYzsKIAlzdHJ1Y3QgZ3VjX3dxX2l0ZW0gKndxaTsK LQl2b2lkICpiYXNlOwotCXUzMiB0YWlsLCB3cV9sZW4sIHdxX29mZiwgc3BhY2U7CisJdTMyIHRh aWwsIHdxX2xlbiwgd3FpX29mZiwgc3BhY2U7CiAKLQlzcGFjZSA9IENJUkNfU1BBQ0UoZ2MtPndx X3RhaWwsIGdjLT53cV9oZWFkLCBnYy0+d3Ffc2l6ZSk7CisJZGVzYyA9IGdjLT5jbGllbnRfYmFz ZSArIGdjLT5wcm9jX2Rlc2Nfb2Zmc2V0OworCXNwYWNlID0gQ0lSQ19TUEFDRShnYy0+d3FfdGFp bCwgZGVzYy0+aGVhZCwgZ2MtPndxX3NpemUpOwogCWlmIChXQVJOX09OKHNwYWNlIDwgc2l6ZW9m KHN0cnVjdCBndWNfd3FfaXRlbSkpKQogCQlyZXR1cm4gLUVOT1NQQzsgLyogc2hvdWxkbid0IGhh cHBlbiAqLwogCiAJLyogcG9zdGluY3JlbWVudCBXUSB0YWlsIGZvciBuZXh0IHRpbWUgKi8KLQl3 cV9vZmYgPSBnYy0+d3FfdGFpbDsKKwl3cWlfb2ZmID0gZ2MtPndxX3RhaWw7CiAJZ2MtPndxX3Rh aWwgKz0gc2l6ZW9mKHN0cnVjdCBndWNfd3FfaXRlbSk7CiAJZ2MtPndxX3RhaWwgJj0gZ2MtPndx X3NpemUgLSAxOwogCkBAIC01MzAsMTMgKzUxMCwxMCBAQCBzdGF0aWMgaW50IGd1Y19hZGRfd29y a3F1ZXVlX2l0ZW0oc3RydWN0IGk5MTVfZ3VjX2NsaWVudCAqZ2MsCiAJICogd29ya3F1ZXVlIGJ1 ZmZlciBkdyBieSBkdy4KIAkgKi8KIAlXQVJOX09OKHNpemVvZihzdHJ1Y3QgZ3VjX3dxX2l0ZW0p ICE9IDE2KTsKLQlXQVJOX09OKHdxX29mZiAmIDMpOworCVdBUk5fT04od3FpX29mZiAmIDMpOwog CiAJLyogd3Egc3RhcnRzIGZyb20gdGhlIHBhZ2UgYWZ0ZXIgZG9vcmJlbGwgLyBwcm9jZXNzX2Rl c2MgKi8KLQliYXNlID0ga21hcF9hdG9taWMoaTkxNV9nZW1fb2JqZWN0X2dldF9wYWdlKGdjLT5j bGllbnRfb2JqLAotCQkJKHdxX29mZiArIEdVQ19EQl9TSVpFKSA+PiBQQUdFX1NISUZUKSk7Ci0J d3Ffb2ZmICY9IFBBR0VfU0laRSAtIDE7Ci0Jd3FpID0gKHN0cnVjdCBndWNfd3FfaXRlbSAqKSgo Y2hhciAqKWJhc2UgKyB3cV9vZmYpOworCXdxaSA9IGdjLT5jbGllbnRfYmFzZSArIGdjLT53cV9v ZmZzZXQgKyB3cWlfb2ZmOwogCiAJLyogbGVuIGRvZXMgbm90IGluY2x1ZGUgdGhlIGhlYWRlciAq LwogCXdxX2xlbiA9IHNpemVvZihzdHJ1Y3QgZ3VjX3dxX2l0ZW0pIC8gc2l6ZW9mKHUzMikgLSAx OwpAQCAtNTUzLDggKzUzMCw2IEBAIHN0YXRpYyBpbnQgZ3VjX2FkZF93b3JrcXVldWVfaXRlbShz dHJ1Y3QgaTkxNV9ndWNfY2xpZW50ICpnYywKIAl3cWktPnJpbmdfdGFpbCA9IHRhaWwgPDwgV1Ff UklOR19UQUlMX1NISUZUOwogCXdxaS0+ZmVuY2VfaWQgPSAwOyAvKlhYWDogd2hhdCBmZW5jZSB0 byBiZSBoZXJlICovCiAKLQlrdW5tYXBfYXRvbWljKGJhc2UpOwotCiAJcmV0dXJuIDA7CiB9CiAK QEAgLTY3NSw2ICs2NTAsOCBAQCBzdGF0aWMgdm9pZCBndWNfY2xpZW50X2ZyZWUoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKIAkgKiBCZSBzdXJlIHRvIGRyb3AgYW55IGxvY2tzCiAJICovCiAKKwl2 dW5tYXAoY2xpZW50LT5jbGllbnRfYmFzZSk7CisKIAlnZW1fcmVsZWFzZV9ndWNfb2JqKGNsaWVu dC0+Y2xpZW50X29iaik7CiAKIAlpZiAoY2xpZW50LT5jdHhfaW5kZXggIT0gR1VDX0lOVkFMSURf Q1RYX0lEKSB7CkBAIC03MjcsNiArNzA0LDggQEAgc3RhdGljIHN0cnVjdCBpOTE1X2d1Y19jbGll bnQgKmd1Y19jbGllbnRfYWxsb2Moc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlpZiAoIW9iaikK IAkJZ290byBlcnI7CiAKKwljbGllbnQtPmNsaWVudF9iYXNlID0gaTkxNV9nZW1fb2JqZWN0X3Zt YXAob2JqLCAwLCBvYmotPnBhZ2VzLT5uZW50cyk7CisKIAljbGllbnQtPmNsaWVudF9vYmogPSBv Ymo7CiAJY2xpZW50LT53cV9vZmZzZXQgPSBHVUNfREJfU0laRTsKIAljbGllbnQtPndxX3NpemUg PSBHVUNfV1FfU0laRTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1 Yy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKaW5kZXggNzMwMDJlOS4uOWYw OGJkNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKQEAgLTM0LDYgKzM0LDggQEAgc3RydWN0 IGk5MTVfZ3VjX2NsaWVudCB7CiAJdWludDMyX3QgcHJpb3JpdHk7CiAJdWludDMyX3QgY3R4X2lu ZGV4OwogCisJdm9pZCAqY2xpZW50X2Jhc2U7CisKIAl1aW50MzJfdCBwcm9jX2Rlc2Nfb2Zmc2V0 OwogCXVpbnQzMl90IGRvb3JiZWxsX29mZnNldDsKIAl1aW50MzJfdCBjb29raWU7CkBAIC00Myw3 ICs0NSw2IEBAIHN0cnVjdCBpOTE1X2d1Y19jbGllbnQgewogCXVpbnQzMl90IHdxX29mZnNldDsK IAl1aW50MzJfdCB3cV9zaXplOwogCXVpbnQzMl90IHdxX3RhaWw7Ci0JdWludDMyX3Qgd3FfaGVh ZDsKIAogCS8qIEd1QyBzdWJtaXNzaW9uIHN0YXRpc3RpY3MgJiBzdGF0dXMgKi8KIAl1aW50NjRf dCBzdWJtaXNzaW9uc1tHVUNfTUFYX0VOR0lORVNfTlVNXTsKLS0gCjIuNS4wCgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK