From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v4 6/9] drm/i915: Convert intel_dp properties to atomic. Date: Wed, 12 Apr 2017 12:50:04 +0200 Message-ID: <1491994207-25965-7-git-send-email-maarten.lankhorst@linux.intel.com> References: <1491994207-25965-1-git-send-email-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id BF1286E6CD for ; Wed, 12 Apr 2017 10:50:38 +0000 (UTC) In-Reply-To: <1491994207-25965-1-git-send-email-maarten.lankhorst@linux.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 List-Id: intel-gfx@lists.freedesktop.org aW50ZWxfZHAgc3VwcG9ydHMgMyBwcm9wZXJ0aWVzLCBzY2FsaW5nIG1vZGUsIGJyb2FkY2FzdCBy Z2IgYW5kCmZvcmNlX2F1ZGlvLiBpbnRlbF9kaWdpdGFsX2Nvbm5lY3RvciBoYW5kbGVzIHRoZSBw bHVtYmluZywKc28gd2Ugb25seSBoYXZlIHRvIGhvb2sgdGhpcyB1cCBpbiBjb21wdXRlX2NvbmZp ZyBhbmQgaW5pdC4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxh bmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHAuYyAgfCAxMzYgKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCB8ICAgMyAtCiAyIGZpbGVzIGNoYW5nZWQsIDI0 IGluc2VydGlvbnMoKyksIDExNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpp bmRleCBiMWEwY2IzYzc5ZDQuLmY5NzZkMTBiNGYwYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5j CkBAIC0xNjMwLDYgKzE2MzAsOCBAQCBpbnRlbF9kcF9jb21wdXRlX2NvbmZpZyhzdHJ1Y3QgaW50 ZWxfZW5jb2RlciAqZW5jb2RlciwKIAllbnVtIHBvcnQgcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGlu dGVsX2RwKS0+cG9ydDsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVs X2NydGMocGlwZV9jb25maWctPmJhc2UuY3J0Yyk7CiAJc3RydWN0IGludGVsX2Nvbm5lY3RvciAq aW50ZWxfY29ubmVjdG9yID0gaW50ZWxfZHAtPmF0dGFjaGVkX2Nvbm5lY3RvcjsKKwlzdHJ1Y3Qg aW50ZWxfZGlnaXRhbF9jb25uZWN0b3Jfc3RhdGUgKmludGVsX2Nvbm5fc3RhdGUgPQorCQl0b19p bnRlbF9kaWdpdGFsX2Nvbm5lY3Rvcl9zdGF0ZShjb25uX3N0YXRlKTsKIAlpbnQgbGFuZV9jb3Vu dCwgY2xvY2s7CiAJaW50IG1pbl9sYW5lX2NvdW50ID0gMTsKIAlpbnQgbWF4X2xhbmVfY291bnQg PSBpbnRlbF9kcF9tYXhfbGFuZV9jb3VudChpbnRlbF9kcCk7CkBAIC0xNjU1LDEwICsxNjU3LDEw IEBAIGludGVsX2RwX2NvbXB1dGVfY29uZmlnKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVy LAogCXBpcGVfY29uZmlnLT5oYXNfZHJycyA9IGZhbHNlOwogCWlmIChwb3J0ID09IFBPUlRfQSkK IAkJcGlwZV9jb25maWctPmhhc19hdWRpbyA9IGZhbHNlOwotCWVsc2UgaWYgKGludGVsX2RwLT5m b3JjZV9hdWRpbyA9PSBIRE1JX0FVRElPX0FVVE8pCisJZWxzZSBpZiAoaW50ZWxfY29ubl9zdGF0 ZS0+Zm9yY2VfYXVkaW8gPT0gSERNSV9BVURJT19BVVRPKQogCQlwaXBlX2NvbmZpZy0+aGFzX2F1 ZGlvID0gaW50ZWxfZHAtPmhhc19hdWRpbzsKIAllbHNlCi0JCXBpcGVfY29uZmlnLT5oYXNfYXVk aW8gPSBpbnRlbF9kcC0+Zm9yY2VfYXVkaW8gPT0gSERNSV9BVURJT19PTjsKKwkJcGlwZV9jb25m aWctPmhhc19hdWRpbyA9IGludGVsX2Nvbm5fc3RhdGUtPmZvcmNlX2F1ZGlvID09IEhETUlfQVVE SU9fT047CiAKIAlpZiAoaXNfZWRwKGludGVsX2RwKSAmJiBpbnRlbF9jb25uZWN0b3ItPnBhbmVs LmZpeGVkX21vZGUpIHsKIAkJaW50ZWxfZml4ZWRfcGFuZWxfbW9kZShpbnRlbF9jb25uZWN0b3It PnBhbmVsLmZpeGVkX21vZGUsCkBAIC0xNjczLDEwICsxNjc1LDEwIEBAIGludGVsX2RwX2NvbXB1 dGVfY29uZmlnKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCiAJCWlmIChIQVNfR01D SF9ESVNQTEFZKGRldl9wcml2KSkKIAkJCWludGVsX2dtY2hfcGFuZWxfZml0dGluZyhpbnRlbF9j cnRjLCBwaXBlX2NvbmZpZywKLQkJCQkJCSBpbnRlbF9jb25uZWN0b3ItPnBhbmVsLmZpdHRpbmdf bW9kZSk7CisJCQkJCQkgY29ubl9zdGF0ZS0+c2NhbGluZ19tb2RlKTsKIAkJZWxzZQogCQkJaW50 ZWxfcGNoX3BhbmVsX2ZpdHRpbmcoaW50ZWxfY3J0YywgcGlwZV9jb25maWcsCi0JCQkJCQlpbnRl bF9jb25uZWN0b3ItPnBhbmVsLmZpdHRpbmdfbW9kZSk7CisJCQkJCQljb25uX3N0YXRlLT5zY2Fs aW5nX21vZGUpOwogCX0KIAogCWlmIChhZGp1c3RlZF9tb2RlLT5mbGFncyAmIERSTV9NT0RFX0ZM QUdfREJMQ0xLKQpAQCAtMTc0NSw3ICsxNzQ3LDcgQEAgaW50ZWxfZHBfY29tcHV0ZV9jb25maWco c3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJcmV0dXJuIGZhbHNlOwogCiBmb3VuZDoK LQlpZiAoaW50ZWxfZHAtPmNvbG9yX3JhbmdlX2F1dG8pIHsKKwlpZiAoaW50ZWxfY29ubl9zdGF0 ZS0+YnJvYWRjYXN0X3JnYiA9PSBJTlRFTF9CUk9BRENBU1RfUkdCX0FVVE8pIHsKIAkJLyoKIAkJ ICogU2VlOgogCQkgKiBDRUEtODYxLUUgLSA1LjEgRGVmYXVsdCBFbmNvZGluZyBQYXJhbWV0ZXJz CkBAIC0xNzU3LDcgKzE3NTksNyBAQCBpbnRlbF9kcF9jb21wdXRlX2NvbmZpZyhzdHJ1Y3QgaW50 ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCUhETUlfUVVBTlRJWkFUSU9OX1JBTkdFX0xJTUlURUQ7 CiAJfSBlbHNlIHsKIAkJcGlwZV9jb25maWctPmxpbWl0ZWRfY29sb3JfcmFuZ2UgPQotCQkJaW50 ZWxfZHAtPmxpbWl0ZWRfY29sb3JfcmFuZ2U7CisJCQlpbnRlbF9jb25uX3N0YXRlLT5icm9hZGNh c3RfcmdiID09IElOVEVMX0JST0FEQ0FTVF9SR0JfTElNSVRFRDsKIAl9CiAKIAlwaXBlX2NvbmZp Zy0+bGFuZV9jb3VudCA9IGxhbmVfY291bnQ7CkBAIC00NzgxLDEwNCArNDc4Myw2IEBAIHN0YXRp YyBpbnQgaW50ZWxfZHBfZ2V0X21vZGVzKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3Ip CiB9CiAKIHN0YXRpYyBpbnQKLWludGVsX2RwX3NldF9wcm9wZXJ0eShzdHJ1Y3QgZHJtX2Nvbm5l Y3RvciAqY29ubmVjdG9yLAotCQkgICAgICBzdHJ1Y3QgZHJtX3Byb3BlcnR5ICpwcm9wZXJ0eSwK LQkJICAgICAgdWludDY0X3QgdmFsKQotewotCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdiA9IHRvX2k5MTUoY29ubmVjdG9yLT5kZXYpOwotCXN0cnVjdCBpbnRlbF9jb25uZWN0b3Ig KmludGVsX2Nvbm5lY3RvciA9IHRvX2ludGVsX2Nvbm5lY3Rvcihjb25uZWN0b3IpOwotCXN0cnVj dCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyID0gaW50ZWxfYXR0YWNoZWRfZW5jb2Rlcihj b25uZWN0b3IpOwotCXN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAgPSBlbmNfdG9faW50ZWxfZHAo JmludGVsX2VuY29kZXItPmJhc2UpOwotCWludCByZXQ7Ci0KLQlyZXQgPSBkcm1fb2JqZWN0X3By b3BlcnR5X3NldF92YWx1ZSgmY29ubmVjdG9yLT5iYXNlLCBwcm9wZXJ0eSwgdmFsKTsKLQlpZiAo cmV0KQotCQlyZXR1cm4gcmV0OwotCi0JaWYgKHByb3BlcnR5ID09IGRldl9wcml2LT5mb3JjZV9h dWRpb19wcm9wZXJ0eSkgewotCQlpbnQgaSA9IHZhbDsKLQkJYm9vbCBoYXNfYXVkaW8sIG9sZF9o YXNfYXVkaW87Ci0JCWludCBvbGRfZm9yY2VfYXVkaW8gPSBpbnRlbF9kcC0+Zm9yY2VfYXVkaW87 Ci0KLQkJaWYgKGkgPT0gaW50ZWxfZHAtPmZvcmNlX2F1ZGlvKQotCQkJcmV0dXJuIDA7Ci0KLQkJ aWYgKG9sZF9mb3JjZV9hdWRpbyA9PSBIRE1JX0FVRElPX0FVVE8pCi0JCQlvbGRfaGFzX2F1ZGlv ID0gaW50ZWxfZHAtPmhhc19hdWRpbzsKLQkJZWxzZQotCQkJb2xkX2hhc19hdWRpbyA9IG9sZF9m b3JjZV9hdWRpbzsKLQotCQlpbnRlbF9kcC0+Zm9yY2VfYXVkaW8gPSBpOwotCi0JCWlmIChpID09 IEhETUlfQVVESU9fQVVUTykKLQkJCWhhc19hdWRpbyA9IGludGVsX2RwLT5oYXNfYXVkaW87Ci0J CWVsc2UKLQkJCWhhc19hdWRpbyA9IChpID09IEhETUlfQVVESU9fT04pOwotCi0JCWlmIChoYXNf YXVkaW8gPT0gb2xkX2hhc19hdWRpbykKLQkJCXJldHVybiAwOwotCi0JCWdvdG8gZG9uZTsKLQl9 Ci0KLQlpZiAocHJvcGVydHkgPT0gZGV2X3ByaXYtPmJyb2FkY2FzdF9yZ2JfcHJvcGVydHkpIHsK LQkJYm9vbCBvbGRfYXV0byA9IGludGVsX2RwLT5jb2xvcl9yYW5nZV9hdXRvOwotCQlib29sIG9s ZF9yYW5nZSA9IGludGVsX2RwLT5saW1pdGVkX2NvbG9yX3JhbmdlOwotCi0JCXN3aXRjaCAodmFs KSB7Ci0JCWNhc2UgSU5URUxfQlJPQURDQVNUX1JHQl9BVVRPOgotCQkJaW50ZWxfZHAtPmNvbG9y X3JhbmdlX2F1dG8gPSB0cnVlOwotCQkJYnJlYWs7Ci0JCWNhc2UgSU5URUxfQlJPQURDQVNUX1JH Ql9GVUxMOgotCQkJaW50ZWxfZHAtPmNvbG9yX3JhbmdlX2F1dG8gPSBmYWxzZTsKLQkJCWludGVs X2RwLT5saW1pdGVkX2NvbG9yX3JhbmdlID0gZmFsc2U7Ci0JCQlicmVhazsKLQkJY2FzZSBJTlRF TF9CUk9BRENBU1RfUkdCX0xJTUlURUQ6Ci0JCQlpbnRlbF9kcC0+Y29sb3JfcmFuZ2VfYXV0byA9 IGZhbHNlOwotCQkJaW50ZWxfZHAtPmxpbWl0ZWRfY29sb3JfcmFuZ2UgPSB0cnVlOwotCQkJYnJl YWs7Ci0JCWRlZmF1bHQ6Ci0JCQlyZXR1cm4gLUVJTlZBTDsKLQkJfQotCi0JCWlmIChvbGRfYXV0 byA9PSBpbnRlbF9kcC0+Y29sb3JfcmFuZ2VfYXV0byAmJgotCQkgICAgb2xkX3JhbmdlID09IGlu dGVsX2RwLT5saW1pdGVkX2NvbG9yX3JhbmdlKQotCQkJcmV0dXJuIDA7Ci0KLQkJZ290byBkb25l OwotCX0KLQotCWlmIChpc19lZHAoaW50ZWxfZHApICYmCi0JICAgIHByb3BlcnR5ID09IGNvbm5l Y3Rvci0+ZGV2LT5tb2RlX2NvbmZpZy5zY2FsaW5nX21vZGVfcHJvcGVydHkpIHsKLQkJaWYgKHZh bCA9PSBEUk1fTU9ERV9TQ0FMRV9OT05FKSB7Ci0JCQlEUk1fREVCVUdfS01TKCJubyBzY2FsaW5n IG5vdCBzdXBwb3J0ZWRcbiIpOwotCQkJcmV0dXJuIC1FSU5WQUw7Ci0JCX0KLQkJaWYgKEhBU19H TUNIX0RJU1BMQVkoZGV2X3ByaXYpICYmCi0JCSAgICB2YWwgPT0gRFJNX01PREVfU0NBTEVfQ0VO VEVSKSB7Ci0JCQlEUk1fREVCVUdfS01TKCJjZW50ZXJpbmcgbm90IHN1cHBvcnRlZFxuIik7Ci0J CQlyZXR1cm4gLUVJTlZBTDsKLQkJfQotCi0JCWlmIChpbnRlbF9jb25uZWN0b3ItPnBhbmVsLmZp dHRpbmdfbW9kZSA9PSB2YWwpIHsKLQkJCS8qIHRoZSBlRFAgc2NhbGluZyBwcm9wZXJ0eSBpcyBu b3QgY2hhbmdlZCAqLwotCQkJcmV0dXJuIDA7Ci0JCX0KLQkJaW50ZWxfY29ubmVjdG9yLT5wYW5l bC5maXR0aW5nX21vZGUgPSB2YWw7Ci0KLQkJZ290byBkb25lOwotCX0KLQotCXJldHVybiAtRUlO VkFMOwotCi1kb25lOgotCWlmIChpbnRlbF9lbmNvZGVyLT5iYXNlLmNydGMpCi0JCWludGVsX2Ny dGNfcmVzdG9yZV9tb2RlKGludGVsX2VuY29kZXItPmJhc2UuY3J0Yyk7Ci0KLQlyZXR1cm4gMDsK LX0KLQotc3RhdGljIGludAogaW50ZWxfZHBfY29ubmVjdG9yX3JlZ2lzdGVyKHN0cnVjdCBkcm1f Y29ubmVjdG9yICpjb25uZWN0b3IpCiB7CiAJc3RydWN0IGludGVsX2RwICppbnRlbF9kcCA9IGlu dGVsX2F0dGFjaGVkX2RwKGNvbm5lY3Rvcik7CkBAIC01MDM2LDE5ICs0OTQwLDIxIEBAIHN0YXRp YyBjb25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9mdW5jcyBpbnRlbF9kcF9jb25uZWN0b3JfZnVu Y3MgPSB7CiAJLmRwbXMgPSBkcm1fYXRvbWljX2hlbHBlcl9jb25uZWN0b3JfZHBtcywKIAkuZm9y Y2UgPSBpbnRlbF9kcF9mb3JjZSwKIAkuZmlsbF9tb2RlcyA9IGRybV9oZWxwZXJfcHJvYmVfc2lu Z2xlX2Nvbm5lY3Rvcl9tb2RlcywKLQkuc2V0X3Byb3BlcnR5ID0gaW50ZWxfZHBfc2V0X3Byb3Bl cnR5LAotCS5hdG9taWNfZ2V0X3Byb3BlcnR5ID0gaW50ZWxfY29ubmVjdG9yX2F0b21pY19nZXRf cHJvcGVydHksCisJLnNldF9wcm9wZXJ0eSA9IGRybV9hdG9taWNfaGVscGVyX2Nvbm5lY3Rvcl9z ZXRfcHJvcGVydHksCisJLmF0b21pY19nZXRfcHJvcGVydHkgPSBpbnRlbF9kaWdpdGFsX2Nvbm5l Y3Rvcl9hdG9taWNfZ2V0X3Byb3BlcnR5LAorCS5hdG9taWNfc2V0X3Byb3BlcnR5ID0gaW50ZWxf ZGlnaXRhbF9jb25uZWN0b3JfYXRvbWljX3NldF9wcm9wZXJ0eSwKIAkubGF0ZV9yZWdpc3RlciA9 IGludGVsX2RwX2Nvbm5lY3Rvcl9yZWdpc3RlciwKIAkuZWFybHlfdW5yZWdpc3RlciA9IGludGVs X2RwX2Nvbm5lY3Rvcl91bnJlZ2lzdGVyLAogCS5kZXN0cm95ID0gaW50ZWxfZHBfY29ubmVjdG9y X2Rlc3Ryb3ksCiAJLmF0b21pY19kZXN0cm95X3N0YXRlID0gZHJtX2F0b21pY19oZWxwZXJfY29u bmVjdG9yX2Rlc3Ryb3lfc3RhdGUsCi0JLmF0b21pY19kdXBsaWNhdGVfc3RhdGUgPSBkcm1fYXRv bWljX2hlbHBlcl9jb25uZWN0b3JfZHVwbGljYXRlX3N0YXRlLAorCS5hdG9taWNfZHVwbGljYXRl X3N0YXRlID0gaW50ZWxfZGlnaXRhbF9jb25uZWN0b3JfZHVwbGljYXRlX3N0YXRlLAogfTsKIAog c3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fY29ubmVjdG9yX2hlbHBlcl9mdW5jcyBpbnRlbF9kcF9j b25uZWN0b3JfaGVscGVyX2Z1bmNzID0gewogCS5kZXRlY3RfY3R4ID0gaW50ZWxfZHBfZGV0ZWN0 LAogCS5nZXRfbW9kZXMgPSBpbnRlbF9kcF9nZXRfbW9kZXMsCiAJLm1vZGVfdmFsaWQgPSBpbnRl bF9kcF9tb2RlX3ZhbGlkLAorCS5hdG9taWNfY2hlY2sgPSBpbnRlbF9kaWdpdGFsX2Nvbm5lY3Rv cl9hdG9taWNfY2hlY2ssCiB9OwogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9lbmNvZGVyX2Z1 bmNzIGludGVsX2RwX2VuY19mdW5jcyA9IHsKQEAgLTUxNDIsMTEgKzUwNDgsOCBAQCBib29sIGlu dGVsX2RwX2lzX2VkcChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGVudW0gcG9y dCBwb3J0KQogc3RhdGljIHZvaWQKIGludGVsX2RwX2FkZF9wcm9wZXJ0aWVzKHN0cnVjdCBpbnRl bF9kcCAqaW50ZWxfZHAsIHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiB7Ci0Jc3Ry dWN0IGludGVsX2Nvbm5lY3RvciAqaW50ZWxfY29ubmVjdG9yID0gdG9faW50ZWxfY29ubmVjdG9y KGNvbm5lY3Rvcik7Ci0KIAlpbnRlbF9hdHRhY2hfZm9yY2VfYXVkaW9fcHJvcGVydHkoY29ubmVj dG9yKTsKIAlpbnRlbF9hdHRhY2hfYnJvYWRjYXN0X3JnYl9wcm9wZXJ0eShjb25uZWN0b3IpOwot CWludGVsX2RwLT5jb2xvcl9yYW5nZV9hdXRvID0gdHJ1ZTsKIAogCWlmIChpc19lZHAoaW50ZWxf ZHApKSB7CiAJCWRybV9tb2RlX2NyZWF0ZV9zY2FsaW5nX21vZGVfcHJvcGVydHkoY29ubmVjdG9y LT5kZXYpOwpAQCAtNTE1NCw3ICs1MDU3LDggQEAgaW50ZWxfZHBfYWRkX3Byb3BlcnRpZXMoc3Ry dWN0IGludGVsX2RwICppbnRlbF9kcCwgc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3QKIAkJ CSZjb25uZWN0b3ItPmJhc2UsCiAJCQljb25uZWN0b3ItPmRldi0+bW9kZV9jb25maWcuc2NhbGlu Z19tb2RlX3Byb3BlcnR5LAogCQkJRFJNX01PREVfU0NBTEVfQVNQRUNUKTsKLQkJaW50ZWxfY29u bmVjdG9yLT5wYW5lbC5maXR0aW5nX21vZGUgPSBEUk1fTU9ERV9TQ0FMRV9BU1BFQ1Q7CisKKwkJ Y29ubmVjdG9yLT5zdGF0ZS0+c2NhbGluZ19tb2RlID0gRFJNX01PREVfU0NBTEVfQVNQRUNUOwog CX0KIH0KIApAQCAtNTc5Nyw2ICs1NzAxLDcgQEAgc3RhdGljIGJvb2wgaW50ZWxfZWRwX2luaXRf Y29ubmVjdG9yKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsCiAJc3RydWN0IGRybV9kaXNwbGF5 X21vZGUgKnNjYW47CiAJc3RydWN0IGVkaWQgKmVkaWQ7CiAJZW51bSBwaXBlIHBpcGUgPSBJTlZB TElEX1BJUEU7CisJdW5zaWduZWQgYWxsb3dlZF9maXR0aW5nczsKIAogCWlmICghaXNfZWRwKGlu dGVsX2RwKSkKIAkJcmV0dXJuIHRydWU7CkBAIC01ODkwLDcgKzU3OTUsMTQgQEAgc3RhdGljIGJv b2wgaW50ZWxfZWRwX2luaXRfY29ubmVjdG9yKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsCiAJ CQkgICAgICBwaXBlX25hbWUocGlwZSkpOwogCX0KIAotCWludGVsX3BhbmVsX2luaXQoJmludGVs X2Nvbm5lY3Rvci0+cGFuZWwsIGZpeGVkX21vZGUsIGRvd25jbG9ja19tb2RlLCAwKTsKKwlhbGxv d2VkX2ZpdHRpbmdzID0gMDsKKwlpZiAoIUhBU19HTUNIX0RJU1BMQVkoZGV2X3ByaXYpKQorCQlh bGxvd2VkX2ZpdHRpbmdzIHw9IEJJVChEUk1fTU9ERV9TQ0FMRV9DRU5URVIpOworCWFsbG93ZWRf Zml0dGluZ3MgfD0gQklUKERSTV9NT0RFX1NDQUxFX0FTUEVDVCk7CisJYWxsb3dlZF9maXR0aW5n cyB8PSBCSVQoRFJNX01PREVfU0NBTEVfRlVMTFNDUkVFTik7CisKKwlpbnRlbF9wYW5lbF9pbml0 KCZpbnRlbF9jb25uZWN0b3ItPnBhbmVsLCBmaXhlZF9tb2RlLCBkb3duY2xvY2tfbW9kZSwKKwkJ CSBhbGxvd2VkX2ZpdHRpbmdzKTsKIAlpbnRlbF9jb25uZWN0b3ItPnBhbmVsLmJhY2tsaWdodC5w b3dlciA9IGludGVsX2VkcF9iYWNrbGlnaHRfcG93ZXI7CiAJaW50ZWxfcGFuZWxfc2V0dXBfYmFj a2xpZ2h0KGNvbm5lY3RvciwgcGlwZSk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXgg NGRmOWU0NTMxZWRjLi45ZjBmODAyMDM0NzIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBA IC0yNjEsNyArMjYxLDYgQEAgc3RydWN0IGludGVsX2VuY29kZXIgewogc3RydWN0IGludGVsX3Bh bmVsIHsKIAlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqZml4ZWRfbW9kZTsKIAlzdHJ1Y3QgZHJt X2Rpc3BsYXlfbW9kZSAqZG93bmNsb2NrX21vZGU7Ci0JaW50IGZpdHRpbmdfbW9kZTsKIAl1bnNp Z25lZCBhbGxvd2VkX2ZpdHRpbmdfbW9kZV9tYXNrOwogCiAJLyogYmFja2xpZ2h0ICovCkBAIC05 NTIsOSArOTUxLDcgQEAgc3RydWN0IGludGVsX2RwIHsKIAlib29sIGRldGVjdF9kb25lOwogCWJv b2wgY2hhbm5lbF9lcV9zdGF0dXM7CiAJYm9vbCByZXNldF9saW5rX3BhcmFtczsKLQllbnVtIGhk bWlfZm9yY2VfYXVkaW8gZm9yY2VfYXVkaW87CiAJYm9vbCBsaW1pdGVkX2NvbG9yX3JhbmdlOwot CWJvb2wgY29sb3JfcmFuZ2VfYXV0bzsKIAl1aW50OF90IGRwY2RbRFBfUkVDRUlWRVJfQ0FQX1NJ WkVdOwogCXVpbnQ4X3QgcHNyX2RwY2RbRURQX1BTUl9SRUNFSVZFUl9DQVBfU0laRV07CiAJdWlu dDhfdCBkb3duc3RyZWFtX3BvcnRzW0RQX01BWF9ET1dOU1RSRUFNX1BPUlRTXTsKLS0gCjIuNy40 CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1n ZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK