From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH v3 10/13] drm/i915: Convert intel_dp properties to atomic. Date: Mon, 10 Apr 2017 11:07:16 +0200 Message-ID: <1491815239-10685-11-git-send-email-maarten.lankhorst@linux.intel.com> References: <1491815239-10685-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 823EF6E2A1 for ; Mon, 10 Apr 2017 09:07:25 +0000 (UTC) In-Reply-To: <1491815239-10685-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 ZHAuYyAgfCAxMzggKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCB8ICAgMyAtCiAyIGZpbGVzIGNoYW5nZWQsIDI2 IGluc2VydGlvbnMoKyksIDExNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpp bmRleCAzZTUxMjAyZDAzMzguLmExNDYwOTBiNjUxYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZHAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5j CkBAIC0xNjQxLDYgKzE2NDEsOCBAQCBpbnRlbF9kcF9jb21wdXRlX2NvbmZpZyhzdHJ1Y3QgaW50 ZWxfZW5jb2RlciAqZW5jb2RlciwKIAllbnVtIHBvcnQgcG9ydCA9IGRwX3RvX2RpZ19wb3J0KGlu dGVsX2RwKS0+cG9ydDsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YyA9IHRvX2ludGVs X2NydGMocGlwZV9jb25maWctPmJhc2UuY3J0Yyk7CiAJc3RydWN0IGludGVsX2Nvbm5lY3RvciAq aW50ZWxfY29ubmVjdG9yID0gaW50ZWxfZHAtPmF0dGFjaGVkX2Nvbm5lY3RvcjsKKwlzdHJ1Y3Qg aW50ZWxfZGlnaXRhbF9jb25uZWN0b3Jfc3RhdGUgKmludGVsX2Nvbm5fc3RhdGUgPQorCQl0b19p bnRlbF9kaWdpdGFsX2Nvbm5lY3Rvcl9zdGF0ZShjb25uX3N0YXRlKTsKIAlpbnQgbGFuZV9jb3Vu dCwgY2xvY2s7CiAJaW50IG1pbl9sYW5lX2NvdW50ID0gMTsKIAlpbnQgbWF4X2xhbmVfY291bnQg PSBpbnRlbF9kcF9tYXhfbGFuZV9jb3VudChpbnRlbF9kcCk7CkBAIC0xNjY3LDEwICsxNjY5LDEw IEBAIGludGVsX2RwX2NvbXB1dGVfY29uZmlnKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVy LAogCXBpcGVfY29uZmlnLT5oYXNfZHJycyA9IGZhbHNlOwogCWlmIChwb3J0ID09IFBPUlRfQSkK IAkJcGlwZV9jb25maWctPmhhc19hdWRpbyA9IGZhbHNlOwotCWVsc2UgaWYgKGludGVsX2RwLT5m b3JjZV9hdWRpbyA9PSBIRE1JX0FVRElPX0FVVE8pCisJZWxzZSBpZiAoaW50ZWxfY29ubl9zdGF0 ZS0+Zm9yY2VfYXVkaW8gPT0gSERNSV9BVURJT19BVVRPKQogCQlwaXBlX2NvbmZpZy0+aGFzX2F1 ZGlvID0gaW50ZWxfZHAtPmhhc19hdWRpbzsKIAllbHNlCi0JCXBpcGVfY29uZmlnLT5oYXNfYXVk aW8gPSBpbnRlbF9kcC0+Zm9yY2VfYXVkaW8gPT0gSERNSV9BVURJT19PTjsKKwkJcGlwZV9jb25m aWctPmhhc19hdWRpbyA9IGludGVsX2Nvbm5fc3RhdGUtPmZvcmNlX2F1ZGlvID09IEhETUlfQVVE SU9fT047CiAKIAlpZiAoaXNfZWRwKGludGVsX2RwKSAmJiBpbnRlbF9jb25uZWN0b3ItPnBhbmVs LmZpeGVkX21vZGUpIHsKIAkJaW50ZWxfZml4ZWRfcGFuZWxfbW9kZShpbnRlbF9jb25uZWN0b3It PnBhbmVsLmZpeGVkX21vZGUsCkBAIC0xNjg1LDEwICsxNjg3LDEwIEBAIGludGVsX2RwX2NvbXB1 dGVfY29uZmlnKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCiAJCWlmIChIQVNfR01D SF9ESVNQTEFZKGRldl9wcml2KSkKIAkJCWludGVsX2dtY2hfcGFuZWxfZml0dGluZyhpbnRlbF9j cnRjLCBwaXBlX2NvbmZpZywKLQkJCQkJCSBpbnRlbF9jb25uZWN0b3ItPnBhbmVsLmZpdHRpbmdf bW9kZSk7CisJCQkJCQkgaW50ZWxfY29ubl9zdGF0ZS0+cGFuZWwuZml0dGluZ19tb2RlKTsKIAkJ ZWxzZQogCQkJaW50ZWxfcGNoX3BhbmVsX2ZpdHRpbmcoaW50ZWxfY3J0YywgcGlwZV9jb25maWcs Ci0JCQkJCQlpbnRlbF9jb25uZWN0b3ItPnBhbmVsLmZpdHRpbmdfbW9kZSk7CisJCQkJCQlpbnRl bF9jb25uX3N0YXRlLT5wYW5lbC5maXR0aW5nX21vZGUpOwogCX0KIAogCWlmIChhZGp1c3RlZF9t b2RlLT5mbGFncyAmIERSTV9NT0RFX0ZMQUdfREJMQ0xLKQpAQCAtMTc1NSw3ICsxNzU3LDcgQEAg aW50ZWxfZHBfY29tcHV0ZV9jb25maWcoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJ cmV0dXJuIGZhbHNlOwogCiBmb3VuZDoKLQlpZiAoaW50ZWxfZHAtPmNvbG9yX3JhbmdlX2F1dG8p IHsKKwlpZiAoaW50ZWxfY29ubl9zdGF0ZS0+YnJvYWRjYXN0X3JnYiA9PSBJTlRFTF9CUk9BRENB U1RfUkdCX0FVVE8pIHsKIAkJLyoKIAkJICogU2VlOgogCQkgKiBDRUEtODYxLUUgLSA1LjEgRGVm YXVsdCBFbmNvZGluZyBQYXJhbWV0ZXJzCkBAIC0xNzY3LDcgKzE3NjksNyBAQCBpbnRlbF9kcF9j b21wdXRlX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCUhETUlfUVVB TlRJWkFUSU9OX1JBTkdFX0xJTUlURUQ7CiAJfSBlbHNlIHsKIAkJcGlwZV9jb25maWctPmxpbWl0 ZWRfY29sb3JfcmFuZ2UgPQotCQkJaW50ZWxfZHAtPmxpbWl0ZWRfY29sb3JfcmFuZ2U7CisJCQlp bnRlbF9jb25uX3N0YXRlLT5icm9hZGNhc3RfcmdiID09IElOVEVMX0JST0FEQ0FTVF9SR0JfTElN SVRFRDsKIAl9CiAKIAlwaXBlX2NvbmZpZy0+bGFuZV9jb3VudCA9IGxhbmVfY291bnQ7CkBAIC00 NzkwLDEwNCArNDc5Miw2IEBAIHN0YXRpYyBpbnQgaW50ZWxfZHBfZ2V0X21vZGVzKHN0cnVjdCBk cm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiB9CiAKIHN0YXRpYyBpbnQKLWludGVsX2RwX3NldF9w cm9wZXJ0eShzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yLAotCQkgICAgICBzdHJ1Y3Qg ZHJtX3Byb3BlcnR5ICpwcm9wZXJ0eSwKLQkJICAgICAgdWludDY0X3QgdmFsKQotewotCXN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY29ubmVjdG9yLT5kZXYpOwot CXN0cnVjdCBpbnRlbF9jb25uZWN0b3IgKmludGVsX2Nvbm5lY3RvciA9IHRvX2ludGVsX2Nvbm5l Y3Rvcihjb25uZWN0b3IpOwotCXN0cnVjdCBpbnRlbF9lbmNvZGVyICppbnRlbF9lbmNvZGVyID0g aW50ZWxfYXR0YWNoZWRfZW5jb2Rlcihjb25uZWN0b3IpOwotCXN0cnVjdCBpbnRlbF9kcCAqaW50 ZWxfZHAgPSBlbmNfdG9faW50ZWxfZHAoJmludGVsX2VuY29kZXItPmJhc2UpOwotCWludCByZXQ7 Ci0KLQlyZXQgPSBkcm1fb2JqZWN0X3Byb3BlcnR5X3NldF92YWx1ZSgmY29ubmVjdG9yLT5iYXNl LCBwcm9wZXJ0eSwgdmFsKTsKLQlpZiAocmV0KQotCQlyZXR1cm4gcmV0OwotCi0JaWYgKHByb3Bl cnR5ID09IGRldl9wcml2LT5mb3JjZV9hdWRpb19wcm9wZXJ0eSkgewotCQlpbnQgaSA9IHZhbDsK LQkJYm9vbCBoYXNfYXVkaW8sIG9sZF9oYXNfYXVkaW87Ci0JCWludCBvbGRfZm9yY2VfYXVkaW8g PSBpbnRlbF9kcC0+Zm9yY2VfYXVkaW87Ci0KLQkJaWYgKGkgPT0gaW50ZWxfZHAtPmZvcmNlX2F1 ZGlvKQotCQkJcmV0dXJuIDA7Ci0KLQkJaWYgKG9sZF9mb3JjZV9hdWRpbyA9PSBIRE1JX0FVRElP X0FVVE8pCi0JCQlvbGRfaGFzX2F1ZGlvID0gaW50ZWxfZHAtPmhhc19hdWRpbzsKLQkJZWxzZQot CQkJb2xkX2hhc19hdWRpbyA9IG9sZF9mb3JjZV9hdWRpbzsKLQotCQlpbnRlbF9kcC0+Zm9yY2Vf YXVkaW8gPSBpOwotCi0JCWlmIChpID09IEhETUlfQVVESU9fQVVUTykKLQkJCWhhc19hdWRpbyA9 IGludGVsX2RwLT5oYXNfYXVkaW87Ci0JCWVsc2UKLQkJCWhhc19hdWRpbyA9IChpID09IEhETUlf QVVESU9fT04pOwotCi0JCWlmIChoYXNfYXVkaW8gPT0gb2xkX2hhc19hdWRpbykKLQkJCXJldHVy biAwOwotCi0JCWdvdG8gZG9uZTsKLQl9Ci0KLQlpZiAocHJvcGVydHkgPT0gZGV2X3ByaXYtPmJy b2FkY2FzdF9yZ2JfcHJvcGVydHkpIHsKLQkJYm9vbCBvbGRfYXV0byA9IGludGVsX2RwLT5jb2xv cl9yYW5nZV9hdXRvOwotCQlib29sIG9sZF9yYW5nZSA9IGludGVsX2RwLT5saW1pdGVkX2NvbG9y X3JhbmdlOwotCi0JCXN3aXRjaCAodmFsKSB7Ci0JCWNhc2UgSU5URUxfQlJPQURDQVNUX1JHQl9B VVRPOgotCQkJaW50ZWxfZHAtPmNvbG9yX3JhbmdlX2F1dG8gPSB0cnVlOwotCQkJYnJlYWs7Ci0J CWNhc2UgSU5URUxfQlJPQURDQVNUX1JHQl9GVUxMOgotCQkJaW50ZWxfZHAtPmNvbG9yX3Jhbmdl X2F1dG8gPSBmYWxzZTsKLQkJCWludGVsX2RwLT5saW1pdGVkX2NvbG9yX3JhbmdlID0gZmFsc2U7 Ci0JCQlicmVhazsKLQkJY2FzZSBJTlRFTF9CUk9BRENBU1RfUkdCX0xJTUlURUQ6Ci0JCQlpbnRl bF9kcC0+Y29sb3JfcmFuZ2VfYXV0byA9IGZhbHNlOwotCQkJaW50ZWxfZHAtPmxpbWl0ZWRfY29s b3JfcmFuZ2UgPSB0cnVlOwotCQkJYnJlYWs7Ci0JCWRlZmF1bHQ6Ci0JCQlyZXR1cm4gLUVJTlZB TDsKLQkJfQotCi0JCWlmIChvbGRfYXV0byA9PSBpbnRlbF9kcC0+Y29sb3JfcmFuZ2VfYXV0byAm JgotCQkgICAgb2xkX3JhbmdlID09IGludGVsX2RwLT5saW1pdGVkX2NvbG9yX3JhbmdlKQotCQkJ cmV0dXJuIDA7Ci0KLQkJZ290byBkb25lOwotCX0KLQotCWlmIChpc19lZHAoaW50ZWxfZHApICYm Ci0JICAgIHByb3BlcnR5ID09IGNvbm5lY3Rvci0+ZGV2LT5tb2RlX2NvbmZpZy5zY2FsaW5nX21v ZGVfcHJvcGVydHkpIHsKLQkJaWYgKHZhbCA9PSBEUk1fTU9ERV9TQ0FMRV9OT05FKSB7Ci0JCQlE Uk1fREVCVUdfS01TKCJubyBzY2FsaW5nIG5vdCBzdXBwb3J0ZWRcbiIpOwotCQkJcmV0dXJuIC1F SU5WQUw7Ci0JCX0KLQkJaWYgKEhBU19HTUNIX0RJU1BMQVkoZGV2X3ByaXYpICYmCi0JCSAgICB2 YWwgPT0gRFJNX01PREVfU0NBTEVfQ0VOVEVSKSB7Ci0JCQlEUk1fREVCVUdfS01TKCJjZW50ZXJp bmcgbm90IHN1cHBvcnRlZFxuIik7Ci0JCQlyZXR1cm4gLUVJTlZBTDsKLQkJfQotCi0JCWlmIChp bnRlbF9jb25uZWN0b3ItPnBhbmVsLmZpdHRpbmdfbW9kZSA9PSB2YWwpIHsKLQkJCS8qIHRoZSBl RFAgc2NhbGluZyBwcm9wZXJ0eSBpcyBub3QgY2hhbmdlZCAqLwotCQkJcmV0dXJuIDA7Ci0JCX0K LQkJaW50ZWxfY29ubmVjdG9yLT5wYW5lbC5maXR0aW5nX21vZGUgPSB2YWw7Ci0KLQkJZ290byBk b25lOwotCX0KLQotCXJldHVybiAtRUlOVkFMOwotCi1kb25lOgotCWlmIChpbnRlbF9lbmNvZGVy LT5iYXNlLmNydGMpCi0JCWludGVsX2NydGNfcmVzdG9yZV9tb2RlKGludGVsX2VuY29kZXItPmJh c2UuY3J0Yyk7Ci0KLQlyZXR1cm4gMDsKLX0KLQotc3RhdGljIGludAogaW50ZWxfZHBfY29ubmVj dG9yX3JlZ2lzdGVyKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiB7CiAJc3RydWN0 IGludGVsX2RwICppbnRlbF9kcCA9IGludGVsX2F0dGFjaGVkX2RwKGNvbm5lY3Rvcik7CkBAIC01 MDQ1LDE5ICs0OTQ5LDIxIEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9mdW5j cyBpbnRlbF9kcF9jb25uZWN0b3JfZnVuY3MgPSB7CiAJLmRwbXMgPSBkcm1fYXRvbWljX2hlbHBl cl9jb25uZWN0b3JfZHBtcywKIAkuZm9yY2UgPSBpbnRlbF9kcF9mb3JjZSwKIAkuZmlsbF9tb2Rl cyA9IGRybV9oZWxwZXJfcHJvYmVfc2luZ2xlX2Nvbm5lY3Rvcl9tb2RlcywKLQkuc2V0X3Byb3Bl cnR5ID0gaW50ZWxfZHBfc2V0X3Byb3BlcnR5LAotCS5hdG9taWNfZ2V0X3Byb3BlcnR5ID0gaW50 ZWxfY29ubmVjdG9yX2F0b21pY19nZXRfcHJvcGVydHksCisJLnNldF9wcm9wZXJ0eSA9IGRybV9h dG9taWNfaGVscGVyX2Nvbm5lY3Rvcl9zZXRfcHJvcGVydHksCisJLmF0b21pY19nZXRfcHJvcGVy dHkgPSBpbnRlbF9kaWdpdGFsX2Nvbm5lY3Rvcl9hdG9taWNfZ2V0X3Byb3BlcnR5LAorCS5hdG9t aWNfc2V0X3Byb3BlcnR5ID0gaW50ZWxfZGlnaXRhbF9jb25uZWN0b3JfYXRvbWljX3NldF9wcm9w ZXJ0eSwKIAkubGF0ZV9yZWdpc3RlciA9IGludGVsX2RwX2Nvbm5lY3Rvcl9yZWdpc3RlciwKIAku ZWFybHlfdW5yZWdpc3RlciA9IGludGVsX2RwX2Nvbm5lY3Rvcl91bnJlZ2lzdGVyLAogCS5kZXN0 cm95ID0gaW50ZWxfZHBfY29ubmVjdG9yX2Rlc3Ryb3ksCiAJLmF0b21pY19kZXN0cm95X3N0YXRl ID0gZHJtX2F0b21pY19oZWxwZXJfY29ubmVjdG9yX2Rlc3Ryb3lfc3RhdGUsCi0JLmF0b21pY19k dXBsaWNhdGVfc3RhdGUgPSBkcm1fYXRvbWljX2hlbHBlcl9jb25uZWN0b3JfZHVwbGljYXRlX3N0 YXRlLAorCS5hdG9taWNfZHVwbGljYXRlX3N0YXRlID0gaW50ZWxfZGlnaXRhbF9jb25uZWN0b3Jf ZHVwbGljYXRlX3N0YXRlLAogfTsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fY29ubmVjdG9y X2hlbHBlcl9mdW5jcyBpbnRlbF9kcF9jb25uZWN0b3JfaGVscGVyX2Z1bmNzID0gewogCS5kZXRl Y3RfY3R4ID0gaW50ZWxfZHBfZGV0ZWN0LAogCS5nZXRfbW9kZXMgPSBpbnRlbF9kcF9nZXRfbW9k ZXMsCiAJLm1vZGVfdmFsaWQgPSBpbnRlbF9kcF9tb2RlX3ZhbGlkLAorCS5hdG9taWNfY2hlY2sg PSBpbnRlbF9kaWdpdGFsX2Nvbm5lY3Rvcl9hdG9taWNfY2hlY2ssCiB9OwogCiBzdGF0aWMgY29u c3Qgc3RydWN0IGRybV9lbmNvZGVyX2Z1bmNzIGludGVsX2RwX2VuY19mdW5jcyA9IHsKQEAgLTUx NTEsMTkgKzUwNTcsMTkgQEAgYm9vbCBpbnRlbF9kcF9pc19lZHAoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2LCBlbnVtIHBvcnQgcG9ydCkKIHZvaWQKIGludGVsX2RwX2FkZF9wcm9w ZXJ0aWVzKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHAsIHN0cnVjdCBkcm1fY29ubmVjdG9yICpj b25uZWN0b3IpCiB7Ci0Jc3RydWN0IGludGVsX2Nvbm5lY3RvciAqaW50ZWxfY29ubmVjdG9yID0g dG9faW50ZWxfY29ubmVjdG9yKGNvbm5lY3Rvcik7Ci0KIAlpbnRlbF9hdHRhY2hfZm9yY2VfYXVk aW9fcHJvcGVydHkoY29ubmVjdG9yKTsKIAlpbnRlbF9hdHRhY2hfYnJvYWRjYXN0X3JnYl9wcm9w ZXJ0eShjb25uZWN0b3IpOwotCWludGVsX2RwLT5jb2xvcl9yYW5nZV9hdXRvID0gdHJ1ZTsKIAog CWlmIChpc19lZHAoaW50ZWxfZHApKSB7CisJCXN0cnVjdCBpbnRlbF9kaWdpdGFsX2Nvbm5lY3Rv cl9zdGF0ZSAqY29ubl9zdGF0ZSA9CisJCQl0b19pbnRlbF9kaWdpdGFsX2Nvbm5lY3Rvcl9zdGF0 ZShjb25uZWN0b3ItPnN0YXRlKTsKKwogCQlkcm1fbW9kZV9jcmVhdGVfc2NhbGluZ19tb2RlX3By b3BlcnR5KGNvbm5lY3Rvci0+ZGV2KTsKIAkJZHJtX29iamVjdF9hdHRhY2hfcHJvcGVydHkoCiAJ CQkmY29ubmVjdG9yLT5iYXNlLAogCQkJY29ubmVjdG9yLT5kZXYtPm1vZGVfY29uZmlnLnNjYWxp bmdfbW9kZV9wcm9wZXJ0eSwKIAkJCURSTV9NT0RFX1NDQUxFX0FTUEVDVCk7Ci0JCWludGVsX2Nv bm5lY3Rvci0+cGFuZWwuZml0dGluZ19tb2RlID0gRFJNX01PREVfU0NBTEVfQVNQRUNUOworCQlj b25uX3N0YXRlLT5wYW5lbC5maXR0aW5nX21vZGUgPSBEUk1fTU9ERV9TQ0FMRV9BU1BFQ1Q7CiAJ fQogfQogCkBAIC01ODA2LDYgKzU3MTIsNyBAQCBzdGF0aWMgYm9vbCBpbnRlbF9lZHBfaW5pdF9j b25uZWN0b3Ioc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwKIAlzdHJ1Y3QgZHJtX2Rpc3BsYXlf bW9kZSAqc2NhbjsKIAlzdHJ1Y3QgZWRpZCAqZWRpZDsKIAllbnVtIHBpcGUgcGlwZSA9IElOVkFM SURfUElQRTsKKwl1bnNpZ25lZCBhbGxvd2VkX2ZpdHRpbmdzOwogCiAJaWYgKCFpc19lZHAoaW50 ZWxfZHApKQogCQlyZXR1cm4gdHJ1ZTsKQEAgLTU4OTksNyArNTgwNiwxNCBAQCBzdGF0aWMgYm9v bCBpbnRlbF9lZHBfaW5pdF9jb25uZWN0b3Ioc3RydWN0IGludGVsX2RwICppbnRlbF9kcCwKIAkJ CSAgICAgIHBpcGVfbmFtZShwaXBlKSk7CiAJfQogCi0JaW50ZWxfcGFuZWxfaW5pdCgmaW50ZWxf Y29ubmVjdG9yLT5wYW5lbCwgZml4ZWRfbW9kZSwgZG93bmNsb2NrX21vZGUsIDApOworCWFsbG93 ZWRfZml0dGluZ3MgPSAwOworCWlmICghSEFTX0dNQ0hfRElTUExBWShkZXZfcHJpdikpCisJCWFs bG93ZWRfZml0dGluZ3MgfD0gQklUKERSTV9NT0RFX1NDQUxFX0NFTlRFUik7CisJYWxsb3dlZF9m aXR0aW5ncyB8PSBCSVQoRFJNX01PREVfU0NBTEVfQVNQRUNUKTsKKwlhbGxvd2VkX2ZpdHRpbmdz IHw9IEJJVChEUk1fTU9ERV9TQ0FMRV9GVUxMU0NSRUVOKTsKKworCWludGVsX3BhbmVsX2luaXQo JmludGVsX2Nvbm5lY3Rvci0+cGFuZWwsIGZpeGVkX21vZGUsIGRvd25jbG9ja19tb2RlLAorCQkJ IGFsbG93ZWRfZml0dGluZ3MpOwogCWludGVsX2Nvbm5lY3Rvci0+cGFuZWwuYmFja2xpZ2h0LnBv d2VyID0gaW50ZWxfZWRwX2JhY2tsaWdodF9wb3dlcjsKIAlpbnRlbF9wYW5lbF9zZXR1cF9iYWNr bGlnaHQoY29ubmVjdG9yLCBwaXBlKTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBh Njg2ZDExMmRlYTIuLmFmZGEwM2UwYmIwMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAg LTI2MSw3ICsyNjEsNiBAQCBzdHJ1Y3QgaW50ZWxfZW5jb2RlciB7CiBzdHJ1Y3QgaW50ZWxfcGFu ZWwgewogCXN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICpmaXhlZF9tb2RlOwogCXN0cnVjdCBkcm1f ZGlzcGxheV9tb2RlICpkb3duY2xvY2tfbW9kZTsKLQlpbnQgZml0dGluZ19tb2RlOwogCXVuc2ln bmVkIGFsbG93ZWRfZml0dGluZ19tb2RlX21hc2s7CiAKIAkvKiBiYWNrbGlnaHQgKi8KQEAgLTk1 Nyw5ICs5NTYsNyBAQCBzdHJ1Y3QgaW50ZWxfZHAgewogCWJvb2wgZGV0ZWN0X2RvbmU7CiAJYm9v bCBjaGFubmVsX2VxX3N0YXR1czsKIAlib29sIHJlc2V0X2xpbmtfcGFyYW1zOwotCWVudW0gaGRt aV9mb3JjZV9hdWRpbyBmb3JjZV9hdWRpbzsKIAlib29sIGxpbWl0ZWRfY29sb3JfcmFuZ2U7Ci0J Ym9vbCBjb2xvcl9yYW5nZV9hdXRvOwogCXVpbnQ4X3QgZHBjZFtEUF9SRUNFSVZFUl9DQVBfU0la RV07CiAJdWludDhfdCBwc3JfZHBjZFtFRFBfUFNSX1JFQ0VJVkVSX0NBUF9TSVpFXTsKIAl1aW50 OF90IGRvd25zdHJlYW1fcG9ydHNbRFBfTUFYX0RPV05TVFJFQU1fUE9SVFNdOwotLSAKMi43LjQK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=