From: Jackie Li Subject: [PATCH v12 1/6] drm/i915/guc: Rename guc_ggtt_offset to intel_guc_ggtt_offset Date: Thu, 1 Mar 2018 16:16:41 -0800 Message-ID: <1519949806-1138-1-git-send-email-yaodong.li@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 ESMTPS id 26E7D6EDDC for ; Fri, 2 Mar 2018 00:19:00 +0000 (UTC) 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 R3VDIHJlbGF0ZWQgZXhwb3J0ZWQgZnVuY3Rpb25zIHNob3VsZCBzdGFydCB3aXRoICJpbnRlbF9n dWNfIiBwcmVmaXggYW5kCnBhc3MgaW50ZWxfZ3VjIGFzIHRoZSBmaXJzdCBwYXJhbWV0ZXIgc2lu Y2UgaXRzIEd1QyByZWxhdGVkLiBDdXJyZW50Cmd1Y19nZ3R0X29mZnNldCgpIGZhaWxlZCB0byBm b2xsb3cgdGhpcyBjb2RlIGNvbnZlbnRpb24gYW5kIHRoaXMgaXMgYQpwcm9ibGVtIGZvciBmdXR1 cmUgcGF0Y2hlcyB0aGF0IG5lZWRzIHRvIGFjY2VzcyBpbnRlbF9ndWMgZGF0YSB0byB2ZXJpZnkK dGhlIEdHVFQgb2Zmc2V0IGFnYWluc3QgdGhlIEd1QyBXT1BDTSB0b3AuCgpUaGlzIHBhdGNoIHJl bmFtZXMgdGhlIGd1Y19nZ3R0X29mZnNldCB0byBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQgYW5kIHVw ZGF0ZXMKdGhlIHJlbGF0ZWQgY29kZSB0byBwYXNzIGludGVsX2d1YyBwb2ludGVyIHRvIHRoaXMg ZnVuY3Rpb24gY2FsbCwgc28gdGhhdAp3ZSBjYW4gaGF2ZSBhIHVuaWZpZWQgY29kaW5nIHN0eWxl IGZvciBHdUMgY29kZSBhbmQgYWxzbyBlbmFibGUgdGhlIGZ1dHVyZQpwYXRjaGVzIHRvIGdldCBH dUMgcmVsYXRlZCBkYXRhIGZyb20gaW50ZWxfZ3VjIHRvIGRvIHRoZSBvZmZzZXQKdmVyaWZpY2F0 aW9uLiBNZWFud2hpbGUsIHRoaXMgcGF0Y2ggYWxzbyBtb3ZlcyB0aGUgR1VDX0dHVFRfVE9QIGZy b20KaW50ZWxfZ3VjX3JlZ3MuaCB0byBpbnRlbF9ndWMuaCBzaW5jZSBpdCBpcyBub3QgR3VDIHJl Z2lzdGVyIHJlbGF0ZWQKZGVmaW5pdGlvbi4KCnY4OgogLSBGaXhlZCBjb2Rpbmcgc3R5bGUgaXNz dWVzIGFuZCBtb3ZlZCBHVUNfR0dUVF9UT1AgdG8gaW50ZWxfZ3VjLmggKFNhZ2FyKQogLSBVcGRh dGVkIGNvbW1pdCBtZXNzYWdlIHRvIGV4cGxhaW4gdG8gcmVhc29uIGFuZCBtb3RpdmF0aW9uIHRv IGFkZAogICBpbnRlbF9ndWMgYXMgdGhlIGZpcnN0IHBhcmFtZXRlciBvZiBpbnRlbF9ndWNfZ2d0 dF9vZmZzZXQgKENocmlzKQoKdjk6CiAtIEZpeGVkIGNvZGUgYWxpZ25tZW50IGlzc3VlIGR1ZSB0 byBsaW5lIGJyZWFrIChDaHJpcykKCnYxMDoKIC0gUmVtb3ZlZCB1bm5lY2Vzc2FyeSBjb21tZW50 cywgcmVkdW5kYW50IGNvZGUgYW5kIGF2b2lkZWQgcmV1c2UgdmFyaWFibGUKICAgdG8gYXZvaWQg cG90ZW50aWFsIGlzc3VlcyAoSm9vbmFzKQoKQ2M6IE1pY2hhbCBXYWpkZWN6a28gPG1pY2hhbC53 YWpkZWN6a29AaW50ZWwuY29tPgpDYzogU2FnYXIgQXJ1biBLYW1ibGUgPHNhZ2FyLmEua2FtYmxl QGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpD YzogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgpSZXZp ZXdlZC1ieTogU2FnYXIgQXJ1biBLYW1ibGUgPHNhZ2FyLmEua2FtYmxlQGludGVsLmNvbT4gKHY4 KQpSZXZpZXdlZC1ieTogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50 ZWwuY29tPiAodjkpClNpZ25lZC1vZmYtYnk6IEphY2tpZSBMaSA8eWFvZG9uZy5saUBpbnRlbC5j b20+ClJldmlld2VkLWJ5OiBNaWNoYWwgV2FqZGVjemtvIDxtaWNoYWwud2FqZGVjemtvQGludGVs LmNvbT4gKHYxMSkKLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuYyAgICAgICAg ICAgIHwgMTEgKysrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oICAg ICAgICAgICAgfCAxNCArKysrKysrKysrKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Z3VjX2Fkcy5jICAgICAgICB8ICA4ICsrKystLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ndWNfY3QuYyAgICAgICAgIHwgIDUgKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2d1Y19mdy5jICAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3Vj X2xvZy5jICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfcmVn LmggICAgICAgIHwgIDMgLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfc3VibWlz c2lvbi5jIHwgMTAgKysrKystLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMg ICAgICAgICAgICB8ICA2ICsrKystLQogOSBmaWxlcyBjaGFuZ2VkLCAzNiBpbnNlcnRpb25zKCsp LCAyNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ndWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5jCmluZGV4IGU2NTEyY2Mu LmE3ODhlMTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5jCkBAIC0yNjksOCArMjY5LDkgQEAg dm9pZCBpbnRlbF9ndWNfaW5pdF9wYXJhbXMoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCiAJLyog SWYgR3VDIHN1Ym1pc3Npb24gaXMgZW5hYmxlZCwgc2V0IHVwIGFkZGl0aW9uYWwgcGFyYW1ldGVy cyBoZXJlICovCiAJaWYgKFVTRVNfR1VDX1NVQk1JU1NJT04oZGV2X3ByaXYpKSB7Ci0JCXUzMiBh ZHMgPSBndWNfZ2d0dF9vZmZzZXQoZ3VjLT5hZHNfdm1hKSA+PiBQQUdFX1NISUZUOwotCQl1MzIg cGdzID0gZ3VjX2dndHRfb2Zmc2V0KGRldl9wcml2LT5ndWMuc3RhZ2VfZGVzY19wb29sKTsKKwkJ dTMyIGFkcyA9IGludGVsX2d1Y19nZ3R0X29mZnNldChndWMsCisJCQkJCQlndWMtPmFkc192bWEp ID4+IFBBR0VfU0hJRlQ7CisJCXUzMiBwZ3MgPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCBn dWMtPnN0YWdlX2Rlc2NfcG9vbCk7CiAJCXUzMiBjdHhfaW5fMTYgPSBHVUNfTUFYX1NUQUdFX0RF U0NSSVBUT1JTIC8gMTY7CiAKIAkJcGFyYW1zW0dVQ19DVExfREVCVUddIHw9IGFkcyA8PCBHVUNf QURTX0FERFJfU0hJRlQ7CkBAIC00MTgsNyArNDE5LDcgQEAgaW50IGludGVsX2d1Y19zdXNwZW5k KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAlkYXRhWzBdID0gSU5URUxfR1VD X0FDVElPTl9FTlRFUl9TX1NUQVRFOwogCS8qIGFueSB2YWx1ZSBncmVhdGVyIHRoYW4gR1VDX1BP V0VSX0QwICovCiAJZGF0YVsxXSA9IEdVQ19QT1dFUl9EMTsKLQlkYXRhWzJdID0gZ3VjX2dndHRf b2Zmc2V0KGd1Yy0+c2hhcmVkX2RhdGEpOworCWRhdGFbMl0gPSBpbnRlbF9ndWNfZ2d0dF9vZmZz ZXQoZ3VjLCBndWMtPnNoYXJlZF9kYXRhKTsKIAogCXJldHVybiBpbnRlbF9ndWNfc2VuZChndWMs IGRhdGEsIEFSUkFZX1NJWkUoZGF0YSkpOwogfQpAQCAtNDQxLDcgKzQ0Miw3IEBAIGludCBpbnRl bF9ndWNfcmVzZXRfZW5naW5lKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKIAlkYXRhWzNdID0gMDsK IAlkYXRhWzRdID0gMDsKIAlkYXRhWzVdID0gZ3VjLT5leGVjYnVmX2NsaWVudC0+c3RhZ2VfaWQ7 Ci0JZGF0YVs2XSA9IGd1Y19nZ3R0X29mZnNldChndWMtPnNoYXJlZF9kYXRhKTsKKwlkYXRhWzZd ID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1YywgZ3VjLT5zaGFyZWRfZGF0YSk7CiAKIAlyZXR1 cm4gaW50ZWxfZ3VjX3NlbmQoZ3VjLCBkYXRhLCBBUlJBWV9TSVpFKGRhdGEpKTsKIH0KQEAgLTQ2 Myw3ICs0NjQsNyBAQCBpbnQgaW50ZWxfZ3VjX3Jlc3VtZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpCiAKIAlkYXRhWzBdID0gSU5URUxfR1VDX0FDVElPTl9FWElUX1NfU1RBVEU7 CiAJZGF0YVsxXSA9IEdVQ19QT1dFUl9EMDsKLQlkYXRhWzJdID0gZ3VjX2dndHRfb2Zmc2V0KGd1 Yy0+c2hhcmVkX2RhdGEpOworCWRhdGFbMl0gPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCBn dWMtPnNoYXJlZF9kYXRhKTsKIAogCXJldHVybiBpbnRlbF9ndWNfc2VuZChndWMsIGRhdGEsIEFS UkFZX1NJWkUoZGF0YSkpOwogfQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZ3VjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaAppbmRleCA1Mjg1NmE5 Li4wYzhiMTBhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaApAQCAtMTAwLDEzICsxMDAsMjMg QEAgc3RhdGljIGlubGluZSB2b2lkIGludGVsX2d1Y19ub3RpZnkoc3RydWN0IGludGVsX2d1YyAq Z3VjKQogCWd1Yy0+bm90aWZ5KGd1Yyk7CiB9CiAKLS8qCisvKiBHdUMgYWRkcmVzc2VzIGFib3Zl IEdVQ19HR1RUX1RPUCBhbHNvIGRvbid0IG1hcCB0aHJvdWdoIHRoZSBHVFQgKi8KKyNkZWZpbmUg R1VDX0dHVFRfVE9QCTB4RkVFMDAwMDAKKworLyoqCisgKiBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQo KSAtIEdldCBhbmQgdmFsaWRhdGUgdGhlIEdHVFQgb2Zmc2V0IG9mIEB2bWEKKyAqIEBndWM6IGlu dGVsX2d1YyBzdHJ1Y3R1cmUuCisgKiBAdm1hOiBpOTE1IGdyYXBoaWNzIHZpcnR1YWwgbWVtb3J5 IGFyZWEuCisgKgogICogR3VDIGRvZXMgbm90IGFsbG93IGFueSBnZnggR0dUVCBhZGRyZXNzIHRo YXQgZmFsbHMgaW50byByYW5nZSBbMCwgV09QQ01fVE9QKSwKICAqIHdoaWNoIGlzIHJlc2VydmVk IGZvciBCb290IFJPTSwgU1JBTSBhbmQgV09QQ00uIEN1cnJlbnRseSB0aGlzIHRvcCBhZGRyZXNz IGlzCiAgKiA1MTJLLiBJbiBvcmRlciB0byBleGNsdWRlIDAtNTEySyBhZGRyZXNzIHNwYWNlIGZy b20gR0dUVCwgYWxsIGdmeCBvYmplY3RzCiAgKiB1c2VkIGJ5IEd1QyBpcyBwaW5uZWQgd2l0aCBQ SU5fT0ZGU0VUX0JJQVMgYWxvbmcgd2l0aCBzaXplIG9mIFdPUENNLgorICoKKyAqIFJldHVybjog R0dUVCBvZmZzZXQgdGhhdCBtZWV0cyB0aGUgR3VDIGdmeCBhZGRyZXNzIHJlcXVpcmVtZW50Lgog ICovCi1zdGF0aWMgaW5saW5lIHUzMiBndWNfZ2d0dF9vZmZzZXQoc3RydWN0IGk5MTVfdm1hICp2 bWEpCitzdGF0aWMgaW5saW5lIHUzMiBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoc3RydWN0IGludGVs X2d1YyAqZ3VjLAorCQkJCQlzdHJ1Y3QgaTkxNV92bWEgKnZtYSkKIHsKIAl1MzIgb2Zmc2V0ID0g aTkxNV9nZ3R0X29mZnNldCh2bWEpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9ndWNfYWRzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfYWRzLmMK aW5kZXggYWM2Mjc1My4uMzM0Y2I1MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZ3VjX2Fkcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19hZHMu YwpAQCAtNzUsNyArNzUsNyBAQCBzdGF0aWMgdm9pZCBndWNfcG9saWNpZXNfaW5pdChzdHJ1Y3Qg Z3VjX3BvbGljaWVzICpwb2xpY2llcykKIGludCBpbnRlbF9ndWNfYWRzX2NyZWF0ZShzdHJ1Y3Qg aW50ZWxfZ3VjICpndWMpCiB7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g Z3VjX3RvX2k5MTUoZ3VjKTsKLQlzdHJ1Y3QgaTkxNV92bWEgKnZtYTsKKwlzdHJ1Y3QgaTkxNV92 bWEgKnZtYSwgKmtlcm5lbF9jdHhfdm1hOwogCXN0cnVjdCBwYWdlICpwYWdlOwogCS8qIFRoZSBh ZHMgb2JqIGluY2x1ZGVzIHRoZSBzdHJ1Y3QgaXRzZWxmIGFuZCBidWZmZXJzIHBhc3NlZCB0byBH dUMgKi8KIAlzdHJ1Y3QgewpAQCAtMTIxLDkgKzEyMSw5IEBAIGludCBpbnRlbF9ndWNfYWRzX2Ny ZWF0ZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJICogdG8gZmluZCBpdC4gTm90ZSB0aGF0IHdl IGhhdmUgdG8gc2tpcCBvdXIgaGVhZGVyICgxIHBhZ2UpLAogCSAqIGJlY2F1c2Ugb3VyIEd1QyBz aGFyZWQgZGF0YSBpcyB0aGVyZS4KIAkgKi8KKwlrZXJuZWxfY3R4X3ZtYSA9IGRldl9wcml2LT5r ZXJuZWxfY29udGV4dC0+ZW5naW5lW1JDU10uc3RhdGU7CiAJYmxvYi0+YWRzLmdvbGRlbl9jb250 ZXh0X2xyY2EgPQotCQlndWNfZ2d0dF9vZmZzZXQoZGV2X3ByaXYtPmtlcm5lbF9jb250ZXh0LT5l bmdpbmVbUkNTXS5zdGF0ZSkgKwotCQlza2lwcGVkX29mZnNldDsKKwkJaW50ZWxfZ3VjX2dndHRf b2Zmc2V0KGd1Yywga2VybmVsX2N0eF92bWEpICsgc2tpcHBlZF9vZmZzZXQ7CiAKIAkvKgogCSAq IFRoZSBHdUMgZXhwZWN0cyB1cyB0byBleGNsdWRlIHRoZSBwb3J0aW9uIG9mIHRoZSBjb250ZXh0 IGltYWdlIHRoYXQKQEAgLTEzNSw3ICsxMzUsNyBAQCBpbnQgaW50ZWxfZ3VjX2Fkc19jcmVhdGUo c3RydWN0IGludGVsX2d1YyAqZ3VjKQogCQlibG9iLT5hZHMuZW5nX3N0YXRlX3NpemVbZW5naW5l LT5ndWNfaWRdID0KIAkJCWVuZ2luZS0+Y29udGV4dF9zaXplIC0gc2tpcHBlZF9zaXplOwogCi0J YmFzZSA9IGd1Y19nZ3R0X29mZnNldCh2bWEpOworCWJhc2UgPSBpbnRlbF9ndWNfZ2d0dF9vZmZz ZXQoZ3VjLCB2bWEpOwogCWJsb2ItPmFkcy5zY2hlZHVsZXJfcG9saWNpZXMgPSBiYXNlICsgcHRy X29mZnNldChibG9iLCBwb2xpY2llcyk7CiAJYmxvYi0+YWRzLnJlZ19zdGF0ZV9idWZmZXIgPSBi YXNlICsgcHRyX29mZnNldChibG9iLCByZWdfc3RhdGVfYnVmZmVyKTsKIAlibG9iLT5hZHMucmVn X3N0YXRlX2FkZHIgPSBiYXNlICsgcHRyX29mZnNldChibG9iLCByZWdfc3RhdGUpOwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2N0LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9ndWNfY3QuYwppbmRleCAyNGFkNTU3Li4wYTBkM2Q1IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfY3QuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9ndWNfY3QuYwpAQCAtMTU2LDcgKzE1Niw4IEBAIHN0YXRpYyBpbnQgY3Rj aF9pbml0KHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKIAkJZXJyID0gUFRSX0VSUihibG9iKTsKIAkJ Z290byBlcnJfdm1hOwogCX0KLQlEUk1fREVCVUdfRFJJVkVSKCJDVDogdm1hIGJhc2U9JSN4XG4i LCBndWNfZ2d0dF9vZmZzZXQoY3RjaC0+dm1hKSk7CisJRFJNX0RFQlVHX0RSSVZFUigiQ1Q6IHZt YSBiYXNlPSUjeFxuIiwKKwkJCSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCBjdGNoLT52bWEp KTsKIAogCS8qIHN0b3JlIHBvaW50ZXJzIHRvIGRlc2MgYW5kIGNtZHMgKi8KIAlmb3IgKGkgPSAw OyBpIDwgQVJSQVlfU0laRShjdGNoLT5jdGJzKTsgaSsrKSB7CkBAIC0yMDIsNyArMjAzLDcgQEAg c3RhdGljIGludCBjdGNoX29wZW4oc3RydWN0IGludGVsX2d1YyAqZ3VjLAogCX0KIAogCS8qIHZt YSBzaG91bGQgYmUgYWxyZWFkeSBhbGxvY2F0ZWQgYW5kIG1hcCdlZCAqLwotCWJhc2UgPSBndWNf Z2d0dF9vZmZzZXQoY3RjaC0+dm1hKTsKKwliYXNlID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1 YywgY3RjaC0+dm1hKTsKIAogCS8qIChyZSlpbml0aWFsaXplIGRlc2NyaXB0b3JzCiAJICogY21k cyBidWZmZXJzIGFyZSBpbiB0aGUgc2Vjb25kIGhhbGYgb2YgdGhlIGJsb2IgcGFnZQpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9ndWNfZncuYwppbmRleCAzYjA5MzI5Li4xNzhkMzM5IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZncuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9ndWNfZncuYwpAQCAtMTY1LDcgKzE2NSw3IEBAIHN0YXRpYyBpbnQgZ3Vj X3hmZXJfdWNvZGUoc3RydWN0IGludGVsX2d1YyAqZ3VjLCBzdHJ1Y3QgaTkxNV92bWEgKnZtYSkK IAlJOTE1X1dSSVRFKERNQV9DT1BZX1NJWkUsIGd1Y19mdy0+aGVhZGVyX3NpemUgKyBndWNfZnct PnVjb2RlX3NpemUpOwogCiAJLyogU2V0IHRoZSBzb3VyY2UgYWRkcmVzcyBmb3IgdGhlIG5ldyBi bG9iICovCi0Jb2Zmc2V0ID0gZ3VjX2dndHRfb2Zmc2V0KHZtYSkgKyBndWNfZnctPmhlYWRlcl9v ZmZzZXQ7CisJb2Zmc2V0ID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1Yywgdm1hKSArIGd1Y19m dy0+aGVhZGVyX29mZnNldDsKIAlJOTE1X1dSSVRFKERNQV9BRERSXzBfTE9XLCBsb3dlcl8zMl9i aXRzKG9mZnNldCkpOwogCUk5MTVfV1JJVEUoRE1BX0FERFJfMF9ISUdILCB1cHBlcl8zMl9iaXRz KG9mZnNldCkgJiAweEZGRkYpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9ndWNfbG9nLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9nLmMKaW5k ZXggN2I1MDc0ZS4uMzM2MzZkZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZ3VjX2xvZy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2cuYwpA QCAtNjM4LDcgKzYzOCw3IEBAIGludCBpbnRlbF9ndWNfbG9nX2NyZWF0ZShzdHJ1Y3QgaW50ZWxf Z3VjICpndWMpCiAJCShHVUNfTE9HX0lTUl9QQUdFUyA8PCBHVUNfTE9HX0lTUl9TSElGVCkgfAog CQkoR1VDX0xPR19DUkFTSF9QQUdFUyA8PCBHVUNfTE9HX0NSQVNIX1NISUZUKTsKIAotCW9mZnNl dCA9IGd1Y19nZ3R0X29mZnNldCh2bWEpID4+IFBBR0VfU0hJRlQ7IC8qIGluIHBhZ2VzICovCisJ b2Zmc2V0ID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1Yywgdm1hKSA+PiBQQUdFX1NISUZUOwog CWd1Yy0+bG9nLmZsYWdzID0gKG9mZnNldCA8PCBHVUNfTE9HX0JVRl9BRERSX1NISUZUKSB8IGZs YWdzOwogCiAJcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ndWNfcmVnLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfcmVnLmgKaW5kZXgg MTlhOTI0Ny4uNzExZTllOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Z3VjX3JlZy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19yZWcuaApAQCAt ODAsOSArODAsNiBAQAogI2RlZmluZSAgIEdVQ19XT1BDTV9UT1AJCQkgICgweDgwIDw8IDEyKQkv KiA1MTJLQiAqLwogI2RlZmluZSAgIEJYVF9HVUNfV09QQ01fUkM2X1JFU0VSVkVECSAgKDB4MTAg PDwgMTIpCS8qIDY0S0IgICovCiAKLS8qIEd1QyBhZGRyZXNzZXMgYWJvdmUgR1VDX0dHVFRfVE9Q IGFsc28gZG9uJ3QgbWFwIHRocm91Z2ggdGhlIEdUVCAqLwotI2RlZmluZSBHVUNfR0dUVF9UT1AJ CQkweEZFRTAwMDAwCi0KICNkZWZpbmUgR0VOOF9HVF9QTV9DT05GSUcJCV9NTUlPKDB4MTM4MTQw KQogI2RlZmluZSBHRU45TFBfR1RfUE1fQ09ORklHCQlfTU1JTygweDEzODE0MCkKICNkZWZpbmUg R0VOOV9HVF9QTV9DT05GSUcJCV9NTUlPKDB4MTM4MTZjKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjX3N1Ym1pc3Npb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Y19zdWJtaXNzaW9uLmMKaW5kZXggOGE4YWQyZi4uMzNhZjI5MyAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX3N1Ym1pc3Npb24uYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfc3VibWlzc2lvbi5jCkBAIC0zODYsOCArMzg2LDgg QEAgc3RhdGljIHZvaWQgZ3VjX3N0YWdlX2Rlc2NfaW5pdChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMs CiAJCWxyYy0+Y29udGV4dF9kZXNjID0gbG93ZXJfMzJfYml0cyhjZS0+bHJjX2Rlc2MpOwogCiAJ CS8qIFRoZSBzdGF0ZSBwYWdlIGlzIGFmdGVyIFBQSFdTUCAqLwotCQlscmMtPnJpbmdfbHJjYSA9 Ci0JCQlndWNfZ2d0dF9vZmZzZXQoY2UtPnN0YXRlKSArIExSQ19TVEFURV9QTiAqIFBBR0VfU0la RTsKKwkJbHJjLT5yaW5nX2xyY2EgPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCBjZS0+c3Rh dGUpICsKKwkJCQkgTFJDX1NUQVRFX1BOICogUEFHRV9TSVpFOwogCiAJCS8qIFhYWDogSW4gZGly ZWN0IHN1Ym1pc3Npb24sIHRoZSBHdUMgd2FudHMgdGhlIEhXIGNvbnRleHQgaWQKIAkJICogaGVy ZS4gSW4gcHJveHkgc3VibWlzc2lvbiwgaXQgd2FudHMgdGhlIHN0YWdlIGlkCkBAIC0zOTUsNyAr Mzk1LDcgQEAgc3RhdGljIHZvaWQgZ3VjX3N0YWdlX2Rlc2NfaW5pdChzdHJ1Y3QgaW50ZWxfZ3Vj ICpndWMsCiAJCWxyYy0+Y29udGV4dF9pZCA9IChjbGllbnQtPnN0YWdlX2lkIDw8IEdVQ19FTENf Q1RYSURfT0ZGU0VUKSB8CiAJCQkJKGd1Y19lbmdpbmVfaWQgPDwgR1VDX0VMQ19FTkdJTkVfT0ZG U0VUKTsKIAotCQlscmMtPnJpbmdfYmVnaW4gPSBndWNfZ2d0dF9vZmZzZXQoY2UtPnJpbmctPnZt YSk7CisJCWxyYy0+cmluZ19iZWdpbiA9IGludGVsX2d1Y19nZ3R0X29mZnNldChndWMsIGNlLT5y aW5nLT52bWEpOwogCQlscmMtPnJpbmdfZW5kID0gbHJjLT5yaW5nX2JlZ2luICsgY2UtPnJpbmct PnNpemUgLSAxOwogCQlscmMtPnJpbmdfbmV4dF9mcmVlX2xvY2F0aW9uID0gbHJjLT5yaW5nX2Jl Z2luOwogCQlscmMtPnJpbmdfY3VycmVudF90YWlsX3BvaW50ZXJfdmFsdWUgPSAwOwpAQCAtNDEx LDcgKzQxMSw3IEBAIHN0YXRpYyB2b2lkIGd1Y19zdGFnZV9kZXNjX2luaXQoc3RydWN0IGludGVs X2d1YyAqZ3VjLAogCSAqIFRoZSBkb29yYmVsbCwgcHJvY2VzcyBkZXNjcmlwdG9yLCBhbmQgd29y a3F1ZXVlIGFyZSBhbGwgcGFydHMKIAkgKiBvZiB0aGUgY2xpZW50IG9iamVjdCwgd2hpY2ggdGhl IEd1QyB3aWxsIHJlZmVyZW5jZSB2aWEgdGhlIEdHVFQKIAkgKi8KLQlnZnhfYWRkciA9IGd1Y19n Z3R0X29mZnNldChjbGllbnQtPnZtYSk7CisJZ2Z4X2FkZHIgPSBpbnRlbF9ndWNfZ2d0dF9vZmZz ZXQoZ3VjLCBjbGllbnQtPnZtYSk7CiAJZGVzYy0+ZGJfdHJpZ2dlcl9waHkgPSBzZ19kbWFfYWRk cmVzcyhjbGllbnQtPnZtYS0+cGFnZXMtPnNnbCkgKwogCQkJCWNsaWVudC0+ZG9vcmJlbGxfb2Zm c2V0OwogCWRlc2MtPmRiX3RyaWdnZXJfY3B1ID0gcHRyX3RvX3U2NChfX2dldF9kb29yYmVsbChj bGllbnQpKTsKQEAgLTU4NCw3ICs1ODQsNyBAQCBzdGF0aWMgdm9pZCBpbmplY3RfcHJlZW1wdF9j b250ZXh0KHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIAlkYXRhWzNdID0gZW5naW5lLT5ndWNf aWQ7CiAJZGF0YVs0XSA9IGd1Yy0+ZXhlY2J1Zl9jbGllbnQtPnByaW9yaXR5OwogCWRhdGFbNV0g PSBndWMtPmV4ZWNidWZfY2xpZW50LT5zdGFnZV9pZDsKLQlkYXRhWzZdID0gZ3VjX2dndHRfb2Zm c2V0KGd1Yy0+c2hhcmVkX2RhdGEpOworCWRhdGFbNl0gPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQo Z3VjLCBndWMtPnNoYXJlZF9kYXRhKTsKIAogCWlmIChXQVJOX09OKGludGVsX2d1Y19zZW5kKGd1 YywgZGF0YSwgQVJSQVlfU0laRShkYXRhKSkpKSB7CiAJCWV4ZWNsaXN0c19jbGVhcl9hY3RpdmUo JmVuZ2luZS0+ZXhlY2xpc3RzLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfaHVjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuYwppbmRleCBlZjlhMDVk Li43MGE1MjgyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuYwpAQCAtMTM4LDcgKzEzOCw4IEBA IHN0YXRpYyBpbnQgaHVjX3Vjb2RlX3hmZXIoc3RydWN0IGludGVsX3VjX2Z3ICpodWNfZncsIHN0 cnVjdCBpOTE1X3ZtYSAqdm1hKQogCWludGVsX3VuY29yZV9mb3JjZXdha2VfZ2V0KGRldl9wcml2 LCBGT1JDRVdBS0VfQUxMKTsKIAogCS8qIFNldCB0aGUgc291cmNlIGFkZHJlc3MgZm9yIHRoZSB1 Q29kZSAqLwotCW9mZnNldCA9IGd1Y19nZ3R0X29mZnNldCh2bWEpICsgaHVjX2Z3LT5oZWFkZXJf b2Zmc2V0OworCW9mZnNldCA9IGludGVsX2d1Y19nZ3R0X29mZnNldCgmZGV2X3ByaXYtPmd1Yywg dm1hKSArCisJCSBodWNfZnctPmhlYWRlcl9vZmZzZXQ7CiAJSTkxNV9XUklURShETUFfQUREUl8w X0xPVywgbG93ZXJfMzJfYml0cyhvZmZzZXQpKTsKIAlJOTE1X1dSSVRFKERNQV9BRERSXzBfSElH SCwgdXBwZXJfMzJfYml0cyhvZmZzZXQpICYgMHhGRkZGKTsKIApAQCAtMjE0LDcgKzIxNSw4IEBA IGludCBpbnRlbF9odWNfYXV0aChzdHJ1Y3QgaW50ZWxfaHVjICpodWMpCiAJfQogCiAJcmV0ID0g aW50ZWxfZ3VjX2F1dGhfaHVjKGd1YywKLQkJCQkgZ3VjX2dndHRfb2Zmc2V0KHZtYSkgKyBodWMt PmZ3LnJzYV9vZmZzZXQpOworCQkJCSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCB2bWEpICsK KwkJCQkgaHVjLT5mdy5yc2Ffb2Zmc2V0KTsKIAlpZiAocmV0KSB7CiAJCURSTV9FUlJPUigiSHVD OiBHdUMgZGlkIG5vdCBhY2sgQXV0aCByZXF1ZXN0ICVkXG4iLCByZXQpOwogCQlnb3RvIG91dDsK LS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK