From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/atomic: Use DRM_DEBUG_KMS instead of DRM_DEBUG_ATOMIC in error paths Date: Mon, 16 May 2016 10:47:48 +0300 Message-ID: <8760uefnq3.fsf@intel.com> References: <1463152419-16554-1-git-send-email-ville.syrjala@linux.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 E1F236E38F for ; Mon, 16 May 2016 07:48:01 +0000 (UTC) In-Reply-To: <1463152419-16554-1-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: ville.syrjala@linux.intel.com, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gRnJpLCAxMyBNYXkgMjAxNiwgdmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5jb20gd3JvdGU6 Cj4gRnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4K Pgo+IERSTV9ERUJVR19BVE9NSUMgZ2VuZXJhdGVzIGEgbG90IG9mIG5vaXNlIHRoYXQgbm8gb25l IG5vcm1hbGx5IGNhcmVzCj4gYWJvdXQuIEhvd2V2ZXIgZXJyb3IgcGF0aHMgZXZlcnlvbmUgY2Fy ZXMgYWJvdXQsIHNvIGhpZGluZyB0aGVhIGVycm9yCj4gZGVidWdzIHVuZGVyIERSTV9ERUJVR19B VE9NSUMgaXMgYSBiYWQgaWRlYS4gTGV0J3MgdXNlIERSTV9ERUJVR19LTVMKPiBmb3IgdGhvc2Ug aW5zdGVhZC4KPgo+IFNpZ25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFs YUBsaW51eC5pbnRlbC5jb20+CgpBZ3JlZWQuCgpSZXZpZXdlZC1ieTogSmFuaSBOaWt1bGEgPGph bmkubmlrdWxhQGludGVsLmNvbT4KCj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWlj LmMgICAgICAgIHwgNjAgKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLQo+ICBk cml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYyB8IDYwICsrKysrKysrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0tLS0tLS0KPiAgMiBmaWxlcyBjaGFuZ2VkLCA2MCBpbnNlcnRpb25zKCsp LCA2MCBkZWxldGlvbnMoLSkKPgo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0 b21pYy5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYwo+IGluZGV4IDg2ZTg5ZGIwMmVk Ny4uMTQ3OWJmZDg3NDRiIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWlj LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jCj4gQEAgLTU1NCw4ICs1NTQs OCBAQCBzdGF0aWMgaW50IGRybV9hdG9taWNfY3J0Y19jaGVjayhzdHJ1Y3QgZHJtX2NydGMgKmNy dGMsCj4gIAkgKi8KPiAgCj4gIAlpZiAoc3RhdGUtPmFjdGl2ZSAmJiAhc3RhdGUtPmVuYWJsZSkg ewo+IC0JCURSTV9ERUJVR19BVE9NSUMoIltDUlRDOiVkOiVzXSBhY3RpdmUgd2l0aG91dCBlbmFi bGVkXG4iLAo+IC0JCQkJIGNydGMtPmJhc2UuaWQsIGNydGMtPm5hbWUpOwo+ICsJCURSTV9ERUJV R19LTVMoIltDUlRDOiVkOiVzXSBhY3RpdmUgd2l0aG91dCBlbmFibGVkXG4iLAo+ICsJCQkgICAg ICBjcnRjLT5iYXNlLmlkLCBjcnRjLT5uYW1lKTsKPiAgCQlyZXR1cm4gLUVJTlZBTDsKPiAgCX0K PiAgCj4gQEAgLTU2NCwxNSArNTY0LDE1IEBAIHN0YXRpYyBpbnQgZHJtX2F0b21pY19jcnRjX2No ZWNrKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKPiAgCSAqIGJlIGFibGUgdG8gdHJpZ2dlci4gKi8K PiAgCWlmIChkcm1fY29yZV9jaGVja19mZWF0dXJlKGNydGMtPmRldiwgRFJJVkVSX0FUT01JQykg JiYKPiAgCSAgICBXQVJOX09OKHN0YXRlLT5lbmFibGUgJiYgIXN0YXRlLT5tb2RlX2Jsb2IpKSB7 Cj4gLQkJRFJNX0RFQlVHX0FUT01JQygiW0NSVEM6JWQ6JXNdIGVuYWJsZWQgd2l0aG91dCBtb2Rl IGJsb2JcbiIsCj4gLQkJCQkgY3J0Yy0+YmFzZS5pZCwgY3J0Yy0+bmFtZSk7Cj4gKwkJRFJNX0RF QlVHX0tNUygiW0NSVEM6JWQ6JXNdIGVuYWJsZWQgd2l0aG91dCBtb2RlIGJsb2JcbiIsCj4gKwkJ CSAgICAgIGNydGMtPmJhc2UuaWQsIGNydGMtPm5hbWUpOwo+ICAJCXJldHVybiAtRUlOVkFMOwo+ ICAJfQo+ICAKPiAgCWlmIChkcm1fY29yZV9jaGVja19mZWF0dXJlKGNydGMtPmRldiwgRFJJVkVS X0FUT01JQykgJiYKPiAgCSAgICBXQVJOX09OKCFzdGF0ZS0+ZW5hYmxlICYmIHN0YXRlLT5tb2Rl X2Jsb2IpKSB7Cj4gLQkJRFJNX0RFQlVHX0FUT01JQygiW0NSVEM6JWQ6JXNdIGRpc2FibGVkIHdp dGggbW9kZSBibG9iXG4iLAo+IC0JCQkJIGNydGMtPmJhc2UuaWQsIGNydGMtPm5hbWUpOwo+ICsJ CURSTV9ERUJVR19LTVMoIltDUlRDOiVkOiVzXSBkaXNhYmxlZCB3aXRoIG1vZGUgYmxvYlxuIiwK PiArCQkJICAgICAgY3J0Yy0+YmFzZS5pZCwgY3J0Yy0+bmFtZSk7Cj4gIAkJcmV0dXJuIC1FSU5W QUw7Cj4gIAl9Cj4gIAo+IEBAIC01ODcsOCArNTg3LDggQEAgc3RhdGljIGludCBkcm1fYXRvbWlj X2NydGNfY2hlY2soc3RydWN0IGRybV9jcnRjICpjcnRjLAo+ICAJICogcGlwZS4KPiAgCSAqLwo+ ICAJaWYgKHN0YXRlLT5ldmVudCAmJiAhc3RhdGUtPmFjdGl2ZSAmJiAhY3J0Yy0+c3RhdGUtPmFj dGl2ZSkgewo+IC0JCURSTV9ERUJVR19BVE9NSUMoIltDUlRDOiVkXSByZXF1ZXN0aW5nIGV2ZW50 IGJ1dCBvZmZcbiIsCj4gLQkJCQkgY3J0Yy0+YmFzZS5pZCk7Cj4gKwkJRFJNX0RFQlVHX0tNUygi W0NSVEM6JWRdIHJlcXVlc3RpbmcgZXZlbnQgYnV0IG9mZlxuIiwKPiArCQkJICAgICAgY3J0Yy0+ YmFzZS5pZCk7Cj4gIAkJcmV0dXJuIC1FSU5WQUw7Cj4gIAl9Cj4gIAo+IEBAIC04MDIsMTAgKzgw MiwxMCBAQCBzdGF0aWMgaW50IGRybV9hdG9taWNfcGxhbmVfY2hlY2soc3RydWN0IGRybV9wbGFu ZSAqcGxhbmUsCj4gIAo+ICAJLyogZWl0aGVyICpib3RoKiBDUlRDIGFuZCBGQiBtdXN0IGJlIHNl dCwgb3IgbmVpdGhlciAqLwo+ICAJaWYgKFdBUk5fT04oc3RhdGUtPmNydGMgJiYgIXN0YXRlLT5m YikpIHsKPiAtCQlEUk1fREVCVUdfQVRPTUlDKCJDUlRDIHNldCBidXQgbm8gRkJcbiIpOwo+ICsJ CURSTV9ERUJVR19LTVMoIkNSVEMgc2V0IGJ1dCBubyBGQlxuIik7Cj4gIAkJcmV0dXJuIC1FSU5W QUw7Cj4gIAl9IGVsc2UgaWYgKFdBUk5fT04oc3RhdGUtPmZiICYmICFzdGF0ZS0+Y3J0YykpIHsK PiAtCQlEUk1fREVCVUdfQVRPTUlDKCJGQiBzZXQgYnV0IG5vIENSVENcbiIpOwo+ICsJCURSTV9E RUJVR19LTVMoIkZCIHNldCBidXQgbm8gQ1JUQ1xuIik7Cj4gIAkJcmV0dXJuIC1FSU5WQUw7Cj4g IAl9Cj4gIAo+IEBAIC04MTUsMTUgKzgxNSwxNSBAQCBzdGF0aWMgaW50IGRybV9hdG9taWNfcGxh bmVfY2hlY2soc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCj4gIAo+ICAJLyogQ2hlY2sgd2hldGhl ciB0aGlzIHBsYW5lIGlzIHVzYWJsZSBvbiB0aGlzIENSVEMgKi8KPiAgCWlmICghKHBsYW5lLT5w b3NzaWJsZV9jcnRjcyAmIGRybV9jcnRjX21hc2soc3RhdGUtPmNydGMpKSkgewo+IC0JCURSTV9E RUJVR19BVE9NSUMoIkludmFsaWQgY3J0YyBmb3IgcGxhbmVcbiIpOwo+ICsJCURSTV9ERUJVR19L TVMoIkludmFsaWQgY3J0YyBmb3IgcGxhbmVcbiIpOwo+ICAJCXJldHVybiAtRUlOVkFMOwo+ICAJ fQo+ICAKPiAgCS8qIENoZWNrIHdoZXRoZXIgdGhpcyBwbGFuZSBzdXBwb3J0cyB0aGUgZmIgcGl4 ZWwgZm9ybWF0LiAqLwo+ICAJcmV0ID0gZHJtX3BsYW5lX2NoZWNrX3BpeGVsX2Zvcm1hdChwbGFu ZSwgc3RhdGUtPmZiLT5waXhlbF9mb3JtYXQpOwo+ICAJaWYgKHJldCkgewo+IC0JCURSTV9ERUJV R19BVE9NSUMoIkludmFsaWQgcGl4ZWwgZm9ybWF0ICVzXG4iLAo+IC0JCQkJIGRybV9nZXRfZm9y bWF0X25hbWUoc3RhdGUtPmZiLT5waXhlbF9mb3JtYXQpKTsKPiArCQlEUk1fREVCVUdfS01TKCJJ bnZhbGlkIHBpeGVsIGZvcm1hdCAlc1xuIiwKPiArCQkJICAgICAgZHJtX2dldF9mb3JtYXRfbmFt ZShzdGF0ZS0+ZmItPnBpeGVsX2Zvcm1hdCkpOwo+ICAJCXJldHVybiByZXQ7Cj4gIAl9Cj4gIAo+ IEBAIC04MzIsOSArODMyLDkgQEAgc3RhdGljIGludCBkcm1fYXRvbWljX3BsYW5lX2NoZWNrKHN0 cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAo+ICAJICAgIHN0YXRlLT5jcnRjX3ggPiBJTlRfTUFYIC0g KGludDMyX3QpIHN0YXRlLT5jcnRjX3cgfHwKPiAgCSAgICBzdGF0ZS0+Y3J0Y19oID4gSU5UX01B WCB8fAo+ICAJICAgIHN0YXRlLT5jcnRjX3kgPiBJTlRfTUFYIC0gKGludDMyX3QpIHN0YXRlLT5j cnRjX2gpIHsKPiAtCQlEUk1fREVCVUdfQVRPTUlDKCJJbnZhbGlkIENSVEMgY29vcmRpbmF0ZXMg JXV4JXUrJWQrJWRcbiIsCj4gLQkJCQkgc3RhdGUtPmNydGNfdywgc3RhdGUtPmNydGNfaCwKPiAt CQkJCSBzdGF0ZS0+Y3J0Y194LCBzdGF0ZS0+Y3J0Y195KTsKPiArCQlEUk1fREVCVUdfS01TKCJJ bnZhbGlkIENSVEMgY29vcmRpbmF0ZXMgJXV4JXUrJWQrJWRcbiIsCj4gKwkJCSAgICAgIHN0YXRl LT5jcnRjX3csIHN0YXRlLT5jcnRjX2gsCj4gKwkJCSAgICAgIHN0YXRlLT5jcnRjX3gsIHN0YXRl LT5jcnRjX3kpOwo+ICAJCXJldHVybiAtRVJBTkdFOwo+ICAJfQo+ICAKPiBAQCAtODQ2LDE4ICs4 NDYsMTggQEAgc3RhdGljIGludCBkcm1fYXRvbWljX3BsYW5lX2NoZWNrKHN0cnVjdCBkcm1fcGxh bmUgKnBsYW5lLAo+ICAJICAgIHN0YXRlLT5zcmNfeCA+IGZiX3dpZHRoIC0gc3RhdGUtPnNyY193 IHx8Cj4gIAkgICAgc3RhdGUtPnNyY19oID4gZmJfaGVpZ2h0IHx8Cj4gIAkgICAgc3RhdGUtPnNy Y195ID4gZmJfaGVpZ2h0IC0gc3RhdGUtPnNyY19oKSB7Cj4gLQkJRFJNX0RFQlVHX0FUT01JQygi SW52YWxpZCBzb3VyY2UgY29vcmRpbmF0ZXMgIgo+IC0JCQkJICIldS4lMDZ1eCV1LiUwNnUrJXUu JTA2dSsldS4lMDZ1XG4iLAo+IC0JCQkJIHN0YXRlLT5zcmNfdyA+PiAxNiwgKChzdGF0ZS0+c3Jj X3cgJiAweGZmZmYpICogMTU2MjUpID4+IDEwLAo+IC0JCQkJIHN0YXRlLT5zcmNfaCA+PiAxNiwg KChzdGF0ZS0+c3JjX2ggJiAweGZmZmYpICogMTU2MjUpID4+IDEwLAo+IC0JCQkJIHN0YXRlLT5z cmNfeCA+PiAxNiwgKChzdGF0ZS0+c3JjX3ggJiAweGZmZmYpICogMTU2MjUpID4+IDEwLAo+IC0J CQkJIHN0YXRlLT5zcmNfeSA+PiAxNiwgKChzdGF0ZS0+c3JjX3kgJiAweGZmZmYpICogMTU2MjUp ID4+IDEwKTsKPiArCQlEUk1fREVCVUdfS01TKCJJbnZhbGlkIHNvdXJjZSBjb29yZGluYXRlcyAi Cj4gKwkJCSAgICAgICIldS4lMDZ1eCV1LiUwNnUrJXUuJTA2dSsldS4lMDZ1XG4iLAo+ICsJCQkg ICAgICBzdGF0ZS0+c3JjX3cgPj4gMTYsICgoc3RhdGUtPnNyY193ICYgMHhmZmZmKSAqIDE1NjI1 KSA+PiAxMCwKPiArCQkJICAgICAgc3RhdGUtPnNyY19oID4+IDE2LCAoKHN0YXRlLT5zcmNfaCAm IDB4ZmZmZikgKiAxNTYyNSkgPj4gMTAsCj4gKwkJCSAgICAgIHN0YXRlLT5zcmNfeCA+PiAxNiwg KChzdGF0ZS0+c3JjX3ggJiAweGZmZmYpICogMTU2MjUpID4+IDEwLAo+ICsJCQkgICAgICBzdGF0 ZS0+c3JjX3kgPj4gMTYsICgoc3RhdGUtPnNyY195ICYgMHhmZmZmKSAqIDE1NjI1KSA+PiAxMCk7 Cj4gIAkJcmV0dXJuIC1FTk9TUEM7Cj4gIAl9Cj4gIAo+ICAJaWYgKHBsYW5lX3N3aXRjaGluZ19j cnRjKHN0YXRlLT5zdGF0ZSwgcGxhbmUsIHN0YXRlKSkgewo+IC0JCURSTV9ERUJVR19BVE9NSUMo IltQTEFORTolZDolc10gc3dpdGNoaW5nIENSVEMgZGlyZWN0bHlcbiIsCj4gLQkJCQkgcGxhbmUt PmJhc2UuaWQsIHBsYW5lLT5uYW1lKTsKPiArCQlEUk1fREVCVUdfS01TKCJbUExBTkU6JWQ6JXNd IHN3aXRjaGluZyBDUlRDIGRpcmVjdGx5XG4iLAo+ICsJCQkgICAgICBwbGFuZS0+YmFzZS5pZCwg cGxhbmUtPm5hbWUpOwo+ICAJCXJldHVybiAtRUlOVkFMOwo+ICAJfQo+ICAKPiBAQCAtMTMzMCw4 ICsxMzMwLDggQEAgaW50IGRybV9hdG9taWNfY2hlY2tfb25seShzdHJ1Y3QgZHJtX2F0b21pY19z dGF0ZSAqc3RhdGUpCj4gIAlmb3JfZWFjaF9wbGFuZV9pbl9zdGF0ZShzdGF0ZSwgcGxhbmUsIHBs YW5lX3N0YXRlLCBpKSB7Cj4gIAkJcmV0ID0gZHJtX2F0b21pY19wbGFuZV9jaGVjayhwbGFuZSwg cGxhbmVfc3RhdGUpOwo+ICAJCWlmIChyZXQpIHsKPiAtCQkJRFJNX0RFQlVHX0FUT01JQygiW1BM QU5FOiVkOiVzXSBhdG9taWMgY29yZSBjaGVjayBmYWlsZWRcbiIsCj4gLQkJCQkJIHBsYW5lLT5i YXNlLmlkLCBwbGFuZS0+bmFtZSk7Cj4gKwkJCURSTV9ERUJVR19LTVMoIltQTEFORTolZDolc10g YXRvbWljIGNvcmUgY2hlY2sgZmFpbGVkXG4iLAo+ICsJCQkJICAgICAgcGxhbmUtPmJhc2UuaWQs IHBsYW5lLT5uYW1lKTsKPiAgCQkJcmV0dXJuIHJldDsKPiAgCQl9Cj4gIAl9Cj4gQEAgLTEzMzks OCArMTMzOSw4IEBAIGludCBkcm1fYXRvbWljX2NoZWNrX29ubHkoc3RydWN0IGRybV9hdG9taWNf c3RhdGUgKnN0YXRlKQo+ICAJZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShzdGF0ZSwgY3J0YywgY3J0 Y19zdGF0ZSwgaSkgewo+ICAJCXJldCA9IGRybV9hdG9taWNfY3J0Y19jaGVjayhjcnRjLCBjcnRj X3N0YXRlKTsKPiAgCQlpZiAocmV0KSB7Cj4gLQkJCURSTV9ERUJVR19BVE9NSUMoIltDUlRDOiVk OiVzXSBhdG9taWMgY29yZSBjaGVjayBmYWlsZWRcbiIsCj4gLQkJCQkJIGNydGMtPmJhc2UuaWQs IGNydGMtPm5hbWUpOwo+ICsJCQlEUk1fREVCVUdfS01TKCJbQ1JUQzolZDolc10gYXRvbWljIGNv cmUgY2hlY2sgZmFpbGVkXG4iLAo+ICsJCQkJICAgICAgY3J0Yy0+YmFzZS5pZCwgY3J0Yy0+bmFt ZSk7Cj4gIAkJCXJldHVybiByZXQ7Cj4gIAkJfQo+ICAJfQo+IEBAIC0xMzUxLDggKzEzNTEsOCBA QCBpbnQgZHJtX2F0b21pY19jaGVja19vbmx5KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0 ZSkKPiAgCWlmICghc3RhdGUtPmFsbG93X21vZGVzZXQpIHsKPiAgCQlmb3JfZWFjaF9jcnRjX2lu X3N0YXRlKHN0YXRlLCBjcnRjLCBjcnRjX3N0YXRlLCBpKSB7Cj4gIAkJCWlmIChkcm1fYXRvbWlj X2NydGNfbmVlZHNfbW9kZXNldChjcnRjX3N0YXRlKSkgewo+IC0JCQkJRFJNX0RFQlVHX0FUT01J QygiW0NSVEM6JWQ6JXNdIHJlcXVpcmVzIGZ1bGwgbW9kZXNldFxuIiwKPiAtCQkJCQkJIGNydGMt PmJhc2UuaWQsIGNydGMtPm5hbWUpOwo+ICsJCQkJRFJNX0RFQlVHX0tNUygiW0NSVEM6JWQ6JXNd IHJlcXVpcmVzIGZ1bGwgbW9kZXNldFxuIiwKPiArCQkJCQkgICAgICBjcnRjLT5iYXNlLmlkLCBj cnRjLT5uYW1lKTsKPiAgCQkJCXJldHVybiAtRUlOVkFMOwo+ICAJCQl9Cj4gIAkJfQo+IGRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1 L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCj4gaW5kZXggNDNhMGIzZGZhODQ2Li4xOGViYjFhMDhk NmMgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKPiAr KysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19oZWxwZXIuYwo+IEBAIC0xMTUsOSArMTE1 LDkgQEAgc3RhdGljIGludCBoYW5kbGVfY29uZmxpY3RpbmdfZW5jb2RlcnMoc3RydWN0IGRybV9h dG9taWNfc3RhdGUgKnN0YXRlLAo+ICAKPiAgCQlpZiAobmV3X2VuY29kZXIpIHsKPiAgCQkJaWYg KGVuY29kZXJfbWFzayAmICgxIDw8IGRybV9lbmNvZGVyX2luZGV4KG5ld19lbmNvZGVyKSkpIHsK PiAtCQkJCURSTV9ERUJVR19BVE9NSUMoIltFTkNPREVSOiVkOiVzXSBvbiBbQ09OTkVDVE9SOiVk OiVzXSBhbHJlYWR5IGFzc2lnbmVkXG4iLAo+IC0JCQkJCW5ld19lbmNvZGVyLT5iYXNlLmlkLCBu ZXdfZW5jb2Rlci0+bmFtZSwKPiAtCQkJCQljb25uZWN0b3ItPmJhc2UuaWQsIGNvbm5lY3Rvci0+ bmFtZSk7Cj4gKwkJCQlEUk1fREVCVUdfS01TKCJbRU5DT0RFUjolZDolc10gb24gW0NPTk5FQ1RP UjolZDolc10gYWxyZWFkeSBhc3NpZ25lZFxuIiwKPiArCQkJCQkgICAgICBuZXdfZW5jb2Rlci0+ YmFzZS5pZCwgbmV3X2VuY29kZXItPm5hbWUsCj4gKwkJCQkJICAgICAgY29ubmVjdG9yLT5iYXNl LmlkLCBjb25uZWN0b3ItPm5hbWUpOwo+ICAKPiAgCQkJCXJldHVybiAtRUlOVkFMOwo+ICAJCQl9 Cj4gQEAgLTE1MSwxMSArMTUxLDExIEBAIHN0YXRpYyBpbnQgaGFuZGxlX2NvbmZsaWN0aW5nX2Vu Y29kZXJzKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKPiAgCQkJY29udGludWU7Cj4g IAo+ICAJCWlmICghZGlzYWJsZV9jb25mbGljdGluZ19lbmNvZGVycykgewo+IC0JCQlEUk1fREVC VUdfQVRPTUlDKCJbRU5DT0RFUjolZDolc10gaW4gdXNlIG9uIFtDUlRDOiVkOiVzXSBieSBbQ09O TkVDVE9SOiVkOiVzXVxuIiwKPiAtCQkJCQkgZW5jb2Rlci0+YmFzZS5pZCwgZW5jb2Rlci0+bmFt ZSwKPiAtCQkJCQkgY29ubmVjdG9yLT5zdGF0ZS0+Y3J0Yy0+YmFzZS5pZCwKPiAtCQkJCQkgY29u bmVjdG9yLT5zdGF0ZS0+Y3J0Yy0+bmFtZSwKPiAtCQkJCQkgY29ubmVjdG9yLT5iYXNlLmlkLCBj b25uZWN0b3ItPm5hbWUpOwo+ICsJCQlEUk1fREVCVUdfS01TKCJbRU5DT0RFUjolZDolc10gaW4g dXNlIG9uIFtDUlRDOiVkOiVzXSBieSBbQ09OTkVDVE9SOiVkOiVzXVxuIiwKPiArCQkJCSAgICAg IGVuY29kZXItPmJhc2UuaWQsIGVuY29kZXItPm5hbWUsCj4gKwkJCQkgICAgICBjb25uZWN0b3It PnN0YXRlLT5jcnRjLT5iYXNlLmlkLAo+ICsJCQkJICAgICAgY29ubmVjdG9yLT5zdGF0ZS0+Y3J0 Yy0+bmFtZSwKPiArCQkJCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5pZCwgY29ubmVjdG9yLT5uYW1l KTsKPiAgCQkJcmV0dXJuIC1FSU5WQUw7Cj4gIAkJfQo+ICAKPiBAQCAtMzAyLDE3ICszMDIsMTcg QEAgdXBkYXRlX2Nvbm5lY3Rvcl9yb3V0aW5nKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0 ZSwKPiAgCQluZXdfZW5jb2RlciA9IGZ1bmNzLT5iZXN0X2VuY29kZXIoY29ubmVjdG9yKTsKPiAg Cj4gIAlpZiAoIW5ld19lbmNvZGVyKSB7Cj4gLQkJRFJNX0RFQlVHX0FUT01JQygiTm8gc3VpdGFi bGUgZW5jb2RlciBmb3VuZCBmb3IgW0NPTk5FQ1RPUjolZDolc11cbiIsCj4gLQkJCQkgY29ubmVj dG9yLT5iYXNlLmlkLAo+IC0JCQkJIGNvbm5lY3Rvci0+bmFtZSk7Cj4gKwkJRFJNX0RFQlVHX0tN UygiTm8gc3VpdGFibGUgZW5jb2RlciBmb3VuZCBmb3IgW0NPTk5FQ1RPUjolZDolc11cbiIsCj4g KwkJCSAgICAgIGNvbm5lY3Rvci0+YmFzZS5pZCwKPiArCQkJICAgICAgY29ubmVjdG9yLT5uYW1l KTsKPiAgCQlyZXR1cm4gLUVJTlZBTDsKPiAgCX0KPiAgCj4gIAlpZiAoIWRybV9lbmNvZGVyX2Ny dGNfb2sobmV3X2VuY29kZXIsIGNvbm5lY3Rvcl9zdGF0ZS0+Y3J0YykpIHsKPiAtCQlEUk1fREVC VUdfQVRPTUlDKCJbRU5DT0RFUjolZDolc10gaW5jb21wYXRpYmxlIHdpdGggW0NSVEM6JWRdXG4i LAo+IC0JCQkJIG5ld19lbmNvZGVyLT5iYXNlLmlkLAo+IC0JCQkJIG5ld19lbmNvZGVyLT5uYW1l LAo+IC0JCQkJIGNvbm5lY3Rvcl9zdGF0ZS0+Y3J0Yy0+YmFzZS5pZCk7Cj4gKwkJRFJNX0RFQlVH X0tNUygiW0VOQ09ERVI6JWQ6JXNdIGluY29tcGF0aWJsZSB3aXRoIFtDUlRDOiVkXVxuIiwKPiAr CQkJICAgICAgbmV3X2VuY29kZXItPmJhc2UuaWQsCj4gKwkJCSAgICAgIG5ld19lbmNvZGVyLT5u YW1lLAo+ICsJCQkgICAgICBjb25uZWN0b3Jfc3RhdGUtPmNydGMtPmJhc2UuaWQpOwo+ICAJCXJl dHVybiAtRUlOVkFMOwo+ICAJfQo+ICAKPiBAQCAtMzg4LDcgKzM4OCw3IEBAIG1vZGVfZml4dXAo c3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQo+ICAJCXJldCA9IGRybV9icmlkZ2VfbW9k ZV9maXh1cChlbmNvZGVyLT5icmlkZ2UsICZjcnRjX3N0YXRlLT5tb2RlLAo+ICAJCQkJJmNydGNf c3RhdGUtPmFkanVzdGVkX21vZGUpOwo+ICAJCWlmICghcmV0KSB7Cj4gLQkJCURSTV9ERUJVR19B VE9NSUMoIkJyaWRnZSBmaXh1cCBmYWlsZWRcbiIpOwo+ICsJCQlEUk1fREVCVUdfS01TKCJCcmlk Z2UgZml4dXAgZmFpbGVkXG4iKTsKPiAgCQkJcmV0dXJuIC1FSU5WQUw7Cj4gIAkJfQo+ICAKPiBA QCAtMzk2LDE2ICszOTYsMTYgQEAgbW9kZV9maXh1cChzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAq c3RhdGUpCj4gIAkJCXJldCA9IGZ1bmNzLT5hdG9taWNfY2hlY2soZW5jb2RlciwgY3J0Y19zdGF0 ZSwKPiAgCQkJCQkJICBjb25uX3N0YXRlKTsKPiAgCQkJaWYgKHJldCkgewo+IC0JCQkJRFJNX0RF QlVHX0FUT01JQygiW0VOQ09ERVI6JWQ6JXNdIGNoZWNrIGZhaWxlZFxuIiwKPiAtCQkJCQkJIGVu Y29kZXItPmJhc2UuaWQsIGVuY29kZXItPm5hbWUpOwo+ICsJCQkJRFJNX0RFQlVHX0tNUygiW0VO Q09ERVI6JWQ6JXNdIGNoZWNrIGZhaWxlZFxuIiwKPiArCQkJCQkgICAgICBlbmNvZGVyLT5iYXNl LmlkLCBlbmNvZGVyLT5uYW1lKTsKPiAgCQkJCXJldHVybiByZXQ7Cj4gIAkJCX0KPiAgCQl9IGVs c2UgaWYgKGZ1bmNzICYmIGZ1bmNzLT5tb2RlX2ZpeHVwKSB7Cj4gIAkJCXJldCA9IGZ1bmNzLT5t b2RlX2ZpeHVwKGVuY29kZXIsICZjcnRjX3N0YXRlLT5tb2RlLAo+ICAJCQkJCQkmY3J0Y19zdGF0 ZS0+YWRqdXN0ZWRfbW9kZSk7Cj4gIAkJCWlmICghcmV0KSB7Cj4gLQkJCQlEUk1fREVCVUdfQVRP TUlDKCJbRU5DT0RFUjolZDolc10gZml4dXAgZmFpbGVkXG4iLAo+IC0JCQkJCQkgZW5jb2Rlci0+ YmFzZS5pZCwgZW5jb2Rlci0+bmFtZSk7Cj4gKwkJCQlEUk1fREVCVUdfS01TKCJbRU5DT0RFUjol ZDolc10gZml4dXAgZmFpbGVkXG4iLAo+ICsJCQkJCSAgICAgIGVuY29kZXItPmJhc2UuaWQsIGVu Y29kZXItPm5hbWUpOwo+ICAJCQkJcmV0dXJuIC1FSU5WQUw7Cj4gIAkJCX0KPiAgCQl9Cj4gQEAg LTQyNSw4ICs0MjUsOCBAQCBtb2RlX2ZpeHVwKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0 ZSkKPiAgCQlyZXQgPSBmdW5jcy0+bW9kZV9maXh1cChjcnRjLCAmY3J0Y19zdGF0ZS0+bW9kZSwK PiAgCQkJCQkmY3J0Y19zdGF0ZS0+YWRqdXN0ZWRfbW9kZSk7Cj4gIAkJaWYgKCFyZXQpIHsKPiAt CQkJRFJNX0RFQlVHX0FUT01JQygiW0NSVEM6JWQ6JXNdIGZpeHVwIGZhaWxlZFxuIiwKPiAtCQkJ CQkgY3J0Yy0+YmFzZS5pZCwgY3J0Yy0+bmFtZSk7Cj4gKwkJCURSTV9ERUJVR19LTVMoIltDUlRD OiVkOiVzXSBmaXh1cCBmYWlsZWRcbiIsCj4gKwkJCQkgICAgICBjcnRjLT5iYXNlLmlkLCBjcnRj LT5uYW1lKTsKPiAgCQkJcmV0dXJuIC1FSU5WQUw7Cj4gIAkJfQo+ICAJfQo+IEBAIC01NDksOCAr NTQ5LDggQEAgZHJtX2F0b21pY19oZWxwZXJfY2hlY2tfbW9kZXNldChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LAo+ICAJCQlyZXR1cm4gcmV0Owo+ICAKPiAgCQlpZiAoY3J0Y19zdGF0ZS0+ZW5hYmxl ICE9IGhhc19jb25uZWN0b3JzKSB7Cj4gLQkJCURSTV9ERUJVR19BVE9NSUMoIltDUlRDOiVkOiVz XSBlbmFibGVkL2Nvbm5lY3RvcnMgbWlzbWF0Y2hcbiIsCj4gLQkJCQkJIGNydGMtPmJhc2UuaWQs IGNydGMtPm5hbWUpOwo+ICsJCQlEUk1fREVCVUdfS01TKCJbQ1JUQzolZDolc10gZW5hYmxlZC9j b25uZWN0b3JzIG1pc21hdGNoXG4iLAo+ICsJCQkJICAgICAgY3J0Yy0+YmFzZS5pZCwgY3J0Yy0+ bmFtZSk7Cj4gIAo+ICAJCQlyZXR1cm4gLUVJTlZBTDsKPiAgCQl9Cj4gQEAgLTU5Nyw4ICs1OTcs OCBAQCBkcm1fYXRvbWljX2hlbHBlcl9jaGVja19wbGFuZXMoc3RydWN0IGRybV9kZXZpY2UgKmRl diwKPiAgCj4gIAkJcmV0ID0gZnVuY3MtPmF0b21pY19jaGVjayhwbGFuZSwgcGxhbmVfc3RhdGUp Owo+ICAJCWlmIChyZXQpIHsKPiAtCQkJRFJNX0RFQlVHX0FUT01JQygiW1BMQU5FOiVkOiVzXSBh dG9taWMgZHJpdmVyIGNoZWNrIGZhaWxlZFxuIiwKPiAtCQkJCQkgcGxhbmUtPmJhc2UuaWQsIHBs YW5lLT5uYW1lKTsKPiArCQkJRFJNX0RFQlVHX0tNUygiW1BMQU5FOiVkOiVzXSBhdG9taWMgZHJp dmVyIGNoZWNrIGZhaWxlZFxuIiwKPiArCQkJCSAgICAgIHBsYW5lLT5iYXNlLmlkLCBwbGFuZS0+ bmFtZSk7Cj4gIAkJCXJldHVybiByZXQ7Cj4gIAkJfQo+ICAJfQo+IEBAIC02MTMsOCArNjEzLDgg QEAgZHJtX2F0b21pY19oZWxwZXJfY2hlY2tfcGxhbmVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs Cj4gIAo+ICAJCXJldCA9IGZ1bmNzLT5hdG9taWNfY2hlY2soY3J0Yywgc3RhdGUtPmNydGNfc3Rh dGVzW2ldKTsKPiAgCQlpZiAocmV0KSB7Cj4gLQkJCURSTV9ERUJVR19BVE9NSUMoIltDUlRDOiVk OiVzXSBhdG9taWMgZHJpdmVyIGNoZWNrIGZhaWxlZFxuIiwKPiAtCQkJCQkgY3J0Yy0+YmFzZS5p ZCwgY3J0Yy0+bmFtZSk7Cj4gKwkJCURSTV9ERUJVR19LTVMoIltDUlRDOiVkOiVzXSBhdG9taWMg ZHJpdmVyIGNoZWNrIGZhaWxlZFxuIiwKPiArCQkJCSAgICAgIGNydGMtPmJhc2UuaWQsIGNydGMt Pm5hbWUpOwo+ICAJCQlyZXR1cm4gcmV0Owo+ICAJCX0KPiAgCX0KPiBAQCAtMjM2Nyw4ICsyMzY3 LDggQEAgcmV0cnk6Cj4gIAkvKiBNYWtlIHN1cmUgd2UgZG9uJ3QgYWNjaWRlbnRhbGx5IGRvIGEg ZnVsbCBtb2Rlc2V0LiAqLwo+ICAJc3RhdGUtPmFsbG93X21vZGVzZXQgPSBmYWxzZTsKPiAgCWlm ICghY3J0Y19zdGF0ZS0+YWN0aXZlKSB7Cj4gLQkJRFJNX0RFQlVHX0FUT01JQygiW0NSVEM6JWRd IGRpc2FibGVkLCByZWplY3RpbmcgbGVnYWN5IGZsaXBcbiIsCj4gLQkJCQkgY3J0Yy0+YmFzZS5p ZCk7Cj4gKwkJRFJNX0RFQlVHX0tNUygiW0NSVEM6JWRdIGRpc2FibGVkLCByZWplY3RpbmcgbGVn YWN5IGZsaXBcbiIsCj4gKwkJCSAgICAgIGNydGMtPmJhc2UuaWQpOwo+ICAJCXJldCA9IC1FSU5W QUw7Cj4gIAkJZ290byBmYWlsOwo+ICAJfQoKLS0gCkphbmkgTmlrdWxhLCBJbnRlbCBPcGVuIFNv dXJjZSBUZWNobm9sb2d5IENlbnRlcgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9kcmktZGV2ZWwK