From: Maarten Lankhorst Subject: [PATCH 1/3] drm/i915: Convert intel_tv connector properties to atomic. Date: Thu, 9 Mar 2017 14:06:15 +0100 Message-ID: <1489064777-5460-2-git-send-email-maarten.lankhorst@linux.intel.com> References: <1489064777-5460-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 [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0ABE46EC28 for ; Thu, 9 Mar 2017 13:06:23 +0000 (UTC) In-Reply-To: <1489064777-5460-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 QXMgYSBwcm9vZiBvZiBjb25jZXB0LCBmaXJzdCB0cnkgdG8gY29udmVydCBpbnRlbF90diwgd2hp Y2ggaXMgYSByYXJlbHkKdXNlZCBjb25uZWN0b3IuIEl0IGhhcyA1IHByb3BlcnRpZXMsIHR2IGZv cm1hdCBhbmQgNCBtYXJnaW5zLgoKSSdtIGxlc3MgY2VydGFpbiBhYm91dCB0aGUgc3RhdGUgYmVo YXZpb3IgaXRzZWxmLCBzaG91bGQgd2UgcGFzcyBhIHNpemUKcGFyYW1ldGVyIHRvIGludGVsX2Nv bm5lY3Rvcl9hbGxvYyBpbnN0ZWFkLCBzbyBkdXBsaWNhdGVfc3RhdGUKY2FuIGJlIGRvbmUgZ2xv YmFsbHkgaWYgaXQgY2FuIGJlIGJsaW5kbHkgY29waWVkPwoKQ2FuIHdlIGFsc28gaGF2ZSBhIGF0 b21pY19jaGVjayBmdW5jdGlvbiBmb3IgY29ubmVjdG9ycywgc28gdGhlCmNydGNfc3RhdGUtPmNv bm5lY3RvcnNfY2hhbmdlZCBjYW4gYmUgc2V0IHRoZXJlPyBJdCB3b3VsZCBiZSBjbGVhbmVyCmFu ZCBtb3JlIGF0b21pYy1saWtlLgoKVG8gbWF0Y2ggdGhlIGxlZ2FjeSBiZWhhdmlvciwgZm9ybWF0 IGNhbiBiZSBjaGFuZ2VkIGJ5IHByb2JpbmcganVzdCBsaWtlCmluIGxlZ2FjeSBtb2RlLgoKU2ln bmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4Lmlu dGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF90di5jIHwgMjM4ICsrKysr KysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMzYg aW5zZXJ0aW9ucygrKSwgMTAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX3R2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF90di5jCmlu ZGV4IDZlZDFhM2NlNDdiNy4uMGZiMWQ4NjIxZmU4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF90di5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3R2LmMK QEAgLTQ4LDggKzQ4LDYgQEAgc3RydWN0IGludGVsX3R2IHsKIAlzdHJ1Y3QgaW50ZWxfZW5jb2Rl ciBiYXNlOwogCiAJaW50IHR5cGU7Ci0JY29uc3QgY2hhciAqdHZfZm9ybWF0OwotCWludCBtYXJn aW5bNF07CiAJdTMyIHNhdmVfVFZfSF9DVExfMTsKIAl1MzIgc2F2ZV9UVl9IX0NUTF8yOwogCXUz MiBzYXZlX1RWX0hfQ1RMXzM7CkBAIC04NSw2ICs4MywxNiBAQCBzdHJ1Y3QgaW50ZWxfdHYgewog CXUzMiBzYXZlX1RWX0NUTDsKIH07CiAKK3N0cnVjdCBpbnRlbF90dl9jb25uZWN0b3Jfc3RhdGUg eworCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlIGJhc2U7CisKKwlpbnQgZm9ybWF0OworCWlu dCBtYXJnaW5bNF07Cit9OworCisjZGVmaW5lIHRvX2ludGVsX3R2X2Nvbm5lY3Rvcl9zdGF0ZShz dGF0ZSkgXAorCWNvbnRhaW5lcl9vZigoc3RhdGUpLCBzdHJ1Y3QgaW50ZWxfdHZfY29ubmVjdG9y X3N0YXRlLCBiYXNlKQorCiBzdHJ1Y3QgdmlkZW9fbGV2ZWxzIHsKIAl1MTYgYmxhbmssIGJsYWNr OwogCXU4IGJ1cnN0OwpAQCAtODczLDMyICs4ODEsMTggQEAgaW50ZWxfZGlzYWJsZV90dihzdHJ1 Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAlJOTE1X1dSSVRFKFRWX0NUTCwgSTkxNV9SRUFE KFRWX0NUTCkgJiB+VFZfRU5DX0VOQUJMRSk7CiB9CiAKLXN0YXRpYyBjb25zdCBzdHJ1Y3QgdHZf bW9kZSAqCi1pbnRlbF90dl9tb2RlX2xvb2t1cChjb25zdCBjaGFyICp0dl9mb3JtYXQpCitzdGF0 aWMgY29uc3Qgc3RydWN0IHR2X21vZGUgKmludGVsX3R2X21vZGVfZmluZChzdHJ1Y3QgZHJtX2Nv bm5lY3Rvcl9zdGF0ZSAqY29ubl9zdGF0ZSkKIHsKLQlpbnQgaTsKKwlpbnQgZm9ybWF0ID0gdG9f aW50ZWxfdHZfY29ubmVjdG9yX3N0YXRlKGNvbm5fc3RhdGUpLT5mb3JtYXQ7CiAKLQlmb3IgKGkg PSAwOyBpIDwgQVJSQVlfU0laRSh0dl9tb2Rlcyk7IGkrKykgewotCQljb25zdCBzdHJ1Y3QgdHZf bW9kZSAqdHZfbW9kZSA9ICZ0dl9tb2Rlc1tpXTsKLQotCQlpZiAoIXN0cmNtcCh0dl9mb3JtYXQs IHR2X21vZGUtPm5hbWUpKQotCQkJcmV0dXJuIHR2X21vZGU7Ci0JfQotCXJldHVybiBOVUxMOwot fQotCi1zdGF0aWMgY29uc3Qgc3RydWN0IHR2X21vZGUgKgotaW50ZWxfdHZfbW9kZV9maW5kKHN0 cnVjdCBpbnRlbF90diAqaW50ZWxfdHYpCi17Ci0JcmV0dXJuIGludGVsX3R2X21vZGVfbG9va3Vw KGludGVsX3R2LT50dl9mb3JtYXQpOworCXJldHVybiAmdHZfbW9kZXNbZm9ybWF0XTsKIH0KIAog c3RhdGljIGVudW0gZHJtX21vZGVfc3RhdHVzCiBpbnRlbF90dl9tb2RlX3ZhbGlkKHN0cnVjdCBk cm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAJCSAgICBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAq bW9kZSkKIHsKLQlzdHJ1Y3QgaW50ZWxfdHYgKmludGVsX3R2ID0gaW50ZWxfYXR0YWNoZWRfdHYo Y29ubmVjdG9yKTsKLQljb25zdCBzdHJ1Y3QgdHZfbW9kZSAqdHZfbW9kZSA9IGludGVsX3R2X21v ZGVfZmluZChpbnRlbF90dik7CisJY29uc3Qgc3RydWN0IHR2X21vZGUgKnR2X21vZGUgPSBpbnRl bF90dl9tb2RlX2ZpbmQoY29ubmVjdG9yLT5zdGF0ZSk7CiAJaW50IG1heF9kb3RjbGsgPSB0b19p OTE1KGNvbm5lY3Rvci0+ZGV2KS0+bWF4X2RvdGNsa19mcmVxOwogCiAJaWYgKG1vZGUtPmNsb2Nr ID4gbWF4X2RvdGNsaykKQEAgLTkyNSw4ICs5MTksNyBAQCBpbnRlbF90dl9jb21wdXRlX2NvbmZp ZyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAkJCXN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpwaXBlX2NvbmZpZywKIAkJCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0 YXRlKQogewotCXN0cnVjdCBpbnRlbF90diAqaW50ZWxfdHYgPSBlbmNfdG9fdHYoZW5jb2Rlcik7 Ci0JY29uc3Qgc3RydWN0IHR2X21vZGUgKnR2X21vZGUgPSBpbnRlbF90dl9tb2RlX2ZpbmQoaW50 ZWxfdHYpOworCWNvbnN0IHN0cnVjdCB0dl9tb2RlICp0dl9tb2RlID0gaW50ZWxfdHZfbW9kZV9m aW5kKGNvbm5fc3RhdGUpOwogCiAJaWYgKCF0dl9tb2RlKQogCQlyZXR1cm4gZmFsc2U7CkBAIC0x MDMyLDcgKzEwMjUsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF90dl9wcmVfZW5hYmxlKHN0cnVjdCBp bnRlbF9lbmNvZGVyICplbmNvZGVyLAogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diA9IHRvX2k5MTUoZW5jb2Rlci0+YmFzZS5kZXYpOwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRl bF9jcnRjID0gdG9faW50ZWxfY3J0YyhlbmNvZGVyLT5iYXNlLmNydGMpOwogCXN0cnVjdCBpbnRl bF90diAqaW50ZWxfdHYgPSBlbmNfdG9fdHYoZW5jb2Rlcik7Ci0JY29uc3Qgc3RydWN0IHR2X21v ZGUgKnR2X21vZGUgPSBpbnRlbF90dl9tb2RlX2ZpbmQoaW50ZWxfdHYpOworCWNvbnN0IHN0cnVj dCB0dl9tb2RlICp0dl9tb2RlID0gaW50ZWxfdHZfbW9kZV9maW5kKGNvbm5fc3RhdGUpOwogCXUz MiB0dl9jdGw7CiAJdTMyIHNjY3RsMSwgc2NjdGwyLCBzY2N0bDM7CiAJaW50IGksIGo7CkBAIC0x MDQxLDYgKzEwMzQsOCBAQCBzdGF0aWMgdm9pZCBpbnRlbF90dl9wcmVfZW5hYmxlKHN0cnVjdCBp bnRlbF9lbmNvZGVyICplbmNvZGVyLAogCWJvb2wgYnVyc3RfZW5hOwogCWludCB4cG9zID0gMHgw LCB5cG9zID0gMHgwOwogCXVuc2lnbmVkIGludCB4c2l6ZSwgeXNpemU7CisJc3RydWN0IGludGVs X3R2X2Nvbm5lY3Rvcl9zdGF0ZSAqdHZfc3RhdGUgPQorCQl0b19pbnRlbF90dl9jb25uZWN0b3Jf c3RhdGUoY29ubl9zdGF0ZSk7CiAKIAlpZiAoIXR2X21vZGUpCiAJCXJldHVybjsJLyogY2FuJ3Qg aGFwcGVuIChtb2RlX3ByZXBhcmUgcHJldmVudHMgdGhpcykgKi8KQEAgLTExMzUsMTIgKzExMzAs MTIgQEAgc3RhdGljIHZvaWQgaW50ZWxfdHZfcHJlX2VuYWJsZShzdHJ1Y3QgaW50ZWxfZW5jb2Rl ciAqZW5jb2RlciwKIAllbHNlCiAJCXlzaXplID0gMip0dl9tb2RlLT5uYnJfZW5kICsgMTsKIAot CXhwb3MgKz0gaW50ZWxfdHYtPm1hcmdpbltUVl9NQVJHSU5fTEVGVF07Ci0JeXBvcyArPSBpbnRl bF90di0+bWFyZ2luW1RWX01BUkdJTl9UT1BdOwotCXhzaXplIC09IChpbnRlbF90di0+bWFyZ2lu W1RWX01BUkdJTl9MRUZUXSArCi0JCSAgaW50ZWxfdHYtPm1hcmdpbltUVl9NQVJHSU5fUklHSFRd KTsKLQl5c2l6ZSAtPSAoaW50ZWxfdHYtPm1hcmdpbltUVl9NQVJHSU5fVE9QXSArCi0JCSAgaW50 ZWxfdHYtPm1hcmdpbltUVl9NQVJHSU5fQk9UVE9NXSk7CisJeHBvcyArPSB0dl9zdGF0ZS0+bWFy Z2luW1RWX01BUkdJTl9MRUZUXTsKKwl5cG9zICs9IHR2X3N0YXRlLT5tYXJnaW5bVFZfTUFSR0lO X1RPUF07CisJeHNpemUgLT0gKHR2X3N0YXRlLT5tYXJnaW5bVFZfTUFSR0lOX0xFRlRdICsKKwkJ ICB0dl9zdGF0ZS0+bWFyZ2luW1RWX01BUkdJTl9SSUdIVF0pOworCXlzaXplIC09ICh0dl9zdGF0 ZS0+bWFyZ2luW1RWX01BUkdJTl9UT1BdICsKKwkJICB0dl9zdGF0ZS0+bWFyZ2luW1RWX01BUkdJ Tl9CT1RUT01dKTsKIAlJOTE1X1dSSVRFKFRWX1dJTl9QT1MsICh4cG9zPDwxNil8eXBvcyk7CiAJ STkxNV9XUklURShUVl9XSU5fU0laRSwgKHhzaXplPDwxNil8eXNpemUpOwogCkBAIC0xMjg4LDcg KzEyODMsNyBAQCBpbnRlbF90dl9kZXRlY3RfdHlwZShzdHJ1Y3QgaW50ZWxfdHYgKmludGVsX3R2 LAogc3RhdGljIHZvaWQgaW50ZWxfdHZfZmluZF9iZXR0ZXJfZm9ybWF0KHN0cnVjdCBkcm1fY29u bmVjdG9yICpjb25uZWN0b3IpCiB7CiAJc3RydWN0IGludGVsX3R2ICppbnRlbF90diA9IGludGVs X2F0dGFjaGVkX3R2KGNvbm5lY3Rvcik7Ci0JY29uc3Qgc3RydWN0IHR2X21vZGUgKnR2X21vZGUg PSBpbnRlbF90dl9tb2RlX2ZpbmQoaW50ZWxfdHYpOworCWNvbnN0IHN0cnVjdCB0dl9tb2RlICp0 dl9tb2RlID0gaW50ZWxfdHZfbW9kZV9maW5kKGNvbm5lY3Rvci0+c3RhdGUpOwogCWludCBpOwog CiAJaWYgKChpbnRlbF90di0+dHlwZSA9PSBEUk1fTU9ERV9DT05ORUNUT1JfQ29tcG9uZW50KSA9 PQpAQCAtMTMwNCw5ICsxMjk5LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfdHZfZmluZF9iZXR0ZXJf Zm9ybWF0KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiAJCQlicmVhazsKIAl9CiAK LQlpbnRlbF90di0+dHZfZm9ybWF0ID0gdHZfbW9kZS0+bmFtZTsKLQlkcm1fb2JqZWN0X3Byb3Bl cnR5X3NldF92YWx1ZSgmY29ubmVjdG9yLT5iYXNlLAotCQljb25uZWN0b3ItPmRldi0+bW9kZV9j b25maWcudHZfbW9kZV9wcm9wZXJ0eSwgaSk7CisJdG9faW50ZWxfdHZfY29ubmVjdG9yX3N0YXRl KGNvbm5lY3Rvci0+c3RhdGUpLT5mb3JtYXQgPSBpOwogfQogCiAvKioKQEAgLTEzNDQsMTggKzEz MzcsMTcgQEAgaW50ZWxfdHZfZGV0ZWN0KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3Is IGJvb2wgZm9yY2UpCiAJCX0gZWxzZQogCQkJc3RhdHVzID0gY29ubmVjdG9yX3N0YXR1c191bmtu b3duOwogCisJCWlmIChzdGF0dXMgPT0gY29ubmVjdG9yX3N0YXR1c19jb25uZWN0ZWQpIHsKKwkJ CWludGVsX3R2LT50eXBlID0gdHlwZTsKKwkJCWludGVsX3R2X2ZpbmRfYmV0dGVyX2Zvcm1hdChj b25uZWN0b3IpOworCQl9CisKIAkJZHJtX21vZGVzZXRfZHJvcF9sb2NrcygmY3R4KTsKIAkJZHJt X21vZGVzZXRfYWNxdWlyZV9maW5pKCZjdHgpOwotCX0gZWxzZQotCQlyZXR1cm4gY29ubmVjdG9y LT5zdGF0dXM7CiAKLQlpZiAoc3RhdHVzICE9IGNvbm5lY3Rvcl9zdGF0dXNfY29ubmVjdGVkKQog CQlyZXR1cm4gc3RhdHVzOwotCi0JaW50ZWxfdHYtPnR5cGUgPSB0eXBlOwotCWludGVsX3R2X2Zp bmRfYmV0dGVyX2Zvcm1hdChjb25uZWN0b3IpOwotCi0JcmV0dXJuIGNvbm5lY3Rvcl9zdGF0dXNf Y29ubmVjdGVkOworCX0gZWxzZQorCQlyZXR1cm4gY29ubmVjdG9yLT5zdGF0dXM7CiB9CiAKIHN0 YXRpYyBjb25zdCBzdHJ1Y3QgaW5wdXRfcmVzIHsKQEAgLTEzNzgsOCArMTM3MCw3IEBAIHN0YXRp YyB2b2lkCiBpbnRlbF90dl9jaG9zZV9wcmVmZXJyZWRfbW9kZXMoc3RydWN0IGRybV9jb25uZWN0 b3IgKmNvbm5lY3RvciwKIAkJCSAgICAgICBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZV9w dHIpCiB7Ci0Jc3RydWN0IGludGVsX3R2ICppbnRlbF90diA9IGludGVsX2F0dGFjaGVkX3R2KGNv bm5lY3Rvcik7Ci0JY29uc3Qgc3RydWN0IHR2X21vZGUgKnR2X21vZGUgPSBpbnRlbF90dl9tb2Rl X2ZpbmQoaW50ZWxfdHYpOworCWNvbnN0IHN0cnVjdCB0dl9tb2RlICp0dl9tb2RlID0gaW50ZWxf dHZfbW9kZV9maW5kKGNvbm5lY3Rvci0+c3RhdGUpOwogCiAJaWYgKHR2X21vZGUtPm5icl9lbmQg PCA0ODAgJiYgbW9kZV9wdHItPnZkaXNwbGF5ID09IDQ4MCkKIAkJbW9kZV9wdHItPnR5cGUgfD0g RFJNX01PREVfVFlQRV9QUkVGRVJSRUQ7CkBAIC0xNDAzLDggKzEzOTQsNyBAQCBzdGF0aWMgaW50 CiBpbnRlbF90dl9nZXRfbW9kZXMoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcikKIHsK IAlzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZV9wdHI7Ci0Jc3RydWN0IGludGVsX3R2ICpp bnRlbF90diA9IGludGVsX2F0dGFjaGVkX3R2KGNvbm5lY3Rvcik7Ci0JY29uc3Qgc3RydWN0IHR2 X21vZGUgKnR2X21vZGUgPSBpbnRlbF90dl9tb2RlX2ZpbmQoaW50ZWxfdHYpOworCWNvbnN0IHN0 cnVjdCB0dl9tb2RlICp0dl9tb2RlID0gaW50ZWxfdHZfbW9kZV9maW5kKGNvbm5lY3Rvci0+c3Rh dGUpOwogCWludCBqLCBjb3VudCA9IDA7CiAJdTY0IHRtcDsKIApAQCAtMTQ2Miw1NiArMTQ1Miw5 NyBAQCBpbnRlbF90dl9kZXN0cm95KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiAJ a2ZyZWUoY29ubmVjdG9yKTsKIH0KIAotCiBzdGF0aWMgaW50Ci1pbnRlbF90dl9zZXRfcHJvcGVy dHkoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3Rvciwgc3RydWN0IGRybV9wcm9wZXJ0eSAq cHJvcGVydHksCi0JCSAgICAgIHVpbnQ2NF90IHZhbCkKK2ludGVsX3R2X2F0b21pY19zZXRfcHJv cGVydHkoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwKKwkJCSAgICAgc3RydWN0IGRy bV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3RhdGUsCisJCQkgICAgIHN0cnVjdCBkcm1fcHJvcGVy dHkgKnByb3BlcnR5LAorCQkJICAgICB1aW50NjRfdCB2YWwpCiB7CiAJc3RydWN0IGRybV9kZXZp Y2UgKmRldiA9IGNvbm5lY3Rvci0+ZGV2OwotCXN0cnVjdCBpbnRlbF90diAqaW50ZWxfdHYgPSBp bnRlbF9hdHRhY2hlZF90dihjb25uZWN0b3IpOwotCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IGlu dGVsX3R2LT5iYXNlLmJhc2UuY3J0YzsKLQlpbnQgcmV0ID0gMDsKKworCXN0cnVjdCBpbnRlbF90 dl9jb25uZWN0b3Jfc3RhdGUgKnR2X3N0YXRlID0KKwkJdG9faW50ZWxfdHZfY29ubmVjdG9yX3N0 YXRlKGNvbm5fc3RhdGUpOwogCWJvb2wgY2hhbmdlZCA9IGZhbHNlOwogCi0JcmV0ID0gZHJtX29i amVjdF9wcm9wZXJ0eV9zZXRfdmFsdWUoJmNvbm5lY3Rvci0+YmFzZSwgcHJvcGVydHksIHZhbCk7 Ci0JaWYgKHJldCA8IDApCi0JCWdvdG8gb3V0OwotCi0JaWYgKHByb3BlcnR5ID09IGRldi0+bW9k ZV9jb25maWcudHZfbGVmdF9tYXJnaW5fcHJvcGVydHkgJiYKLQkJaW50ZWxfdHYtPm1hcmdpbltU Vl9NQVJHSU5fTEVGVF0gIT0gdmFsKSB7Ci0JCWludGVsX3R2LT5tYXJnaW5bVFZfTUFSR0lOX0xF RlRdID0gdmFsOwotCQljaGFuZ2VkID0gdHJ1ZTsKLQl9IGVsc2UgaWYgKHByb3BlcnR5ID09IGRl di0+bW9kZV9jb25maWcudHZfcmlnaHRfbWFyZ2luX3Byb3BlcnR5ICYmCi0JCWludGVsX3R2LT5t YXJnaW5bVFZfTUFSR0lOX1JJR0hUXSAhPSB2YWwpIHsKLQkJaW50ZWxfdHYtPm1hcmdpbltUVl9N QVJHSU5fUklHSFRdID0gdmFsOwotCQljaGFuZ2VkID0gdHJ1ZTsKLQl9IGVsc2UgaWYgKHByb3Bl cnR5ID09IGRldi0+bW9kZV9jb25maWcudHZfdG9wX21hcmdpbl9wcm9wZXJ0eSAmJgotCQlpbnRl bF90di0+bWFyZ2luW1RWX01BUkdJTl9UT1BdICE9IHZhbCkgewotCQlpbnRlbF90di0+bWFyZ2lu W1RWX01BUkdJTl9UT1BdID0gdmFsOwotCQljaGFuZ2VkID0gdHJ1ZTsKLQl9IGVsc2UgaWYgKHBy b3BlcnR5ID09IGRldi0+bW9kZV9jb25maWcudHZfYm90dG9tX21hcmdpbl9wcm9wZXJ0eSAmJgot CQlpbnRlbF90di0+bWFyZ2luW1RWX01BUkdJTl9CT1RUT01dICE9IHZhbCkgewotCQlpbnRlbF90 di0+bWFyZ2luW1RWX01BUkdJTl9CT1RUT01dID0gdmFsOwotCQljaGFuZ2VkID0gdHJ1ZTsKKwlp ZiAocHJvcGVydHkgPT0gZGV2LT5tb2RlX2NvbmZpZy50dl9sZWZ0X21hcmdpbl9wcm9wZXJ0eSkg eworCQljaGFuZ2VkID0gdHZfc3RhdGUtPm1hcmdpbltUVl9NQVJHSU5fTEVGVF0gIT0gdmFsOwor CisJCXR2X3N0YXRlLT5tYXJnaW5bVFZfTUFSR0lOX0xFRlRdID0gdmFsOworCX0gZWxzZSBpZiAo cHJvcGVydHkgPT0gZGV2LT5tb2RlX2NvbmZpZy50dl9yaWdodF9tYXJnaW5fcHJvcGVydHkpIHsK KwkJY2hhbmdlZCA9IHR2X3N0YXRlLT5tYXJnaW5bVFZfTUFSR0lOX1JJR0hUXSAhPSB2YWw7CisK KwkJdHZfc3RhdGUtPm1hcmdpbltUVl9NQVJHSU5fUklHSFRdID0gdmFsOworCX0gZWxzZSBpZiAo cHJvcGVydHkgPT0gZGV2LT5tb2RlX2NvbmZpZy50dl90b3BfbWFyZ2luX3Byb3BlcnR5KSB7CisJ CWNoYW5nZWQgPSB0dl9zdGF0ZS0+bWFyZ2luW1RWX01BUkdJTl9UT1BdICE9IHZhbDsKKworCQl0 dl9zdGF0ZS0+bWFyZ2luW1RWX01BUkdJTl9UT1BdID0gdmFsOworCX0gZWxzZSBpZiAocHJvcGVy dHkgPT0gZGV2LT5tb2RlX2NvbmZpZy50dl9ib3R0b21fbWFyZ2luX3Byb3BlcnR5KSB7CisJCWNo YW5nZWQgPSB0dl9zdGF0ZS0+bWFyZ2luW1RWX01BUkdJTl9CT1RUT01dICE9IHZhbDsKKworCQl0 dl9zdGF0ZS0+bWFyZ2luW1RWX01BUkdJTl9CT1RUT01dID0gdmFsOwogCX0gZWxzZSBpZiAocHJv cGVydHkgPT0gZGV2LT5tb2RlX2NvbmZpZy50dl9tb2RlX3Byb3BlcnR5KSB7CiAJCWlmICh2YWwg Pj0gQVJSQVlfU0laRSh0dl9tb2RlcykpIHsKLQkJCXJldCA9IC1FSU5WQUw7Ci0JCQlnb3RvIG91 dDsKKwkJCURSTV9ERUJVR19BVE9NSUMoInZhbHVlICVsbHUgb3V0IG9mIHR2X21vZGVzIGFycmF5 IGJvdW5kc1xuIiwgdmFsKTsKKworCQkJcmV0dXJuIC1FSU5WQUw7CiAJCX0KLQkJaWYgKCFzdHJj bXAoaW50ZWxfdHYtPnR2X2Zvcm1hdCwgdHZfbW9kZXNbdmFsXS5uYW1lKSkKLQkJCWdvdG8gb3V0 OwogCi0JCWludGVsX3R2LT50dl9mb3JtYXQgPSB0dl9tb2Rlc1t2YWxdLm5hbWU7Ci0JCWNoYW5n ZWQgPSB0cnVlOworCQljaGFuZ2VkID0gdHZfc3RhdGUtPmZvcm1hdCAhPSB2YWw7CisJCXR2X3N0 YXRlLT5mb3JtYXQgPSB2YWw7CisJfSBlbHNlIHsKKwkJRFJNX0RFQlVHX0FUT01JQygiVW5rbm93 biBhdG9taWMgcHJvcGVydHkgJXNcbiIsIHByb3BlcnR5LT5uYW1lKTsKKwkJcmV0dXJuIC1FSU5W QUw7CisJfQorCisJLyogVHJpZ2dlciBhIG1vZGVzZXQgd2hlbiBjb25uZWN0b3IgcHJvcGVydGll cyBhcmUgY2hhbmdlZC4gKi8KKwlpZiAoY2hhbmdlZCAmJiBjb25uX3N0YXRlLT5jcnRjKSB7CisJ CXN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSA9CisJCQlkcm1fYXRvbWljX2dldF9l eGlzdGluZ19jcnRjX3N0YXRlKGNvbm5fc3RhdGUtPnN0YXRlLAorCQkJCQkJCSAgIGNvbm5fc3Rh dGUtPmNydGMpOworCisJCWNydGNfc3RhdGUtPmNvbm5lY3RvcnNfY2hhbmdlZCA9IHRydWU7CisJ fQorCXJldHVybiAwOworfQorCitzdGF0aWMgaW50CitpbnRlbF90dl9hdG9taWNfZ2V0X3Byb3Bl cnR5KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCisJCQkJICAgIGNvbnN0IHN0cnVj dCBkcm1fY29ubmVjdG9yX3N0YXRlICpzdGF0ZSwKKwkJCQkgICAgc3RydWN0IGRybV9wcm9wZXJ0 eSAqcHJvcGVydHksCisJCQkJICAgIHVpbnQ2NF90ICp2YWwpCit7CisJc3RydWN0IGRybV9kZXZp Y2UgKmRldiA9IGNvbm5lY3Rvci0+ZGV2OworCXN0cnVjdCBpbnRlbF90dl9jb25uZWN0b3Jfc3Rh dGUgKnR2X3N0YXRlID0KKwkJdG9faW50ZWxfdHZfY29ubmVjdG9yX3N0YXRlKHN0YXRlKTsKKwor CWlmIChwcm9wZXJ0eSA9PSBkZXYtPm1vZGVfY29uZmlnLnR2X2xlZnRfbWFyZ2luX3Byb3BlcnR5 KQorCQkqdmFsID0gdHZfc3RhdGUtPm1hcmdpbltUVl9NQVJHSU5fTEVGVF07CisJZWxzZSBpZiAo cHJvcGVydHkgPT0gZGV2LT5tb2RlX2NvbmZpZy50dl9yaWdodF9tYXJnaW5fcHJvcGVydHkpCisJ CSp2YWwgPSB0dl9zdGF0ZS0+bWFyZ2luW1RWX01BUkdJTl9SSUdIVF07CisJZWxzZSBpZiAocHJv cGVydHkgPT0gZGV2LT5tb2RlX2NvbmZpZy50dl90b3BfbWFyZ2luX3Byb3BlcnR5KQorCQkqdmFs ID0gdHZfc3RhdGUtPm1hcmdpbltUVl9NQVJHSU5fVE9QXTsKKwllbHNlIGlmIChwcm9wZXJ0eSA9 PSBkZXYtPm1vZGVfY29uZmlnLnR2X2JvdHRvbV9tYXJnaW5fcHJvcGVydHkpCisJCSp2YWwgPSB0 dl9zdGF0ZS0+bWFyZ2luW1RWX01BUkdJTl9CT1RUT01dOworCWVsc2UgaWYgKHByb3BlcnR5ID09 IGRldi0+bW9kZV9jb25maWcudHZfbW9kZV9wcm9wZXJ0eSkgeworCQkqdmFsID0gdHZfc3RhdGUt PmZvcm1hdDsKIAl9IGVsc2UgewotCQlyZXQgPSAtRUlOVkFMOwotCQlnb3RvIG91dDsKKwkJRFJN X0RFQlVHX0FUT01JQygiVW5rbm93biBhdG9taWMgcHJvcGVydHkgJXNcbiIsIHByb3BlcnR5LT5u YW1lKTsKKwkJcmV0dXJuIC1FSU5WQUw7CiAJfQogCi0JaWYgKGNoYW5nZWQgJiYgY3J0YykKLQkJ aW50ZWxfY3J0Y19yZXN0b3JlX21vZGUoY3J0Yyk7Ci1vdXQ6Ci0JcmV0dXJuIHJldDsKKwlyZXR1 cm4gMDsKK30KKworc3RhdGljIHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICoKK2ludGVsX3R2 X2R1cGxpY2F0ZV9zdGF0ZShzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQoreworCXN0 cnVjdCBpbnRlbF90dl9jb25uZWN0b3Jfc3RhdGUgKnN0YXRlOworCisJc3RhdGUgPSBrbWVtZHVw KCZjb25uZWN0b3ItPnN0YXRlLCBzaXplb2YoKnN0YXRlKSwgR0ZQX0tFUk5FTCk7CisJaWYgKHN0 YXRlKQorCQlfX2RybV9hdG9taWNfaGVscGVyX2Nvbm5lY3Rvcl9kdXBsaWNhdGVfc3RhdGUoY29u bmVjdG9yLCAmc3RhdGUtPmJhc2UpOworCisJcmV0dXJuICZzdGF0ZS0+YmFzZTsKIH0KIAogc3Rh dGljIGNvbnN0IHN0cnVjdCBkcm1fY29ubmVjdG9yX2Z1bmNzIGludGVsX3R2X2Nvbm5lY3Rvcl9m dW5jcyA9IHsKQEAgLTE1MjAsMTEgKzE1NTEsMTIgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1f Y29ubmVjdG9yX2Z1bmNzIGludGVsX3R2X2Nvbm5lY3Rvcl9mdW5jcyA9IHsKIAkubGF0ZV9yZWdp c3RlciA9IGludGVsX2Nvbm5lY3Rvcl9yZWdpc3RlciwKIAkuZWFybHlfdW5yZWdpc3RlciA9IGlu dGVsX2Nvbm5lY3Rvcl91bnJlZ2lzdGVyLAogCS5kZXN0cm95ID0gaW50ZWxfdHZfZGVzdHJveSwK LQkuc2V0X3Byb3BlcnR5ID0gaW50ZWxfdHZfc2V0X3Byb3BlcnR5LAotCS5hdG9taWNfZ2V0X3By b3BlcnR5ID0gaW50ZWxfY29ubmVjdG9yX2F0b21pY19nZXRfcHJvcGVydHksCisJLnNldF9wcm9w ZXJ0eSA9IGRybV9hdG9taWNfaGVscGVyX2Nvbm5lY3Rvcl9zZXRfcHJvcGVydHksCisJLmF0b21p Y19zZXRfcHJvcGVydHkgPSBpbnRlbF90dl9hdG9taWNfc2V0X3Byb3BlcnR5LAorCS5hdG9taWNf Z2V0X3Byb3BlcnR5ID0gaW50ZWxfdHZfYXRvbWljX2dldF9wcm9wZXJ0eSwKIAkuZmlsbF9tb2Rl cyA9IGRybV9oZWxwZXJfcHJvYmVfc2luZ2xlX2Nvbm5lY3Rvcl9tb2RlcywKIAkuYXRvbWljX2Rl c3Ryb3lfc3RhdGUgPSBkcm1fYXRvbWljX2hlbHBlcl9jb25uZWN0b3JfZGVzdHJveV9zdGF0ZSwK LQkuYXRvbWljX2R1cGxpY2F0ZV9zdGF0ZSA9IGRybV9hdG9taWNfaGVscGVyX2Nvbm5lY3Rvcl9k dXBsaWNhdGVfc3RhdGUsCisJLmF0b21pY19kdXBsaWNhdGVfc3RhdGUgPSBpbnRlbF90dl9kdXBs aWNhdGVfc3RhdGUsCiB9OwogCiBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9jb25uZWN0b3JfaGVs cGVyX2Z1bmNzIGludGVsX3R2X2Nvbm5lY3Rvcl9oZWxwZXJfZnVuY3MgPSB7CkBAIC0xNTQ3LDYg KzE1NzksNyBAQCBpbnRlbF90dl9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dikKIAl1MzIgdHZfZGFjX29uLCB0dl9kYWNfb2ZmLCBzYXZlX3R2X2RhYzsKIAljb25zdCBjaGFy ICp0dl9mb3JtYXRfbmFtZXNbQVJSQVlfU0laRSh0dl9tb2RlcyldOwogCWludCBpLCBpbml0aWFs X21vZGUgPSAwOworCXN0cnVjdCBpbnRlbF90dl9jb25uZWN0b3Jfc3RhdGUgKnN0YXRlOwogCiAJ aWYgKChJOTE1X1JFQUQoVFZfQ1RMKSAmIFRWX0ZVU0VfU1RBVEVfTUFTSykgPT0gVFZfRlVTRV9T VEFURV9ESVNBQkxFRCkKIAkJcmV0dXJuOwpAQCAtMTU4MCwxNiArMTYxMywxNyBAQCBpbnRlbF90 dl9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJcmV0dXJuOwogCiAJ aW50ZWxfdHYgPSBremFsbG9jKHNpemVvZigqaW50ZWxfdHYpLCBHRlBfS0VSTkVMKTsKLQlpZiAo IWludGVsX3R2KSB7Ci0JCXJldHVybjsKLQl9Ci0KLQlpbnRlbF9jb25uZWN0b3IgPSBpbnRlbF9j b25uZWN0b3JfYWxsb2MoKTsKLQlpZiAoIWludGVsX2Nvbm5lY3RvcikgeworCWludGVsX2Nvbm5l Y3RvciA9IGt6YWxsb2Moc2l6ZW9mKCppbnRlbF9jb25uZWN0b3IpLCBHRlBfS0VSTkVMKTsKKwlz dGF0ZSA9IGt6YWxsb2Moc2l6ZW9mKCpzdGF0ZSksIEdGUF9LRVJORUwpOworCWlmICghaW50ZWxf dHYgfHwgIWludGVsX2Nvbm5lY3RvciB8fCAhc3RhdGUpIHsKKwkJa2ZyZWUoaW50ZWxfY29ubmVj dG9yKTsKKwkJa2ZyZWUoc3RhdGUpOwogCQlrZnJlZShpbnRlbF90dik7CiAJCXJldHVybjsKIAl9 CiAKKwlfX2RybV9hdG9taWNfaGVscGVyX2Nvbm5lY3Rvcl9yZXNldCgmaW50ZWxfY29ubmVjdG9y LT5iYXNlLCAmc3RhdGUtPmJhc2UpOworCiAJaW50ZWxfZW5jb2RlciA9ICZpbnRlbF90di0+YmFz ZTsKIAljb25uZWN0b3IgPSAmaW50ZWxfY29ubmVjdG9yLT5iYXNlOwogCkBAIC0xNjI5LDEyICsx NjYzLDEyIEBAIGludGVsX3R2X2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogCWludGVsX3R2LT50eXBlID0gRFJNX01PREVfQ09OTkVDVE9SX1Vua25vd247CiAKIAkvKiBC SU9TIG1hcmdpbiB2YWx1ZXMgKi8KLQlpbnRlbF90di0+bWFyZ2luW1RWX01BUkdJTl9MRUZUXSA9 IDU0OwotCWludGVsX3R2LT5tYXJnaW5bVFZfTUFSR0lOX1RPUF0gPSAzNjsKLQlpbnRlbF90di0+ bWFyZ2luW1RWX01BUkdJTl9SSUdIVF0gPSA0NjsKLQlpbnRlbF90di0+bWFyZ2luW1RWX01BUkdJ Tl9CT1RUT01dID0gMzc7CisJc3RhdGUtPm1hcmdpbltUVl9NQVJHSU5fTEVGVF0gPSA1NDsKKwlz dGF0ZS0+bWFyZ2luW1RWX01BUkdJTl9UT1BdID0gMzY7CisJc3RhdGUtPm1hcmdpbltUVl9NQVJH SU5fUklHSFRdID0gNDY7CisJc3RhdGUtPm1hcmdpbltUVl9NQVJHSU5fQk9UVE9NXSA9IDM3Owog Ci0JaW50ZWxfdHYtPnR2X2Zvcm1hdCA9IHR2X21vZGVzW2luaXRpYWxfbW9kZV0ubmFtZTsKKwlz dGF0ZS0+Zm9ybWF0ID0gaW5pdGlhbF9tb2RlOwogCiAJZHJtX2Nvbm5lY3Rvcl9oZWxwZXJfYWRk KGNvbm5lY3RvciwgJmludGVsX3R2X2Nvbm5lY3Rvcl9oZWxwZXJfZnVuY3MpOwogCWNvbm5lY3Rv ci0+aW50ZXJsYWNlX2FsbG93ZWQgPSBmYWxzZTsKQEAgLTE2NDgsMTcgKzE2ODIsMTcgQEAgaW50 ZWxfdHZfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCQkJICAgICAg dHZfZm9ybWF0X25hbWVzKTsKIAogCWRybV9vYmplY3RfYXR0YWNoX3Byb3BlcnR5KCZjb25uZWN0 b3ItPmJhc2UsIGRldi0+bW9kZV9jb25maWcudHZfbW9kZV9wcm9wZXJ0eSwKLQkJCQkgICBpbml0 aWFsX21vZGUpOworCQkJCSAgIHN0YXRlLT5mb3JtYXQpOwogCWRybV9vYmplY3RfYXR0YWNoX3By b3BlcnR5KCZjb25uZWN0b3ItPmJhc2UsCiAJCQkJICAgZGV2LT5tb2RlX2NvbmZpZy50dl9sZWZ0 X21hcmdpbl9wcm9wZXJ0eSwKLQkJCQkgICBpbnRlbF90di0+bWFyZ2luW1RWX01BUkdJTl9MRUZU XSk7CisJCQkJICAgc3RhdGUtPm1hcmdpbltUVl9NQVJHSU5fTEVGVF0pOwogCWRybV9vYmplY3Rf YXR0YWNoX3Byb3BlcnR5KCZjb25uZWN0b3ItPmJhc2UsCiAJCQkJICAgZGV2LT5tb2RlX2NvbmZp Zy50dl90b3BfbWFyZ2luX3Byb3BlcnR5LAotCQkJCSAgIGludGVsX3R2LT5tYXJnaW5bVFZfTUFS R0lOX1RPUF0pOworCQkJCSAgIHN0YXRlLT5tYXJnaW5bVFZfTUFSR0lOX1RPUF0pOwogCWRybV9v YmplY3RfYXR0YWNoX3Byb3BlcnR5KCZjb25uZWN0b3ItPmJhc2UsCiAJCQkJICAgZGV2LT5tb2Rl X2NvbmZpZy50dl9yaWdodF9tYXJnaW5fcHJvcGVydHksCi0JCQkJICAgaW50ZWxfdHYtPm1hcmdp bltUVl9NQVJHSU5fUklHSFRdKTsKKwkJCQkgICBzdGF0ZS0+bWFyZ2luW1RWX01BUkdJTl9SSUdI VF0pOwogCWRybV9vYmplY3RfYXR0YWNoX3Byb3BlcnR5KCZjb25uZWN0b3ItPmJhc2UsCiAJCQkJ ICAgZGV2LT5tb2RlX2NvbmZpZy50dl9ib3R0b21fbWFyZ2luX3Byb3BlcnR5LAotCQkJCSAgIGlu dGVsX3R2LT5tYXJnaW5bVFZfTUFSR0lOX0JPVFRPTV0pOworCQkJCSAgIHN0YXRlLT5tYXJnaW5b VFZfTUFSR0lOX0JPVFRPTV0pOwogfQotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4 QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=