From: Maarten Lankhorst Subject: [PATCH 02/13] drm/i915: Convert intel_tv connector properties to atomic, v5. Date: Fri, 7 Apr 2017 08:07:51 +0200 Message-ID: <1491545282-815-3-git-send-email-maarten.lankhorst@linux.intel.com> References: <1491545282-815-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 046156EA2D for ; Fri, 7 Apr 2017 06:08:07 +0000 (UTC) In-Reply-To: <1491545282-815-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 IGNhbiBiZSBjaGFuZ2VkIGJ5IHByb2JpbmcganVzdCBsaWtlCmluIGxlZ2FjeSBtb2RlLgoKQ2hh bmdlcyBzaW5jZSB2MToKLSBBZGQgaW50ZWxfZW5jb2Rlci0+c3dhcF9zdGF0ZSB0byBhbGxvdyB1 cGRhdGluZyBjb25uZWN0b3Igc3RhdGUuCi0gQWRkIGludGVsX3R2LT5mb3JtYXQgZm9yIGRldGVj dF9tb2RlIGFuZCBtb2RlX3ZhbGlkLCB1cGRhdGVkIG9uIGF0b21pYyBjb21taXQuCkNoYW5nZXMg c2luY2UgdjI6Ci0gRml4IHR5cG8gaW4gdHZfY2hvb3NlX3ByZWZlcnJlZCBtb2RlcyBmdW5jdGlv biBuYW1lLgotIEFzc2lnbm1lbnQgb2YgdHYgcHJvcGVydGllcyBpcyBkb25lIGluIGNvcmUsIHNv IGludGVsX3R2IG9ubHkgbmVlZHMKICBhIGF0b21pY19jaGVjayBmdW5jdGlvbi4gVGhhbmtzIFZp bGxlIQpDaGFuZ2VzIHNpbmNlIHYzOgotIGNvbm5lY3Rpb25fbXV0ZXggaXMgbm93IGhlbGQgaW4g bW9kZV92YWxpZCgpIGFuZCBnZXRfbW9kZXMoKSwKICB0aGlzIHJlbW92ZXMgdGhlIG5lZWQgZm9y IGNhY2hpbmcgcGFydHMgb2YgdGhlIGNvbm5lY3Rvcl9zdGF0ZS4KQ2hhbmdlcyBzaW5jZSB2NDoK LSBVc2UgdGhlIG5ldyBhdG9taWMgY29ubmVjdG9yIGNoZWNrIGZ1bmN0aW9uLgoKU2lnbmVkLW9m Zi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNv bT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF90di5jIHwgMTc1ICsrKysrKysrKysr KysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA2MyBpbnNlcnRp b25zKCspLCAxMTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfdHYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3R2LmMKaW5kZXggM2Fm ODU3YTc1ZmFiLi43ODRkZjAyNGUyMzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3R2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfdHYuYwpAQCAtNDgs OCArNDgsNiBAQCBzdHJ1Y3QgaW50ZWxfdHYgewogCXN0cnVjdCBpbnRlbF9lbmNvZGVyIGJhc2U7 CiAKIAlpbnQgdHlwZTsKLQljb25zdCBjaGFyICp0dl9mb3JtYXQ7Ci0JaW50IG1hcmdpbls0XTsK IH07CiAKIHN0cnVjdCB2aWRlb19sZXZlbHMgewpAQCAtODQwLDMyICs4MzgsMTggQEAgaW50ZWxf ZGlzYWJsZV90dihzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAlJOTE1X1dSSVRFKFRW X0NUTCwgSTkxNV9SRUFEKFRWX0NUTCkgJiB+VFZfRU5DX0VOQUJMRSk7CiB9CiAKLXN0YXRpYyBj b25zdCBzdHJ1Y3QgdHZfbW9kZSAqCi1pbnRlbF90dl9tb2RlX2xvb2t1cChjb25zdCBjaGFyICp0 dl9mb3JtYXQpCitzdGF0aWMgY29uc3Qgc3RydWN0IHR2X21vZGUgKmludGVsX3R2X21vZGVfZmlu ZChzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubl9zdGF0ZSkKIHsKLQlpbnQgaTsKLQot CWZvciAoaSA9IDA7IGkgPCBBUlJBWV9TSVpFKHR2X21vZGVzKTsgaSsrKSB7Ci0JCWNvbnN0IHN0 cnVjdCB0dl9tb2RlICp0dl9tb2RlID0gJnR2X21vZGVzW2ldOworCWludCBmb3JtYXQgPSBjb25u X3N0YXRlLT50di5tb2RlOwogCi0JCWlmICghc3RyY21wKHR2X2Zvcm1hdCwgdHZfbW9kZS0+bmFt ZSkpCi0JCQlyZXR1cm4gdHZfbW9kZTsKLQl9Ci0JcmV0dXJuIE5VTEw7Ci19Ci0KLXN0YXRpYyBj b25zdCBzdHJ1Y3QgdHZfbW9kZSAqCi1pbnRlbF90dl9tb2RlX2ZpbmQoc3RydWN0IGludGVsX3R2 ICppbnRlbF90dikKLXsKLQlyZXR1cm4gaW50ZWxfdHZfbW9kZV9sb29rdXAoaW50ZWxfdHYtPnR2 X2Zvcm1hdCk7CisJcmV0dXJuICZ0dl9tb2Rlc1tmb3JtYXRdOwogfQogCiBzdGF0aWMgZW51bSBk cm1fbW9kZV9zdGF0dXMKIGludGVsX3R2X21vZGVfdmFsaWQoc3RydWN0IGRybV9jb25uZWN0b3Ig KmNvbm5lY3RvciwKIAkJICAgIHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlKQogewotCXN0 cnVjdCBpbnRlbF90diAqaW50ZWxfdHYgPSBpbnRlbF9hdHRhY2hlZF90dihjb25uZWN0b3IpOwot CWNvbnN0IHN0cnVjdCB0dl9tb2RlICp0dl9tb2RlID0gaW50ZWxfdHZfbW9kZV9maW5kKGludGVs X3R2KTsKKwljb25zdCBzdHJ1Y3QgdHZfbW9kZSAqdHZfbW9kZSA9IGludGVsX3R2X21vZGVfZmlu ZChjb25uZWN0b3ItPnN0YXRlKTsKIAlpbnQgbWF4X2RvdGNsayA9IHRvX2k5MTUoY29ubmVjdG9y LT5kZXYpLT5tYXhfZG90Y2xrX2ZyZXE7CiAKIAlpZiAobW9kZS0+Y2xvY2sgPiBtYXhfZG90Y2xr KQpAQCAtODkyLDggKzg3Niw3IEBAIGludGVsX3R2X2NvbXB1dGVfY29uZmlnKHN0cnVjdCBpbnRl bF9lbmNvZGVyICplbmNvZGVyLAogCQkJc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29u ZmlnLAogCQkJc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUgKmNvbm5fc3RhdGUpCiB7Ci0Jc3Ry dWN0IGludGVsX3R2ICppbnRlbF90diA9IGVuY190b190dihlbmNvZGVyKTsKLQljb25zdCBzdHJ1 Y3QgdHZfbW9kZSAqdHZfbW9kZSA9IGludGVsX3R2X21vZGVfZmluZChpbnRlbF90dik7CisJY29u c3Qgc3RydWN0IHR2X21vZGUgKnR2X21vZGUgPSBpbnRlbF90dl9tb2RlX2ZpbmQoY29ubl9zdGF0 ZSk7CiAKIAlpZiAoIXR2X21vZGUpCiAJCXJldHVybiBmYWxzZTsKQEAgLTk5OSw3ICs5ODIsNyBA QCBzdGF0aWMgdm9pZCBpbnRlbF90dl9wcmVfZW5hYmxlKHN0cnVjdCBpbnRlbF9lbmNvZGVyICpl bmNvZGVyLAogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoZW5j b2Rlci0+YmFzZS5kZXYpOwogCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9faW50 ZWxfY3J0YyhlbmNvZGVyLT5iYXNlLmNydGMpOwogCXN0cnVjdCBpbnRlbF90diAqaW50ZWxfdHYg PSBlbmNfdG9fdHYoZW5jb2Rlcik7Ci0JY29uc3Qgc3RydWN0IHR2X21vZGUgKnR2X21vZGUgPSBp bnRlbF90dl9tb2RlX2ZpbmQoaW50ZWxfdHYpOworCWNvbnN0IHN0cnVjdCB0dl9tb2RlICp0dl9t b2RlID0gaW50ZWxfdHZfbW9kZV9maW5kKGNvbm5fc3RhdGUpOwogCXUzMiB0dl9jdGw7CiAJdTMy IHNjY3RsMSwgc2NjdGwyLCBzY2N0bDM7CiAJaW50IGksIGo7CkBAIC0xMTAyLDEyICsxMDg1LDEy IEBAIHN0YXRpYyB2b2lkIGludGVsX3R2X3ByZV9lbmFibGUoc3RydWN0IGludGVsX2VuY29kZXIg KmVuY29kZXIsCiAJZWxzZQogCQl5c2l6ZSA9IDIqdHZfbW9kZS0+bmJyX2VuZCArIDE7CiAKLQl4 cG9zICs9IGludGVsX3R2LT5tYXJnaW5bVFZfTUFSR0lOX0xFRlRdOwotCXlwb3MgKz0gaW50ZWxf dHYtPm1hcmdpbltUVl9NQVJHSU5fVE9QXTsKLQl4c2l6ZSAtPSAoaW50ZWxfdHYtPm1hcmdpbltU Vl9NQVJHSU5fTEVGVF0gKwotCQkgIGludGVsX3R2LT5tYXJnaW5bVFZfTUFSR0lOX1JJR0hUXSk7 Ci0JeXNpemUgLT0gKGludGVsX3R2LT5tYXJnaW5bVFZfTUFSR0lOX1RPUF0gKwotCQkgIGludGVs X3R2LT5tYXJnaW5bVFZfTUFSR0lOX0JPVFRPTV0pOworCXhwb3MgKz0gY29ubl9zdGF0ZS0+dHYu bWFyZ2lucy5sZWZ0OworCXlwb3MgKz0gY29ubl9zdGF0ZS0+dHYubWFyZ2lucy50b3A7CisJeHNp emUgLT0gKGNvbm5fc3RhdGUtPnR2Lm1hcmdpbnMubGVmdCArCisJCSAgY29ubl9zdGF0ZS0+dHYu bWFyZ2lucy5yaWdodCk7CisJeXNpemUgLT0gKGNvbm5fc3RhdGUtPnR2Lm1hcmdpbnMudG9wICsK KwkJICBjb25uX3N0YXRlLT50di5tYXJnaW5zLmJvdHRvbSk7CiAJSTkxNV9XUklURShUVl9XSU5f UE9TLCAoeHBvczw8MTYpfHlwb3MpOwogCUk5MTVfV1JJVEUoVFZfV0lOX1NJWkUsICh4c2l6ZTw8 MTYpfHlzaXplKTsKIApAQCAtMTI1NSw3ICsxMjM4LDcgQEAgaW50ZWxfdHZfZGV0ZWN0X3R5cGUo c3RydWN0IGludGVsX3R2ICppbnRlbF90diwKIHN0YXRpYyB2b2lkIGludGVsX3R2X2ZpbmRfYmV0 dGVyX2Zvcm1hdChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQogewogCXN0cnVjdCBp bnRlbF90diAqaW50ZWxfdHYgPSBpbnRlbF9hdHRhY2hlZF90dihjb25uZWN0b3IpOwotCWNvbnN0 IHN0cnVjdCB0dl9tb2RlICp0dl9tb2RlID0gaW50ZWxfdHZfbW9kZV9maW5kKGludGVsX3R2KTsK Kwljb25zdCBzdHJ1Y3QgdHZfbW9kZSAqdHZfbW9kZSA9IGludGVsX3R2X21vZGVfZmluZChjb25u ZWN0b3ItPnN0YXRlKTsKIAlpbnQgaTsKIAogCWlmICgoaW50ZWxfdHYtPnR5cGUgPT0gRFJNX01P REVfQ09OTkVDVE9SX0NvbXBvbmVudCkgPT0KQEAgLTEyNzEsOSArMTI1NCw3IEBAIHN0YXRpYyB2 b2lkIGludGVsX3R2X2ZpbmRfYmV0dGVyX2Zvcm1hdChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29u bmVjdG9yKQogCQkJYnJlYWs7CiAJfQogCi0JaW50ZWxfdHYtPnR2X2Zvcm1hdCA9IHR2X21vZGUt Pm5hbWU7Ci0JZHJtX29iamVjdF9wcm9wZXJ0eV9zZXRfdmFsdWUoJmNvbm5lY3Rvci0+YmFzZSwK LQkJY29ubmVjdG9yLT5kZXYtPm1vZGVfY29uZmlnLnR2X21vZGVfcHJvcGVydHksIGkpOworCWNv bm5lY3Rvci0+c3RhdGUtPnR2Lm1vZGUgPSBpOwogfQogCiAvKioKQEAgLTEzMTQsMTYgKzEyOTUs MTUgQEAgaW50ZWxfdHZfZGV0ZWN0KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAJ CQkJY29ubmVjdG9yX3N0YXR1c19jb25uZWN0ZWQ7CiAJCX0gZWxzZQogCQkJc3RhdHVzID0gY29u bmVjdG9yX3N0YXR1c191bmtub3duOwotCX0gZWxzZQotCQlyZXR1cm4gY29ubmVjdG9yLT5zdGF0 dXM7CiAKLQlpZiAoc3RhdHVzICE9IGNvbm5lY3Rvcl9zdGF0dXNfY29ubmVjdGVkKQotCQlyZXR1 cm4gc3RhdHVzOwotCi0JaW50ZWxfdHYtPnR5cGUgPSB0eXBlOwotCWludGVsX3R2X2ZpbmRfYmV0 dGVyX2Zvcm1hdChjb25uZWN0b3IpOworCQlpZiAoc3RhdHVzID09IGNvbm5lY3Rvcl9zdGF0dXNf Y29ubmVjdGVkKSB7CisJCQlpbnRlbF90di0+dHlwZSA9IHR5cGU7CisJCQlpbnRlbF90dl9maW5k X2JldHRlcl9mb3JtYXQoY29ubmVjdG9yKTsKKwkJfQogCi0JcmV0dXJuIGNvbm5lY3Rvcl9zdGF0 dXNfY29ubmVjdGVkOworCQlyZXR1cm4gc3RhdHVzOworCX0gZWxzZQorCQlyZXR1cm4gY29ubmVj dG9yLT5zdGF0dXM7CiB9CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgaW5wdXRfcmVzIHsKQEAgLTEz NDMsMTIgKzEzMjMsOSBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGlucHV0X3JlcyB7CiAgKiBDaG9z ZSBwcmVmZXJyZWQgbW9kZSAgYWNjb3JkaW5nIHRvIGxpbmUgbnVtYmVyIG9mIFRWIGZvcm1hdAog ICovCiBzdGF0aWMgdm9pZAotaW50ZWxfdHZfY2hvc2VfcHJlZmVycmVkX21vZGVzKHN0cnVjdCBk cm1fY29ubmVjdG9yICpjb25uZWN0b3IsCitpbnRlbF90dl9jaG9vc2VfcHJlZmVycmVkX21vZGVz KGNvbnN0IHN0cnVjdCB0dl9tb2RlICp0dl9tb2RlLAogCQkJICAgICAgIHN0cnVjdCBkcm1fZGlz cGxheV9tb2RlICptb2RlX3B0cikKIHsKLQlzdHJ1Y3QgaW50ZWxfdHYgKmludGVsX3R2ID0gaW50 ZWxfYXR0YWNoZWRfdHYoY29ubmVjdG9yKTsKLQljb25zdCBzdHJ1Y3QgdHZfbW9kZSAqdHZfbW9k ZSA9IGludGVsX3R2X21vZGVfZmluZChpbnRlbF90dik7Ci0KIAlpZiAodHZfbW9kZS0+bmJyX2Vu ZCA8IDQ4MCAmJiBtb2RlX3B0ci0+dmRpc3BsYXkgPT0gNDgwKQogCQltb2RlX3B0ci0+dHlwZSB8 PSBEUk1fTU9ERV9UWVBFX1BSRUZFUlJFRDsKIAllbHNlIGlmICh0dl9tb2RlLT5uYnJfZW5kID4g NDgwKSB7CkBAIC0xMzcxLDggKzEzNDgsNyBAQCBzdGF0aWMgaW50CiBpbnRlbF90dl9nZXRfbW9k ZXMoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcikKIHsKIAlzdHJ1Y3QgZHJtX2Rpc3Bs YXlfbW9kZSAqbW9kZV9wdHI7Ci0Jc3RydWN0IGludGVsX3R2ICppbnRlbF90diA9IGludGVsX2F0 dGFjaGVkX3R2KGNvbm5lY3Rvcik7Ci0JY29uc3Qgc3RydWN0IHR2X21vZGUgKnR2X21vZGUgPSBp bnRlbF90dl9tb2RlX2ZpbmQoaW50ZWxfdHYpOworCWNvbnN0IHN0cnVjdCB0dl9tb2RlICp0dl9t b2RlID0gaW50ZWxfdHZfbW9kZV9maW5kKGNvbm5lY3Rvci0+c3RhdGUpOwogCWludCBqLCBjb3Vu dCA9IDA7CiAJdTY0IHRtcDsKIApAQCAtMTQxNSw3ICsxMzkxLDcgQEAgaW50ZWxfdHZfZ2V0X21v ZGVzKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiAJCW1vZGVfcHRyLT5jbG9jayA9 IChpbnQpIHRtcDsKIAogCQltb2RlX3B0ci0+dHlwZSA9IERSTV9NT0RFX1RZUEVfRFJJVkVSOwot CQlpbnRlbF90dl9jaG9zZV9wcmVmZXJyZWRfbW9kZXMoY29ubmVjdG9yLCBtb2RlX3B0cik7CisJ CWludGVsX3R2X2Nob29zZV9wcmVmZXJyZWRfbW9kZXModHZfbW9kZSwgbW9kZV9wdHIpOwogCQlk cm1fbW9kZV9wcm9iZWRfYWRkKGNvbm5lY3RvciwgbW9kZV9wdHIpOwogCQljb3VudCsrOwogCX0K QEAgLTE0MzAsNzQgKzE0MDYsNDcgQEAgaW50ZWxfdHZfZGVzdHJveShzdHJ1Y3QgZHJtX2Nvbm5l Y3RvciAqY29ubmVjdG9yKQogCWtmcmVlKGNvbm5lY3Rvcik7CiB9CiAKLQotc3RhdGljIGludAot aW50ZWxfdHZfc2V0X3Byb3BlcnR5KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsIHN0 cnVjdCBkcm1fcHJvcGVydHkgKnByb3BlcnR5LAotCQkgICAgICB1aW50NjRfdCB2YWwpCi17Ci0J c3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNvbm5lY3Rvci0+ZGV2OwotCXN0cnVjdCBpbnRlbF90 diAqaW50ZWxfdHYgPSBpbnRlbF9hdHRhY2hlZF90dihjb25uZWN0b3IpOwotCXN0cnVjdCBkcm1f Y3J0YyAqY3J0YyA9IGludGVsX3R2LT5iYXNlLmJhc2UuY3J0YzsKLQlpbnQgcmV0ID0gMDsKLQli b29sIGNoYW5nZWQgPSBmYWxzZTsKLQotCXJldCA9IGRybV9vYmplY3RfcHJvcGVydHlfc2V0X3Zh bHVlKCZjb25uZWN0b3ItPmJhc2UsIHByb3BlcnR5LCB2YWwpOwotCWlmIChyZXQgPCAwKQotCQln b3RvIG91dDsKLQotCWlmIChwcm9wZXJ0eSA9PSBkZXYtPm1vZGVfY29uZmlnLnR2X2xlZnRfbWFy Z2luX3Byb3BlcnR5ICYmCi0JCWludGVsX3R2LT5tYXJnaW5bVFZfTUFSR0lOX0xFRlRdICE9IHZh bCkgewotCQlpbnRlbF90di0+bWFyZ2luW1RWX01BUkdJTl9MRUZUXSA9IHZhbDsKLQkJY2hhbmdl ZCA9IHRydWU7Ci0JfSBlbHNlIGlmIChwcm9wZXJ0eSA9PSBkZXYtPm1vZGVfY29uZmlnLnR2X3Jp Z2h0X21hcmdpbl9wcm9wZXJ0eSAmJgotCQlpbnRlbF90di0+bWFyZ2luW1RWX01BUkdJTl9SSUdI VF0gIT0gdmFsKSB7Ci0JCWludGVsX3R2LT5tYXJnaW5bVFZfTUFSR0lOX1JJR0hUXSA9IHZhbDsK LQkJY2hhbmdlZCA9IHRydWU7Ci0JfSBlbHNlIGlmIChwcm9wZXJ0eSA9PSBkZXYtPm1vZGVfY29u ZmlnLnR2X3RvcF9tYXJnaW5fcHJvcGVydHkgJiYKLQkJaW50ZWxfdHYtPm1hcmdpbltUVl9NQVJH SU5fVE9QXSAhPSB2YWwpIHsKLQkJaW50ZWxfdHYtPm1hcmdpbltUVl9NQVJHSU5fVE9QXSA9IHZh bDsKLQkJY2hhbmdlZCA9IHRydWU7Ci0JfSBlbHNlIGlmIChwcm9wZXJ0eSA9PSBkZXYtPm1vZGVf Y29uZmlnLnR2X2JvdHRvbV9tYXJnaW5fcHJvcGVydHkgJiYKLQkJaW50ZWxfdHYtPm1hcmdpbltU Vl9NQVJHSU5fQk9UVE9NXSAhPSB2YWwpIHsKLQkJaW50ZWxfdHYtPm1hcmdpbltUVl9NQVJHSU5f Qk9UVE9NXSA9IHZhbDsKLQkJY2hhbmdlZCA9IHRydWU7Ci0JfSBlbHNlIGlmIChwcm9wZXJ0eSA9 PSBkZXYtPm1vZGVfY29uZmlnLnR2X21vZGVfcHJvcGVydHkpIHsKLQkJaWYgKHZhbCA+PSBBUlJB WV9TSVpFKHR2X21vZGVzKSkgewotCQkJcmV0ID0gLUVJTlZBTDsKLQkJCWdvdG8gb3V0OwotCQl9 Ci0JCWlmICghc3RyY21wKGludGVsX3R2LT50dl9mb3JtYXQsIHR2X21vZGVzW3ZhbF0ubmFtZSkp Ci0JCQlnb3RvIG91dDsKLQotCQlpbnRlbF90di0+dHZfZm9ybWF0ID0gdHZfbW9kZXNbdmFsXS5u YW1lOwotCQljaGFuZ2VkID0gdHJ1ZTsKLQl9IGVsc2UgewotCQlyZXQgPSAtRUlOVkFMOwotCQln b3RvIG91dDsKLQl9Ci0KLQlpZiAoY2hhbmdlZCAmJiBjcnRjKQotCQlpbnRlbF9jcnRjX3Jlc3Rv cmVfbW9kZShjcnRjKTsKLW91dDoKLQlyZXR1cm4gcmV0OwotfQotCiBzdGF0aWMgY29uc3Qgc3Ry dWN0IGRybV9jb25uZWN0b3JfZnVuY3MgaW50ZWxfdHZfY29ubmVjdG9yX2Z1bmNzID0gewogCS5k cG1zID0gZHJtX2F0b21pY19oZWxwZXJfY29ubmVjdG9yX2RwbXMsCiAJLmxhdGVfcmVnaXN0ZXIg PSBpbnRlbF9jb25uZWN0b3JfcmVnaXN0ZXIsCiAJLmVhcmx5X3VucmVnaXN0ZXIgPSBpbnRlbF9j b25uZWN0b3JfdW5yZWdpc3RlciwKIAkuZGVzdHJveSA9IGludGVsX3R2X2Rlc3Ryb3ksCi0JLnNl dF9wcm9wZXJ0eSA9IGludGVsX3R2X3NldF9wcm9wZXJ0eSwKLQkuYXRvbWljX2dldF9wcm9wZXJ0 eSA9IGludGVsX2Nvbm5lY3Rvcl9hdG9taWNfZ2V0X3Byb3BlcnR5LAorCS5zZXRfcHJvcGVydHkg PSBkcm1fYXRvbWljX2hlbHBlcl9jb25uZWN0b3Jfc2V0X3Byb3BlcnR5LAogCS5maWxsX21vZGVz ID0gZHJtX2hlbHBlcl9wcm9iZV9zaW5nbGVfY29ubmVjdG9yX21vZGVzLAogCS5hdG9taWNfZGVz dHJveV9zdGF0ZSA9IGRybV9hdG9taWNfaGVscGVyX2Nvbm5lY3Rvcl9kZXN0cm95X3N0YXRlLAog CS5hdG9taWNfZHVwbGljYXRlX3N0YXRlID0gZHJtX2F0b21pY19oZWxwZXJfY29ubmVjdG9yX2R1 cGxpY2F0ZV9zdGF0ZSwKIH07CiAKK3N0YXRpYyBpbnQgaW50ZWxfdHZfYXRvbWljX2NoZWNrKHN0 cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCisJCQkJIHN0cnVjdCBkcm1fY29ubmVjdG9y X3N0YXRlICpuZXdfc3RhdGUpCit7CisJc3RydWN0IGRybV9jcnRjX3N0YXRlICpuZXdfY3J0Y19z dGF0ZTsKKwlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqb2xkX3N0YXRlOworCisJaWYgKCFu ZXdfc3RhdGUtPmNydGMpCisJCXJldHVybiAwOworCisJb2xkX3N0YXRlID0gZHJtX2F0b21pY19n ZXRfb2xkX2Nvbm5lY3Rvcl9zdGF0ZShuZXdfc3RhdGUtPnN0YXRlLCBjb25uZWN0b3IpOworCW5l d19jcnRjX3N0YXRlID0gZHJtX2F0b21pY19nZXRfbmV3X2NydGNfc3RhdGUobmV3X3N0YXRlLT5z dGF0ZSwgbmV3X3N0YXRlLT5jcnRjKTsKKworCWlmIChvbGRfc3RhdGUtPnR2Lm1vZGUgIT0gbmV3 X3N0YXRlLT50di5tb2RlIHx8CisJICAgIG9sZF9zdGF0ZS0+dHYubWFyZ2lucy5sZWZ0ICE9IG5l d19zdGF0ZS0+dHYubWFyZ2lucy5sZWZ0IHx8CisJICAgIG9sZF9zdGF0ZS0+dHYubWFyZ2lucy5y aWdodCAhPSBuZXdfc3RhdGUtPnR2Lm1hcmdpbnMucmlnaHQgfHwKKwkgICAgb2xkX3N0YXRlLT50 di5tYXJnaW5zLnRvcCAhPSBuZXdfc3RhdGUtPnR2Lm1hcmdpbnMudG9wIHx8CisJICAgIG9sZF9z dGF0ZS0+dHYubWFyZ2lucy5ib3R0b20gIT0gbmV3X3N0YXRlLT50di5tYXJnaW5zLmJvdHRvbSkg eworCQkvKiBGb3JjZSBhIG1vZGVzZXQuICovCisKKwkJbmV3X2NydGNfc3RhdGUtPmNvbm5lY3Rv cnNfY2hhbmdlZCA9IHRydWU7CisJfQorCisJcmV0dXJuIDA7Cit9CisKIHN0YXRpYyBjb25zdCBz dHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9oZWxwZXJfZnVuY3MgaW50ZWxfdHZfY29ubmVjdG9yX2hlbHBl cl9mdW5jcyA9IHsKIAkuZGV0ZWN0X2N0eCA9IGludGVsX3R2X2RldGVjdCwKIAkubW9kZV92YWxp ZCA9IGludGVsX3R2X21vZGVfdmFsaWQsCiAJLmdldF9tb2RlcyA9IGludGVsX3R2X2dldF9tb2Rl cywKKwkuYXRvbWljX2NoZWNrID0gaW50ZWxfdHZfYXRvbWljX2NoZWNrLAogfTsKIAogc3RhdGlj IGNvbnN0IHN0cnVjdCBkcm1fZW5jb2Rlcl9mdW5jcyBpbnRlbF90dl9lbmNfZnVuY3MgPSB7CkBA IC0xNTE1LDYgKzE0NjQsNyBAQCBpbnRlbF90dl9pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRl ICpkZXZfcHJpdikKIAl1MzIgdHZfZGFjX29uLCB0dl9kYWNfb2ZmLCBzYXZlX3R2X2RhYzsKIAlj b25zdCBjaGFyICp0dl9mb3JtYXRfbmFtZXNbQVJSQVlfU0laRSh0dl9tb2RlcyldOwogCWludCBp LCBpbml0aWFsX21vZGUgPSAwOworCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpzdGF0ZTsK IAogCWlmICgoSTkxNV9SRUFEKFRWX0NUTCkgJiBUVl9GVVNFX1NUQVRFX01BU0spID09IFRWX0ZV U0VfU1RBVEVfRElTQUJMRUQpCiAJCXJldHVybjsKQEAgLTE1NjAsNiArMTUxMCw3IEBAIGludGVs X3R2X2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiAJaW50ZWxfZW5j b2RlciA9ICZpbnRlbF90di0+YmFzZTsKIAljb25uZWN0b3IgPSAmaW50ZWxfY29ubmVjdG9yLT5i YXNlOworCXN0YXRlID0gY29ubmVjdG9yLT5zdGF0ZTsKIAogCS8qIFRoZSBkb2N1bWVudGF0aW9u LCBmb3IgdGhlIG9sZGVyIGNoaXBzZXRzIGF0IGxlYXN0LCByZWNvbW1lbmQKIAkgKiB1c2luZyBh IHBvbGxpbmcgbWV0aG9kIHJhdGhlciB0aGFuIGhvdHBsdWcgZGV0ZWN0aW9uIGZvciBUVnMuCkBA IC0xNTk3LDEyICsxNTQ4LDEyIEBAIGludGVsX3R2X2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQogCWludGVsX3R2LT50eXBlID0gRFJNX01PREVfQ09OTkVDVE9SX1Vua25v d247CiAKIAkvKiBCSU9TIG1hcmdpbiB2YWx1ZXMgKi8KLQlpbnRlbF90di0+bWFyZ2luW1RWX01B UkdJTl9MRUZUXSA9IDU0OwotCWludGVsX3R2LT5tYXJnaW5bVFZfTUFSR0lOX1RPUF0gPSAzNjsK LQlpbnRlbF90di0+bWFyZ2luW1RWX01BUkdJTl9SSUdIVF0gPSA0NjsKLQlpbnRlbF90di0+bWFy Z2luW1RWX01BUkdJTl9CT1RUT01dID0gMzc7CisJc3RhdGUtPnR2Lm1hcmdpbnMubGVmdCA9IDU0 OworCXN0YXRlLT50di5tYXJnaW5zLnRvcCA9IDM2OworCXN0YXRlLT50di5tYXJnaW5zLnJpZ2h0 ID0gNDY7CisJc3RhdGUtPnR2Lm1hcmdpbnMuYm90dG9tID0gMzc7CiAKLQlpbnRlbF90di0+dHZf Zm9ybWF0ID0gdHZfbW9kZXNbaW5pdGlhbF9tb2RlXS5uYW1lOworCXN0YXRlLT50di5tb2RlID0g aW5pdGlhbF9tb2RlOwogCiAJZHJtX2Nvbm5lY3Rvcl9oZWxwZXJfYWRkKGNvbm5lY3RvciwgJmlu dGVsX3R2X2Nvbm5lY3Rvcl9oZWxwZXJfZnVuY3MpOwogCWNvbm5lY3Rvci0+aW50ZXJsYWNlX2Fs bG93ZWQgPSBmYWxzZTsKQEAgLTE2MTYsMTcgKzE1NjcsMTcgQEAgaW50ZWxfdHZfaW5pdChzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCQkJICAgICAgdHZfZm9ybWF0X25hbWVz KTsKIAogCWRybV9vYmplY3RfYXR0YWNoX3Byb3BlcnR5KCZjb25uZWN0b3ItPmJhc2UsIGRldi0+ bW9kZV9jb25maWcudHZfbW9kZV9wcm9wZXJ0eSwKLQkJCQkgICBpbml0aWFsX21vZGUpOworCQkJ CSAgIHN0YXRlLT50di5tb2RlKTsKIAlkcm1fb2JqZWN0X2F0dGFjaF9wcm9wZXJ0eSgmY29ubmVj dG9yLT5iYXNlLAogCQkJCSAgIGRldi0+bW9kZV9jb25maWcudHZfbGVmdF9tYXJnaW5fcHJvcGVy dHksCi0JCQkJICAgaW50ZWxfdHYtPm1hcmdpbltUVl9NQVJHSU5fTEVGVF0pOworCQkJCSAgIHN0 YXRlLT50di5tYXJnaW5zLmxlZnQpOwogCWRybV9vYmplY3RfYXR0YWNoX3Byb3BlcnR5KCZjb25u ZWN0b3ItPmJhc2UsCiAJCQkJICAgZGV2LT5tb2RlX2NvbmZpZy50dl90b3BfbWFyZ2luX3Byb3Bl cnR5LAotCQkJCSAgIGludGVsX3R2LT5tYXJnaW5bVFZfTUFSR0lOX1RPUF0pOworCQkJCSAgIHN0 YXRlLT50di5tYXJnaW5zLnRvcCk7CiAJZHJtX29iamVjdF9hdHRhY2hfcHJvcGVydHkoJmNvbm5l Y3Rvci0+YmFzZSwKIAkJCQkgICBkZXYtPm1vZGVfY29uZmlnLnR2X3JpZ2h0X21hcmdpbl9wcm9w ZXJ0eSwKLQkJCQkgICBpbnRlbF90di0+bWFyZ2luW1RWX01BUkdJTl9SSUdIVF0pOworCQkJCSAg IHN0YXRlLT50di5tYXJnaW5zLnJpZ2h0KTsKIAlkcm1fb2JqZWN0X2F0dGFjaF9wcm9wZXJ0eSgm Y29ubmVjdG9yLT5iYXNlLAogCQkJCSAgIGRldi0+bW9kZV9jb25maWcudHZfYm90dG9tX21hcmdp bl9wcm9wZXJ0eSwKLQkJCQkgICBpbnRlbF90di0+bWFyZ2luW1RWX01BUkdJTl9CT1RUT01dKTsK KwkJCQkgICBzdGF0ZS0+dHYubWFyZ2lucy5ib3R0b20pOwogfQotLSAKMi43LjQKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=