From mboxrd@z Thu Jan 1 00:00:00 1970 From: ville.syrjala@linux.intel.com Subject: [PATCH] drm/atomic: Use DRM_DEBUG_KMS instead of DRM_DEBUG_ATOMIC in error paths Date: Fri, 13 May 2016 18:13:39 +0300 Message-ID: <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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id ED1756EABC for ; Fri, 13 May 2016 15:13:45 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCkRS TV9ERUJVR19BVE9NSUMgZ2VuZXJhdGVzIGEgbG90IG9mIG5vaXNlIHRoYXQgbm8gb25lIG5vcm1h bGx5IGNhcmVzCmFib3V0LiBIb3dldmVyIGVycm9yIHBhdGhzIGV2ZXJ5b25lIGNhcmVzIGFib3V0 LCBzbyBoaWRpbmcgdGhlYSBlcnJvcgpkZWJ1Z3MgdW5kZXIgRFJNX0RFQlVHX0FUT01JQyBpcyBh IGJhZCBpZGVhLiBMZXQncyB1c2UgRFJNX0RFQlVHX0tNUwpmb3IgdGhvc2UgaW5zdGVhZC4KClNp Z25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5j b20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYyAgICAgICAgfCA2MCArKysrKysr KysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21p Y19oZWxwZXIuYyB8IDYwICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIDIg ZmlsZXMgY2hhbmdlZCwgNjAgaW5zZXJ0aW9ucygrKSwgNjAgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1f YXRvbWljLmMKaW5kZXggODZlODlkYjAyZWQ3Li4xNDc5YmZkODc0NGIgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9t aWMuYwpAQCAtNTU0LDggKzU1NCw4IEBAIHN0YXRpYyBpbnQgZHJtX2F0b21pY19jcnRjX2NoZWNr KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkgKi8KIAogCWlmIChzdGF0ZS0+YWN0aXZlICYmICFz dGF0ZS0+ZW5hYmxlKSB7Ci0JCURSTV9ERUJVR19BVE9NSUMoIltDUlRDOiVkOiVzXSBhY3RpdmUg d2l0aG91dCBlbmFibGVkXG4iLAotCQkJCSBjcnRjLT5iYXNlLmlkLCBjcnRjLT5uYW1lKTsKKwkJ RFJNX0RFQlVHX0tNUygiW0NSVEM6JWQ6JXNdIGFjdGl2ZSB3aXRob3V0IGVuYWJsZWRcbiIsCisJ CQkgICAgICBjcnRjLT5iYXNlLmlkLCBjcnRjLT5uYW1lKTsKIAkJcmV0dXJuIC1FSU5WQUw7CiAJ fQogCkBAIC01NjQsMTUgKzU2NCwxNSBAQCBzdGF0aWMgaW50IGRybV9hdG9taWNfY3J0Y19jaGVj ayhzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJICogYmUgYWJsZSB0byB0cmlnZ2VyLiAqLwogCWlm IChkcm1fY29yZV9jaGVja19mZWF0dXJlKGNydGMtPmRldiwgRFJJVkVSX0FUT01JQykgJiYKIAkg ICAgV0FSTl9PTihzdGF0ZS0+ZW5hYmxlICYmICFzdGF0ZS0+bW9kZV9ibG9iKSkgewotCQlEUk1f REVCVUdfQVRPTUlDKCJbQ1JUQzolZDolc10gZW5hYmxlZCB3aXRob3V0IG1vZGUgYmxvYlxuIiwK LQkJCQkgY3J0Yy0+YmFzZS5pZCwgY3J0Yy0+bmFtZSk7CisJCURSTV9ERUJVR19LTVMoIltDUlRD OiVkOiVzXSBlbmFibGVkIHdpdGhvdXQgbW9kZSBibG9iXG4iLAorCQkJICAgICAgY3J0Yy0+YmFz ZS5pZCwgY3J0Yy0+bmFtZSk7CiAJCXJldHVybiAtRUlOVkFMOwogCX0KIAogCWlmIChkcm1fY29y ZV9jaGVja19mZWF0dXJlKGNydGMtPmRldiwgRFJJVkVSX0FUT01JQykgJiYKIAkgICAgV0FSTl9P Tighc3RhdGUtPmVuYWJsZSAmJiBzdGF0ZS0+bW9kZV9ibG9iKSkgewotCQlEUk1fREVCVUdfQVRP TUlDKCJbQ1JUQzolZDolc10gZGlzYWJsZWQgd2l0aCBtb2RlIGJsb2JcbiIsCi0JCQkJIGNydGMt PmJhc2UuaWQsIGNydGMtPm5hbWUpOworCQlEUk1fREVCVUdfS01TKCJbQ1JUQzolZDolc10gZGlz YWJsZWQgd2l0aCBtb2RlIGJsb2JcbiIsCisJCQkgICAgICBjcnRjLT5iYXNlLmlkLCBjcnRjLT5u YW1lKTsKIAkJcmV0dXJuIC1FSU5WQUw7CiAJfQogCkBAIC01ODcsOCArNTg3LDggQEAgc3RhdGlj IGludCBkcm1fYXRvbWljX2NydGNfY2hlY2soc3RydWN0IGRybV9jcnRjICpjcnRjLAogCSAqIHBp cGUuCiAJICovCiAJaWYgKHN0YXRlLT5ldmVudCAmJiAhc3RhdGUtPmFjdGl2ZSAmJiAhY3J0Yy0+ c3RhdGUtPmFjdGl2ZSkgewotCQlEUk1fREVCVUdfQVRPTUlDKCJbQ1JUQzolZF0gcmVxdWVzdGlu ZyBldmVudCBidXQgb2ZmXG4iLAotCQkJCSBjcnRjLT5iYXNlLmlkKTsKKwkJRFJNX0RFQlVHX0tN UygiW0NSVEM6JWRdIHJlcXVlc3RpbmcgZXZlbnQgYnV0IG9mZlxuIiwKKwkJCSAgICAgIGNydGMt PmJhc2UuaWQpOwogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKQEAgLTgwMiwxMCArODAyLDEwIEBA IHN0YXRpYyBpbnQgZHJtX2F0b21pY19wbGFuZV9jaGVjayhzdHJ1Y3QgZHJtX3BsYW5lICpwbGFu ZSwKIAogCS8qIGVpdGhlciAqYm90aCogQ1JUQyBhbmQgRkIgbXVzdCBiZSBzZXQsIG9yIG5laXRo ZXIgKi8KIAlpZiAoV0FSTl9PTihzdGF0ZS0+Y3J0YyAmJiAhc3RhdGUtPmZiKSkgewotCQlEUk1f REVCVUdfQVRPTUlDKCJDUlRDIHNldCBidXQgbm8gRkJcbiIpOworCQlEUk1fREVCVUdfS01TKCJD UlRDIHNldCBidXQgbm8gRkJcbiIpOwogCQlyZXR1cm4gLUVJTlZBTDsKIAl9IGVsc2UgaWYgKFdB Uk5fT04oc3RhdGUtPmZiICYmICFzdGF0ZS0+Y3J0YykpIHsKLQkJRFJNX0RFQlVHX0FUT01JQygi RkIgc2V0IGJ1dCBubyBDUlRDXG4iKTsKKwkJRFJNX0RFQlVHX0tNUygiRkIgc2V0IGJ1dCBubyBD UlRDXG4iKTsKIAkJcmV0dXJuIC1FSU5WQUw7CiAJfQogCkBAIC04MTUsMTUgKzgxNSwxNSBAQCBz dGF0aWMgaW50IGRybV9hdG9taWNfcGxhbmVfY2hlY2soc3RydWN0IGRybV9wbGFuZSAqcGxhbmUs CiAKIAkvKiBDaGVjayB3aGV0aGVyIHRoaXMgcGxhbmUgaXMgdXNhYmxlIG9uIHRoaXMgQ1JUQyAq LwogCWlmICghKHBsYW5lLT5wb3NzaWJsZV9jcnRjcyAmIGRybV9jcnRjX21hc2soc3RhdGUtPmNy dGMpKSkgewotCQlEUk1fREVCVUdfQVRPTUlDKCJJbnZhbGlkIGNydGMgZm9yIHBsYW5lXG4iKTsK KwkJRFJNX0RFQlVHX0tNUygiSW52YWxpZCBjcnRjIGZvciBwbGFuZVxuIik7CiAJCXJldHVybiAt RUlOVkFMOwogCX0KIAogCS8qIENoZWNrIHdoZXRoZXIgdGhpcyBwbGFuZSBzdXBwb3J0cyB0aGUg ZmIgcGl4ZWwgZm9ybWF0LiAqLwogCXJldCA9IGRybV9wbGFuZV9jaGVja19waXhlbF9mb3JtYXQo cGxhbmUsIHN0YXRlLT5mYi0+cGl4ZWxfZm9ybWF0KTsKIAlpZiAocmV0KSB7Ci0JCURSTV9ERUJV R19BVE9NSUMoIkludmFsaWQgcGl4ZWwgZm9ybWF0ICVzXG4iLAotCQkJCSBkcm1fZ2V0X2Zvcm1h dF9uYW1lKHN0YXRlLT5mYi0+cGl4ZWxfZm9ybWF0KSk7CisJCURSTV9ERUJVR19LTVMoIkludmFs aWQgcGl4ZWwgZm9ybWF0ICVzXG4iLAorCQkJICAgICAgZHJtX2dldF9mb3JtYXRfbmFtZShzdGF0 ZS0+ZmItPnBpeGVsX2Zvcm1hdCkpOwogCQlyZXR1cm4gcmV0OwogCX0KIApAQCAtODMyLDkgKzgz Miw5IEBAIHN0YXRpYyBpbnQgZHJtX2F0b21pY19wbGFuZV9jaGVjayhzdHJ1Y3QgZHJtX3BsYW5l ICpwbGFuZSwKIAkgICAgc3RhdGUtPmNydGNfeCA+IElOVF9NQVggLSAoaW50MzJfdCkgc3RhdGUt PmNydGNfdyB8fAogCSAgICBzdGF0ZS0+Y3J0Y19oID4gSU5UX01BWCB8fAogCSAgICBzdGF0ZS0+ Y3J0Y195ID4gSU5UX01BWCAtIChpbnQzMl90KSBzdGF0ZS0+Y3J0Y19oKSB7Ci0JCURSTV9ERUJV R19BVE9NSUMoIkludmFsaWQgQ1JUQyBjb29yZGluYXRlcyAldXgldSslZCslZFxuIiwKLQkJCQkg c3RhdGUtPmNydGNfdywgc3RhdGUtPmNydGNfaCwKLQkJCQkgc3RhdGUtPmNydGNfeCwgc3RhdGUt PmNydGNfeSk7CisJCURSTV9ERUJVR19LTVMoIkludmFsaWQgQ1JUQyBjb29yZGluYXRlcyAldXgl dSslZCslZFxuIiwKKwkJCSAgICAgIHN0YXRlLT5jcnRjX3csIHN0YXRlLT5jcnRjX2gsCisJCQkg ICAgICBzdGF0ZS0+Y3J0Y194LCBzdGF0ZS0+Y3J0Y195KTsKIAkJcmV0dXJuIC1FUkFOR0U7CiAJ fQogCkBAIC04NDYsMTggKzg0NiwxOCBAQCBzdGF0aWMgaW50IGRybV9hdG9taWNfcGxhbmVfY2hl Y2soc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJICAgIHN0YXRlLT5zcmNfeCA+IGZiX3dpZHRo IC0gc3RhdGUtPnNyY193IHx8CiAJICAgIHN0YXRlLT5zcmNfaCA+IGZiX2hlaWdodCB8fAogCSAg ICBzdGF0ZS0+c3JjX3kgPiBmYl9oZWlnaHQgLSBzdGF0ZS0+c3JjX2gpIHsKLQkJRFJNX0RFQlVH X0FUT01JQygiSW52YWxpZCBzb3VyY2UgY29vcmRpbmF0ZXMgIgotCQkJCSAiJXUuJTA2dXgldS4l MDZ1KyV1LiUwNnUrJXUuJTA2dVxuIiwKLQkJCQkgc3RhdGUtPnNyY193ID4+IDE2LCAoKHN0YXRl LT5zcmNfdyAmIDB4ZmZmZikgKiAxNTYyNSkgPj4gMTAsCi0JCQkJIHN0YXRlLT5zcmNfaCA+PiAx NiwgKChzdGF0ZS0+c3JjX2ggJiAweGZmZmYpICogMTU2MjUpID4+IDEwLAotCQkJCSBzdGF0ZS0+ c3JjX3ggPj4gMTYsICgoc3RhdGUtPnNyY194ICYgMHhmZmZmKSAqIDE1NjI1KSA+PiAxMCwKLQkJ CQkgc3RhdGUtPnNyY195ID4+IDE2LCAoKHN0YXRlLT5zcmNfeSAmIDB4ZmZmZikgKiAxNTYyNSkg Pj4gMTApOworCQlEUk1fREVCVUdfS01TKCJJbnZhbGlkIHNvdXJjZSBjb29yZGluYXRlcyAiCisJ CQkgICAgICAiJXUuJTA2dXgldS4lMDZ1KyV1LiUwNnUrJXUuJTA2dVxuIiwKKwkJCSAgICAgIHN0 YXRlLT5zcmNfdyA+PiAxNiwgKChzdGF0ZS0+c3JjX3cgJiAweGZmZmYpICogMTU2MjUpID4+IDEw LAorCQkJICAgICAgc3RhdGUtPnNyY19oID4+IDE2LCAoKHN0YXRlLT5zcmNfaCAmIDB4ZmZmZikg KiAxNTYyNSkgPj4gMTAsCisJCQkgICAgICBzdGF0ZS0+c3JjX3ggPj4gMTYsICgoc3RhdGUtPnNy Y194ICYgMHhmZmZmKSAqIDE1NjI1KSA+PiAxMCwKKwkJCSAgICAgIHN0YXRlLT5zcmNfeSA+PiAx NiwgKChzdGF0ZS0+c3JjX3kgJiAweGZmZmYpICogMTU2MjUpID4+IDEwKTsKIAkJcmV0dXJuIC1F Tk9TUEM7CiAJfQogCiAJaWYgKHBsYW5lX3N3aXRjaGluZ19jcnRjKHN0YXRlLT5zdGF0ZSwgcGxh bmUsIHN0YXRlKSkgewotCQlEUk1fREVCVUdfQVRPTUlDKCJbUExBTkU6JWQ6JXNdIHN3aXRjaGlu ZyBDUlRDIGRpcmVjdGx5XG4iLAotCQkJCSBwbGFuZS0+YmFzZS5pZCwgcGxhbmUtPm5hbWUpOwor CQlEUk1fREVCVUdfS01TKCJbUExBTkU6JWQ6JXNdIHN3aXRjaGluZyBDUlRDIGRpcmVjdGx5XG4i LAorCQkJICAgICAgcGxhbmUtPmJhc2UuaWQsIHBsYW5lLT5uYW1lKTsKIAkJcmV0dXJuIC1FSU5W QUw7CiAJfQogCkBAIC0xMzMwLDggKzEzMzAsOCBAQCBpbnQgZHJtX2F0b21pY19jaGVja19vbmx5 KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAlmb3JfZWFjaF9wbGFuZV9pbl9zdGF0 ZShzdGF0ZSwgcGxhbmUsIHBsYW5lX3N0YXRlLCBpKSB7CiAJCXJldCA9IGRybV9hdG9taWNfcGxh bmVfY2hlY2socGxhbmUsIHBsYW5lX3N0YXRlKTsKIAkJaWYgKHJldCkgewotCQkJRFJNX0RFQlVH X0FUT01JQygiW1BMQU5FOiVkOiVzXSBhdG9taWMgY29yZSBjaGVjayBmYWlsZWRcbiIsCi0JCQkJ CSBwbGFuZS0+YmFzZS5pZCwgcGxhbmUtPm5hbWUpOworCQkJRFJNX0RFQlVHX0tNUygiW1BMQU5F OiVkOiVzXSBhdG9taWMgY29yZSBjaGVjayBmYWlsZWRcbiIsCisJCQkJICAgICAgcGxhbmUtPmJh c2UuaWQsIHBsYW5lLT5uYW1lKTsKIAkJCXJldHVybiByZXQ7CiAJCX0KIAl9CkBAIC0xMzM5LDgg KzEzMzksOCBAQCBpbnQgZHJtX2F0b21pY19jaGVja19vbmx5KHN0cnVjdCBkcm1fYXRvbWljX3N0 YXRlICpzdGF0ZSkKIAlmb3JfZWFjaF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBjcnRjX3N0 YXRlLCBpKSB7CiAJCXJldCA9IGRybV9hdG9taWNfY3J0Y19jaGVjayhjcnRjLCBjcnRjX3N0YXRl KTsKIAkJaWYgKHJldCkgewotCQkJRFJNX0RFQlVHX0FUT01JQygiW0NSVEM6JWQ6JXNdIGF0b21p YyBjb3JlIGNoZWNrIGZhaWxlZFxuIiwKLQkJCQkJIGNydGMtPmJhc2UuaWQsIGNydGMtPm5hbWUp OworCQkJRFJNX0RFQlVHX0tNUygiW0NSVEM6JWQ6JXNdIGF0b21pYyBjb3JlIGNoZWNrIGZhaWxl ZFxuIiwKKwkJCQkgICAgICBjcnRjLT5iYXNlLmlkLCBjcnRjLT5uYW1lKTsKIAkJCXJldHVybiBy ZXQ7CiAJCX0KIAl9CkBAIC0xMzUxLDggKzEzNTEsOCBAQCBpbnQgZHJtX2F0b21pY19jaGVja19v bmx5KHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAlpZiAoIXN0YXRlLT5hbGxvd19t b2Rlc2V0KSB7CiAJCWZvcl9lYWNoX2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNydGNfc3Rh dGUsIGkpIHsKIAkJCWlmIChkcm1fYXRvbWljX2NydGNfbmVlZHNfbW9kZXNldChjcnRjX3N0YXRl KSkgewotCQkJCURSTV9ERUJVR19BVE9NSUMoIltDUlRDOiVkOiVzXSByZXF1aXJlcyBmdWxsIG1v ZGVzZXRcbiIsCi0JCQkJCQkgY3J0Yy0+YmFzZS5pZCwgY3J0Yy0+bmFtZSk7CisJCQkJRFJNX0RF QlVHX0tNUygiW0NSVEM6JWQ6JXNdIHJlcXVpcmVzIGZ1bGwgbW9kZXNldFxuIiwKKwkJCQkJICAg ICAgY3J0Yy0+YmFzZS5pZCwgY3J0Yy0+bmFtZSk7CiAJCQkJcmV0dXJuIC1FSU5WQUw7CiAJCQl9 CiAJCX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jIGIv ZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMKaW5kZXggNDNhMGIzZGZhODQ2Li4x OGViYjFhMDhkNmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBl ci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCkBAIC0xMTUsOSAr MTE1LDkgQEAgc3RhdGljIGludCBoYW5kbGVfY29uZmxpY3RpbmdfZW5jb2RlcnMoc3RydWN0IGRy bV9hdG9taWNfc3RhdGUgKnN0YXRlLAogCiAJCWlmIChuZXdfZW5jb2RlcikgewogCQkJaWYgKGVu Y29kZXJfbWFzayAmICgxIDw8IGRybV9lbmNvZGVyX2luZGV4KG5ld19lbmNvZGVyKSkpIHsKLQkJ CQlEUk1fREVCVUdfQVRPTUlDKCJbRU5DT0RFUjolZDolc10gb24gW0NPTk5FQ1RPUjolZDolc10g YWxyZWFkeSBhc3NpZ25lZFxuIiwKLQkJCQkJbmV3X2VuY29kZXItPmJhc2UuaWQsIG5ld19lbmNv ZGVyLT5uYW1lLAotCQkJCQljb25uZWN0b3ItPmJhc2UuaWQsIGNvbm5lY3Rvci0+bmFtZSk7CisJ CQkJRFJNX0RFQlVHX0tNUygiW0VOQ09ERVI6JWQ6JXNdIG9uIFtDT05ORUNUT1I6JWQ6JXNdIGFs cmVhZHkgYXNzaWduZWRcbiIsCisJCQkJCSAgICAgIG5ld19lbmNvZGVyLT5iYXNlLmlkLCBuZXdf ZW5jb2Rlci0+bmFtZSwKKwkJCQkJICAgICAgY29ubmVjdG9yLT5iYXNlLmlkLCBjb25uZWN0b3It Pm5hbWUpOwogCiAJCQkJcmV0dXJuIC1FSU5WQUw7CiAJCQl9CkBAIC0xNTEsMTEgKzE1MSwxMSBA QCBzdGF0aWMgaW50IGhhbmRsZV9jb25mbGljdGluZ19lbmNvZGVycyhzdHJ1Y3QgZHJtX2F0b21p Y19zdGF0ZSAqc3RhdGUsCiAJCQljb250aW51ZTsKIAogCQlpZiAoIWRpc2FibGVfY29uZmxpY3Rp bmdfZW5jb2RlcnMpIHsKLQkJCURSTV9ERUJVR19BVE9NSUMoIltFTkNPREVSOiVkOiVzXSBpbiB1 c2Ugb24gW0NSVEM6JWQ6JXNdIGJ5IFtDT05ORUNUT1I6JWQ6JXNdXG4iLAotCQkJCQkgZW5jb2Rl ci0+YmFzZS5pZCwgZW5jb2Rlci0+bmFtZSwKLQkJCQkJIGNvbm5lY3Rvci0+c3RhdGUtPmNydGMt PmJhc2UuaWQsCi0JCQkJCSBjb25uZWN0b3ItPnN0YXRlLT5jcnRjLT5uYW1lLAotCQkJCQkgY29u bmVjdG9yLT5iYXNlLmlkLCBjb25uZWN0b3ItPm5hbWUpOworCQkJRFJNX0RFQlVHX0tNUygiW0VO Q09ERVI6JWQ6JXNdIGluIHVzZSBvbiBbQ1JUQzolZDolc10gYnkgW0NPTk5FQ1RPUjolZDolc11c biIsCisJCQkJICAgICAgZW5jb2Rlci0+YmFzZS5pZCwgZW5jb2Rlci0+bmFtZSwKKwkJCQkgICAg ICBjb25uZWN0b3ItPnN0YXRlLT5jcnRjLT5iYXNlLmlkLAorCQkJCSAgICAgIGNvbm5lY3Rvci0+ c3RhdGUtPmNydGMtPm5hbWUsCisJCQkJICAgICAgY29ubmVjdG9yLT5iYXNlLmlkLCBjb25uZWN0 b3ItPm5hbWUpOwogCQkJcmV0dXJuIC1FSU5WQUw7CiAJCX0KIApAQCAtMzAyLDE3ICszMDIsMTcg QEAgdXBkYXRlX2Nvbm5lY3Rvcl9yb3V0aW5nKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0 ZSwKIAkJbmV3X2VuY29kZXIgPSBmdW5jcy0+YmVzdF9lbmNvZGVyKGNvbm5lY3Rvcik7CiAKIAlp ZiAoIW5ld19lbmNvZGVyKSB7Ci0JCURSTV9ERUJVR19BVE9NSUMoIk5vIHN1aXRhYmxlIGVuY29k ZXIgZm91bmQgZm9yIFtDT05ORUNUT1I6JWQ6JXNdXG4iLAotCQkJCSBjb25uZWN0b3ItPmJhc2Uu aWQsCi0JCQkJIGNvbm5lY3Rvci0+bmFtZSk7CisJCURSTV9ERUJVR19LTVMoIk5vIHN1aXRhYmxl IGVuY29kZXIgZm91bmQgZm9yIFtDT05ORUNUT1I6JWQ6JXNdXG4iLAorCQkJICAgICAgY29ubmVj dG9yLT5iYXNlLmlkLAorCQkJICAgICAgY29ubmVjdG9yLT5uYW1lKTsKIAkJcmV0dXJuIC1FSU5W QUw7CiAJfQogCiAJaWYgKCFkcm1fZW5jb2Rlcl9jcnRjX29rKG5ld19lbmNvZGVyLCBjb25uZWN0 b3Jfc3RhdGUtPmNydGMpKSB7Ci0JCURSTV9ERUJVR19BVE9NSUMoIltFTkNPREVSOiVkOiVzXSBp bmNvbXBhdGlibGUgd2l0aCBbQ1JUQzolZF1cbiIsCi0JCQkJIG5ld19lbmNvZGVyLT5iYXNlLmlk LAotCQkJCSBuZXdfZW5jb2Rlci0+bmFtZSwKLQkJCQkgY29ubmVjdG9yX3N0YXRlLT5jcnRjLT5i YXNlLmlkKTsKKwkJRFJNX0RFQlVHX0tNUygiW0VOQ09ERVI6JWQ6JXNdIGluY29tcGF0aWJsZSB3 aXRoIFtDUlRDOiVkXVxuIiwKKwkJCSAgICAgIG5ld19lbmNvZGVyLT5iYXNlLmlkLAorCQkJICAg ICAgbmV3X2VuY29kZXItPm5hbWUsCisJCQkgICAgICBjb25uZWN0b3Jfc3RhdGUtPmNydGMtPmJh c2UuaWQpOwogCQlyZXR1cm4gLUVJTlZBTDsKIAl9CiAKQEAgLTM4OCw3ICszODgsNyBAQCBtb2Rl X2ZpeHVwKHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIAkJcmV0ID0gZHJtX2JyaWRn ZV9tb2RlX2ZpeHVwKGVuY29kZXItPmJyaWRnZSwgJmNydGNfc3RhdGUtPm1vZGUsCiAJCQkJJmNy dGNfc3RhdGUtPmFkanVzdGVkX21vZGUpOwogCQlpZiAoIXJldCkgewotCQkJRFJNX0RFQlVHX0FU T01JQygiQnJpZGdlIGZpeHVwIGZhaWxlZFxuIik7CisJCQlEUk1fREVCVUdfS01TKCJCcmlkZ2Ug Zml4dXAgZmFpbGVkXG4iKTsKIAkJCXJldHVybiAtRUlOVkFMOwogCQl9CiAKQEAgLTM5NiwxNiAr Mzk2LDE2IEBAIG1vZGVfZml4dXAoc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlKQogCQkJ cmV0ID0gZnVuY3MtPmF0b21pY19jaGVjayhlbmNvZGVyLCBjcnRjX3N0YXRlLAogCQkJCQkJICBj b25uX3N0YXRlKTsKIAkJCWlmIChyZXQpIHsKLQkJCQlEUk1fREVCVUdfQVRPTUlDKCJbRU5DT0RF UjolZDolc10gY2hlY2sgZmFpbGVkXG4iLAotCQkJCQkJIGVuY29kZXItPmJhc2UuaWQsIGVuY29k ZXItPm5hbWUpOworCQkJCURSTV9ERUJVR19LTVMoIltFTkNPREVSOiVkOiVzXSBjaGVjayBmYWls ZWRcbiIsCisJCQkJCSAgICAgIGVuY29kZXItPmJhc2UuaWQsIGVuY29kZXItPm5hbWUpOwogCQkJ CXJldHVybiByZXQ7CiAJCQl9CiAJCX0gZWxzZSBpZiAoZnVuY3MgJiYgZnVuY3MtPm1vZGVfZml4 dXApIHsKIAkJCXJldCA9IGZ1bmNzLT5tb2RlX2ZpeHVwKGVuY29kZXIsICZjcnRjX3N0YXRlLT5t b2RlLAogCQkJCQkJJmNydGNfc3RhdGUtPmFkanVzdGVkX21vZGUpOwogCQkJaWYgKCFyZXQpIHsK LQkJCQlEUk1fREVCVUdfQVRPTUlDKCJbRU5DT0RFUjolZDolc10gZml4dXAgZmFpbGVkXG4iLAot CQkJCQkJIGVuY29kZXItPmJhc2UuaWQsIGVuY29kZXItPm5hbWUpOworCQkJCURSTV9ERUJVR19L TVMoIltFTkNPREVSOiVkOiVzXSBmaXh1cCBmYWlsZWRcbiIsCisJCQkJCSAgICAgIGVuY29kZXIt PmJhc2UuaWQsIGVuY29kZXItPm5hbWUpOwogCQkJCXJldHVybiAtRUlOVkFMOwogCQkJfQogCQl9 CkBAIC00MjUsOCArNDI1LDggQEAgbW9kZV9maXh1cChzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAq c3RhdGUpCiAJCXJldCA9IGZ1bmNzLT5tb2RlX2ZpeHVwKGNydGMsICZjcnRjX3N0YXRlLT5tb2Rl LAogCQkJCQkmY3J0Y19zdGF0ZS0+YWRqdXN0ZWRfbW9kZSk7CiAJCWlmICghcmV0KSB7Ci0JCQlE Uk1fREVCVUdfQVRPTUlDKCJbQ1JUQzolZDolc10gZml4dXAgZmFpbGVkXG4iLAotCQkJCQkgY3J0 Yy0+YmFzZS5pZCwgY3J0Yy0+bmFtZSk7CisJCQlEUk1fREVCVUdfS01TKCJbQ1JUQzolZDolc10g Zml4dXAgZmFpbGVkXG4iLAorCQkJCSAgICAgIGNydGMtPmJhc2UuaWQsIGNydGMtPm5hbWUpOwog CQkJcmV0dXJuIC1FSU5WQUw7CiAJCX0KIAl9CkBAIC01NDksOCArNTQ5LDggQEAgZHJtX2F0b21p Y19oZWxwZXJfY2hlY2tfbW9kZXNldChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQkJcmV0dXJu IHJldDsKIAogCQlpZiAoY3J0Y19zdGF0ZS0+ZW5hYmxlICE9IGhhc19jb25uZWN0b3JzKSB7Ci0J CQlEUk1fREVCVUdfQVRPTUlDKCJbQ1JUQzolZDolc10gZW5hYmxlZC9jb25uZWN0b3JzIG1pc21h dGNoXG4iLAotCQkJCQkgY3J0Yy0+YmFzZS5pZCwgY3J0Yy0+bmFtZSk7CisJCQlEUk1fREVCVUdf S01TKCJbQ1JUQzolZDolc10gZW5hYmxlZC9jb25uZWN0b3JzIG1pc21hdGNoXG4iLAorCQkJCSAg ICAgIGNydGMtPmJhc2UuaWQsIGNydGMtPm5hbWUpOwogCiAJCQlyZXR1cm4gLUVJTlZBTDsKIAkJ fQpAQCAtNTk3LDggKzU5Nyw4IEBAIGRybV9hdG9taWNfaGVscGVyX2NoZWNrX3BsYW5lcyhzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJCXJldCA9IGZ1bmNzLT5hdG9taWNfY2hlY2socGxhbmUs IHBsYW5lX3N0YXRlKTsKIAkJaWYgKHJldCkgewotCQkJRFJNX0RFQlVHX0FUT01JQygiW1BMQU5F OiVkOiVzXSBhdG9taWMgZHJpdmVyIGNoZWNrIGZhaWxlZFxuIiwKLQkJCQkJIHBsYW5lLT5iYXNl LmlkLCBwbGFuZS0+bmFtZSk7CisJCQlEUk1fREVCVUdfS01TKCJbUExBTkU6JWQ6JXNdIGF0b21p YyBkcml2ZXIgY2hlY2sgZmFpbGVkXG4iLAorCQkJCSAgICAgIHBsYW5lLT5iYXNlLmlkLCBwbGFu ZS0+bmFtZSk7CiAJCQlyZXR1cm4gcmV0OwogCQl9CiAJfQpAQCAtNjEzLDggKzYxMyw4IEBAIGRy bV9hdG9taWNfaGVscGVyX2NoZWNrX3BsYW5lcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJ CXJldCA9IGZ1bmNzLT5hdG9taWNfY2hlY2soY3J0Yywgc3RhdGUtPmNydGNfc3RhdGVzW2ldKTsK IAkJaWYgKHJldCkgewotCQkJRFJNX0RFQlVHX0FUT01JQygiW0NSVEM6JWQ6JXNdIGF0b21pYyBk cml2ZXIgY2hlY2sgZmFpbGVkXG4iLAotCQkJCQkgY3J0Yy0+YmFzZS5pZCwgY3J0Yy0+bmFtZSk7 CisJCQlEUk1fREVCVUdfS01TKCJbQ1JUQzolZDolc10gYXRvbWljIGRyaXZlciBjaGVjayBmYWls ZWRcbiIsCisJCQkJICAgICAgY3J0Yy0+YmFzZS5pZCwgY3J0Yy0+bmFtZSk7CiAJCQlyZXR1cm4g cmV0OwogCQl9CiAJfQpAQCAtMjM2Nyw4ICsyMzY3LDggQEAgcmV0cnk6CiAJLyogTWFrZSBzdXJl IHdlIGRvbid0IGFjY2lkZW50YWxseSBkbyBhIGZ1bGwgbW9kZXNldC4gKi8KIAlzdGF0ZS0+YWxs b3dfbW9kZXNldCA9IGZhbHNlOwogCWlmICghY3J0Y19zdGF0ZS0+YWN0aXZlKSB7Ci0JCURSTV9E RUJVR19BVE9NSUMoIltDUlRDOiVkXSBkaXNhYmxlZCwgcmVqZWN0aW5nIGxlZ2FjeSBmbGlwXG4i LAotCQkJCSBjcnRjLT5iYXNlLmlkKTsKKwkJRFJNX0RFQlVHX0tNUygiW0NSVEM6JWRdIGRpc2Fi bGVkLCByZWplY3RpbmcgbGVnYWN5IGZsaXBcbiIsCisJCQkgICAgICBjcnRjLT5iYXNlLmlkKTsK IAkJcmV0ID0gLUVJTlZBTDsKIAkJZ290byBmYWlsOwogCX0KLS0gCjIuNy40CgpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBs aXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK