From: Vidya Srinivas Subject: [PATCH 02/14] drm/i915/skl+: refactore WM calculation for NV12 Date: Tue, 10 Oct 2017 17:47:46 +0530 Message-ID: <1507637878-17165-3-git-send-email-vidya.srinivas@intel.com> References: <1507637878-17165-1-git-send-email-vidya.srinivas@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id DF11E6E41C for ; Tue, 10 Oct 2017 12:09:39 +0000 (UTC) In-Reply-To: <1507637878-17165-1-git-send-email-vidya.srinivas@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 RnJvbTogTWFoZXNoIEt1bWFyIDxtYWhlc2gxLmt1bWFyQGludGVsLmNvbT4KCkN1cnJlbnQgY29k ZSBjYWxjdWxhdGVzIEREQiBmb3IgcGxhbmFyIGZvcm1hdHMgaW4gc3VjaCBhIHdheSB0aGF0IHdl CnN0b3JlIEREQiBvZiBwbGFuZS0wIGluIHBsYW5lIDEgJiB2aWNlLXZlcnNhLgpJbiBvcmRlciB0 byBtYWtlIHRoaXMgY2xlYW4gdGhpcyBwYXRjaCByZWZhY3RvcnMgV00vRERCIGNhbGN1bGF0aW9u IGZvcgpOVjEyIHBsYW5hciBmb3JtYXRzLgoKU2lnbmVkLW9mZi1ieTogTWFoZXNoIEt1bWFyIDxt YWhlc2gxLmt1bWFyQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oICB8ICAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggfCAgIDEgKwog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgfCAxMjAgKysrKysrKysrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDYyIGluc2VydGlvbnMoKyks IDYxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDFiNWNmMTguLjA5 MDgzMmMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMTg0OCw3ICsxODQ4LDcgQEAgc3Rh dGljIGlubGluZSBib29sIHNrbF9kZGJfZW50cnlfZXF1YWwoY29uc3Qgc3RydWN0IHNrbF9kZGJf ZW50cnkgKmUxLAogCiBzdHJ1Y3Qgc2tsX2RkYl9hbGxvY2F0aW9uIHsKIAlzdHJ1Y3Qgc2tsX2Rk Yl9lbnRyeSBwbGFuZVtJOTE1X01BWF9QSVBFU11bSTkxNV9NQVhfUExBTkVTXTsgLyogcGFja2Vk L3V2ICovCi0Jc3RydWN0IHNrbF9kZGJfZW50cnkgeV9wbGFuZVtJOTE1X01BWF9QSVBFU11bSTkx NV9NQVhfUExBTkVTXTsKKwlzdHJ1Y3Qgc2tsX2RkYl9lbnRyeSB1dl9wbGFuZVtJOTE1X01BWF9Q SVBFU11bSTkxNV9NQVhfUExBTkVTXTsKIH07CiAKIHN0cnVjdCBza2xfZGRiX3ZhbHVlcyB7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDE2MGZkZWQuLmY4OTc1ODAgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2Rydi5oCkBAIC01MTAsNiArNTEwLDcgQEAgc3RydWN0IGludGVsX3BpcGVfd20g ewogc3RydWN0IHNrbF9wbGFuZV93bSB7CiAJc3RydWN0IHNrbF93bV9sZXZlbCB3bVs4XTsKIAlz dHJ1Y3Qgc2tsX3dtX2xldmVsIHRyYW5zX3dtOworCWJvb2wgaXNfbnYxMjsKIH07CiAKIHN0cnVj dCBza2xfcGlwZV93bSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCAwMjk0ODdkLi5iMDlk ODFiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTM5OTAsOSArMzk5MCw5IEBAIGludCBz a2xfY2hlY2tfcGlwZV9tYXhfcGl4ZWxfcmF0ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0 YywKIHN0YXRpYyB1bnNpZ25lZCBpbnQKIHNrbF9wbGFuZV9yZWxhdGl2ZV9kYXRhX3JhdGUoY29u c3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAkJCSAgICAgY29uc3Qgc3RydWN0 IGRybV9wbGFuZV9zdGF0ZSAqcHN0YXRlLAotCQkJICAgICBpbnQgeSkKKwkJCSAgICAgY29uc3Qg aW50IHBsYW5lKQogewotCXN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUgPSB0b19pbnRlbF9wbGFu ZShwc3RhdGUtPnBsYW5lKTsKKwlzdHJ1Y3QgaW50ZWxfcGxhbmUgKmludGVsX3BsYW5lID0gdG9f aW50ZWxfcGxhbmUocHN0YXRlLT5wbGFuZSk7CiAJc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpp bnRlbF9wc3RhdGUgPSB0b19pbnRlbF9wbGFuZV9zdGF0ZShwc3RhdGUpOwogCXVpbnQzMl90IGRh dGFfcmF0ZTsKIAl1aW50MzJfdCB3aWR0aCA9IDAsIGhlaWdodCA9IDA7CkBAIC00MDA2LDkgKzQw MDYsOSBAQCBpbnQgc2tsX2NoZWNrX3BpcGVfbWF4X3BpeGVsX3JhdGUoc3RydWN0IGludGVsX2Ny dGMgKmludGVsX2NydGMsCiAJZmIgPSBwc3RhdGUtPmZiOwogCWZvcm1hdCA9IGZiLT5mb3JtYXQt PmZvcm1hdDsKIAotCWlmIChwbGFuZS0+aWQgPT0gUExBTkVfQ1VSU09SKQorCWlmIChpbnRlbF9w bGFuZS0+aWQgPT0gUExBTkVfQ1VSU09SKQogCQlyZXR1cm4gMDsKLQlpZiAoeSAmJiBmb3JtYXQg IT0gRFJNX0ZPUk1BVF9OVjEyKQorCWlmIChwbGFuZSA9PSAxICYmIGZvcm1hdCAhPSBEUk1fRk9S TUFUX05WMTIpCiAJCXJldHVybiAwOwogCiAJLyoKQEAgLTQwMTksMTkgKzQwMTksMTQgQEAgaW50 IHNrbF9jaGVja19waXBlX21heF9waXhlbF9yYXRlKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9j cnRjLAogCXdpZHRoID0gZHJtX3JlY3Rfd2lkdGgoJmludGVsX3BzdGF0ZS0+YmFzZS5zcmMpID4+ IDE2OwogCWhlaWdodCA9IGRybV9yZWN0X2hlaWdodCgmaW50ZWxfcHN0YXRlLT5iYXNlLnNyYykg Pj4gMTY7CiAKLQkvKiBmb3IgcGxhbmFyIGZvcm1hdCAqLwotCWlmIChmb3JtYXQgPT0gRFJNX0ZP Uk1BVF9OVjEyKSB7Ci0JCWlmICh5KSAgLyogeS1wbGFuZSBkYXRhIHJhdGUgKi8KLQkJCWRhdGFf cmF0ZSA9IHdpZHRoICogaGVpZ2h0ICoKLQkJCQlmYi0+Zm9ybWF0LT5jcHBbMF07Ci0JCWVsc2Ug ICAgLyogdXYtcGxhbmUgZGF0YSByYXRlICovCi0JCQlkYXRhX3JhdGUgPSAod2lkdGggLyAyKSAq IChoZWlnaHQgLyAyKSAqCi0JCQkJZmItPmZvcm1hdC0+Y3BwWzFdOwotCX0gZWxzZSB7Ci0JCS8q IGZvciBwYWNrZWQgZm9ybWF0cyAqLwotCQlkYXRhX3JhdGUgPSB3aWR0aCAqIGhlaWdodCAqIGZi LT5mb3JtYXQtPmNwcFswXTsKKwkvKiBVViBwbGFuZSBkb2VzIDEvMiBwaXhlbCBzdWItc2FtcGxp bmcgKi8KKwlpZiAocGxhbmUgPT0gMSAmJiBmb3JtYXQgPT0gRFJNX0ZPUk1BVF9OVjEyKSB7CisJ CXdpZHRoIC89IDI7CisJCWhlaWdodCAvPSAyOwogCX0KIAorCWRhdGFfcmF0ZSA9IHdpZHRoICog aGVpZ2h0ICogZmItPmZvcm1hdC0+Y3BwW3BsYW5lXTsKKwogCWRvd25fc2NhbGVfYW1vdW50ID0g c2tsX3BsYW5lX2Rvd25zY2FsZV9hbW91bnQoY3N0YXRlLCBpbnRlbF9wc3RhdGUpOwogCiAJcmV0 dXJuIG11bF9yb3VuZF91cF91MzJfZml4ZWQxNihkYXRhX3JhdGUsIGRvd25fc2NhbGVfYW1vdW50 KTsKQEAgLTQwNDQsOCArNDAzOSw4IEBAIGludCBza2xfY2hlY2tfcGlwZV9tYXhfcGl4ZWxfcmF0 ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKICAqLwogc3RhdGljIHVuc2lnbmVkIGlu dAogc2tsX2dldF90b3RhbF9yZWxhdGl2ZV9kYXRhX3JhdGUoc3RydWN0IGludGVsX2NydGNfc3Rh dGUgKmludGVsX2NzdGF0ZSwKLQkJCQkgdW5zaWduZWQgKnBsYW5lX2RhdGFfcmF0ZSwKLQkJCQkg dW5zaWduZWQgKnBsYW5lX3lfZGF0YV9yYXRlKQorCQkJCSB1bnNpZ25lZCBpbnQgKnBsYW5lX2Rh dGFfcmF0ZSwKKwkJCQkgdW5zaWduZWQgaW50ICp1dl9wbGFuZV9kYXRhX3JhdGUpCiB7CiAJc3Ry dWN0IGRybV9jcnRjX3N0YXRlICpjc3RhdGUgPSAmaW50ZWxfY3N0YXRlLT5iYXNlOwogCXN0cnVj dCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSA9IGNzdGF0ZS0+c3RhdGU7CkBAIC00MDYxLDE3ICs0 MDU2LDE2IEBAIGludCBza2xfY2hlY2tfcGlwZV9tYXhfcGl4ZWxfcmF0ZShzdHJ1Y3QgaW50ZWxf Y3J0YyAqaW50ZWxfY3J0YywKIAkJZW51bSBwbGFuZV9pZCBwbGFuZV9pZCA9IHRvX2ludGVsX3Bs YW5lKHBsYW5lKS0+aWQ7CiAJCXVuc2lnbmVkIGludCByYXRlOwogCi0JCS8qIHBhY2tlZC91diAq LwogCQlyYXRlID0gc2tsX3BsYW5lX3JlbGF0aXZlX2RhdGFfcmF0ZShpbnRlbF9jc3RhdGUsCiAJ CQkJCQkgICAgcHN0YXRlLCAwKTsKIAkJcGxhbmVfZGF0YV9yYXRlW3BsYW5lX2lkXSA9IHJhdGU7 CiAKIAkJdG90YWxfZGF0YV9yYXRlICs9IHJhdGU7CiAKLQkJLyogeS1wbGFuZSAqLworCQkvKiB1 di1wbGFuZSAqLwogCQlyYXRlID0gc2tsX3BsYW5lX3JlbGF0aXZlX2RhdGFfcmF0ZShpbnRlbF9j c3RhdGUsCiAJCQkJCQkgICAgcHN0YXRlLCAxKTsKLQkJcGxhbmVfeV9kYXRhX3JhdGVbcGxhbmVf aWRdID0gcmF0ZTsKKwkJdXZfcGxhbmVfZGF0YV9yYXRlW3BsYW5lX2lkXSA9IHJhdGU7CiAKIAkJ dG90YWxfZGF0YV9yYXRlICs9IHJhdGU7CiAJfQpAQCAtNDA4MCw4ICs0MDc0LDcgQEAgaW50IHNr bF9jaGVja19waXBlX21heF9waXhlbF9yYXRlKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRj LAogfQogCiBzdGF0aWMgdWludDE2X3QKLXNrbF9kZGJfbWluX2FsbG9jKGNvbnN0IHN0cnVjdCBk cm1fcGxhbmVfc3RhdGUgKnBzdGF0ZSwKLQkJICBjb25zdCBpbnQgeSkKK3NrbF9kZGJfbWluX2Fs bG9jKGNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBzdGF0ZSwgY29uc3QgaW50IHBsYW5l KQogewogCXN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiID0gcHN0YXRlLT5mYjsKIAlzdHJ1Y3Qg aW50ZWxfcGxhbmVfc3RhdGUgKmludGVsX3BzdGF0ZSA9IHRvX2ludGVsX3BsYW5lX3N0YXRlKHBz dGF0ZSk7CkBAIC00MDkyLDggKzQwODUsOCBAQCBpbnQgc2tsX2NoZWNrX3BpcGVfbWF4X3BpeGVs X3JhdGUoc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMsCiAJaWYgKFdBUk5fT04oIWZiKSkK IAkJcmV0dXJuIDA7CiAKLQkvKiBGb3IgcGFja2VkIGZvcm1hdHMsIG5vIHktcGxhbmUsIHJldHVy biAwICovCi0JaWYgKHkgJiYgZmItPmZvcm1hdC0+Zm9ybWF0ICE9IERSTV9GT1JNQVRfTlYxMikK KwkvKiBGb3IgcGFja2VkIGZvcm1hdHMsIGFuZCB1di1wbGFuZSwgcmV0dXJuIDAgKi8KKwlpZiAo cGxhbmUgPT0gMSAmJiBmYi0+Zm9ybWF0LT5mb3JtYXQgIT0gRFJNX0ZPUk1BVF9OVjEyKQogCQly ZXR1cm4gMDsKIAogCS8qIEZvciBOb24gWS10aWxlIHJldHVybiA4LWJsb2NrcyAqLwpAQCAtNDEx MiwxNSArNDEwNSwxMiBAQCBpbnQgc2tsX2NoZWNrX3BpcGVfbWF4X3BpeGVsX3JhdGUoc3RydWN0 IGludGVsX2NydGMgKmludGVsX2NydGMsCiAJc3JjX2ggPSBkcm1fcmVjdF9oZWlnaHQoJmludGVs X3BzdGF0ZS0+YmFzZS5zcmMpID4+IDE2OwogCiAJLyogSGFsdmUgVVYgcGxhbmUgd2lkdGggYW5k IGhlaWdodCBmb3IgTlYxMiAqLwotCWlmIChmYi0+Zm9ybWF0LT5mb3JtYXQgPT0gRFJNX0ZPUk1B VF9OVjEyICYmICF5KSB7CisJaWYgKHBsYW5lID09IDEpIHsKIAkJc3JjX3cgLz0gMjsKIAkJc3Jj X2ggLz0gMjsKIAl9CiAKLQlpZiAoZmItPmZvcm1hdC0+Zm9ybWF0ID09IERSTV9GT1JNQVRfTlYx MiAmJiAheSkKLQkJcGxhbmVfYnBwID0gZmItPmZvcm1hdC0+Y3BwWzFdOwotCWVsc2UKLQkJcGxh bmVfYnBwID0gZmItPmZvcm1hdC0+Y3BwWzBdOworCXBsYW5lX2JwcCA9IGZiLT5mb3JtYXQtPmNw cFtwbGFuZV07CiAKIAlpZiAoZHJtX3JvdGF0aW9uXzkwX29yXzI3MChwc3RhdGUtPnJvdGF0aW9u KSkgewogCQlzd2l0Y2ggKHBsYW5lX2JwcCkgewpAQCAtNDE0OCw3ICs0MTM4LDcgQEAgaW50IHNr bF9jaGVja19waXBlX21heF9waXhlbF9yYXRlKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRj LAogCiBzdGF0aWMgdm9pZAogc2tsX2RkYl9jYWxjX21pbihjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0 Y19zdGF0ZSAqY3N0YXRlLCBpbnQgbnVtX2FjdGl2ZSwKLQkJIHVpbnQxNl90ICptaW5pbXVtLCB1 aW50MTZfdCAqeV9taW5pbXVtKQorCQkgdWludDE2X3QgKm1pbmltdW0sIHVpbnQxNl90ICp1dl9t aW5pbXVtKQogewogCWNvbnN0IHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBzdGF0ZTsKIAlzdHJ1 Y3QgZHJtX3BsYW5lICpwbGFuZTsKQEAgLTQxNjMsNyArNDE1Myw3IEBAIGludCBza2xfY2hlY2tf cGlwZV9tYXhfcGl4ZWxfcmF0ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKIAkJCWNv bnRpbnVlOwogCiAJCW1pbmltdW1bcGxhbmVfaWRdID0gc2tsX2RkYl9taW5fYWxsb2MocHN0YXRl LCAwKTsKLQkJeV9taW5pbXVtW3BsYW5lX2lkXSA9IHNrbF9kZGJfbWluX2FsbG9jKHBzdGF0ZSwg MSk7CisJCXV2X21pbmltdW1bcGxhbmVfaWRdID0gc2tsX2RkYl9taW5fYWxsb2MocHN0YXRlLCAx KTsKIAl9CiAKIAltaW5pbXVtW1BMQU5FX0NVUlNPUl0gPSBza2xfY3Vyc29yX2FsbG9jYXRpb24o bnVtX2FjdGl2ZSk7CkBAIC00MTgxLDE3ICs0MTcxLDE3IEBAIGludCBza2xfY2hlY2tfcGlwZV9t YXhfcGl4ZWxfcmF0ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKIAlzdHJ1Y3Qgc2ts X2RkYl9lbnRyeSAqYWxsb2MgPSAmY3N0YXRlLT53bS5za2wuZGRiOwogCXVpbnQxNl90IGFsbG9j X3NpemUsIHN0YXJ0OwogCXVpbnQxNl90IG1pbmltdW1bSTkxNV9NQVhfUExBTkVTXSA9IHt9Owot CXVpbnQxNl90IHlfbWluaW11bVtJOTE1X01BWF9QTEFORVNdID0ge307CisJdWludDE2X3QgdXZf bWluaW11bVtJOTE1X01BWF9QTEFORVNdID0ge307CiAJdW5zaWduZWQgaW50IHRvdGFsX2RhdGFf cmF0ZTsKIAllbnVtIHBsYW5lX2lkIHBsYW5lX2lkOwogCWludCBudW1fYWN0aXZlOwotCXVuc2ln bmVkIHBsYW5lX2RhdGFfcmF0ZVtJOTE1X01BWF9QTEFORVNdID0ge307Ci0JdW5zaWduZWQgcGxh bmVfeV9kYXRhX3JhdGVbSTkxNV9NQVhfUExBTkVTXSA9IHt9OworCXVuc2lnbmVkIGludCBwbGFu ZV9kYXRhX3JhdGVbSTkxNV9NQVhfUExBTkVTXSA9IHt9OworCXVuc2lnbmVkIGludCB1dl9wbGFu ZV9kYXRhX3JhdGVbSTkxNV9NQVhfUExBTkVTXSA9IHt9OwogCXVpbnQxNl90IHRvdGFsX21pbl9i bG9ja3MgPSAwOwogCiAJLyogQ2xlYXIgdGhlIHBhcnRpdGlvbmluZyBmb3IgZGlzYWJsZWQgcGxh bmVzLiAqLwogCW1lbXNldChkZGItPnBsYW5lW3BpcGVdLCAwLCBzaXplb2YoZGRiLT5wbGFuZVtw aXBlXSkpOwotCW1lbXNldChkZGItPnlfcGxhbmVbcGlwZV0sIDAsIHNpemVvZihkZGItPnlfcGxh bmVbcGlwZV0pKTsKKwltZW1zZXQoZGRiLT51dl9wbGFuZVtwaXBlXSwgMCwgc2l6ZW9mKGRkYi0+ dXZfcGxhbmVbcGlwZV0pKTsKIAogCWlmIChXQVJOX09OKCFzdGF0ZSkpCiAJCXJldHVybiAwOwpA QCAtNDIwNiw3ICs0MTk2LDcgQEAgaW50IHNrbF9jaGVja19waXBlX21heF9waXhlbF9yYXRlKHN0 cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAogCWlmIChhbGxvY19zaXplID09IDApCiAJCXJl dHVybiAwOwogCi0Jc2tsX2RkYl9jYWxjX21pbihjc3RhdGUsIG51bV9hY3RpdmUsIG1pbmltdW0s IHlfbWluaW11bSk7CisJc2tsX2RkYl9jYWxjX21pbihjc3RhdGUsIG51bV9hY3RpdmUsIG1pbmlt dW0sIHV2X21pbmltdW0pOwogCiAJLyoKIAkgKiAxLiBBbGxvY2F0ZSB0aGUgbWluaW51bSByZXF1 aXJlZCBibG9ja3MgZm9yIGVhY2ggYWN0aXZlIHBsYW5lCkBAIC00MjE2LDcgKzQyMDYsNyBAQCBp bnQgc2tsX2NoZWNrX3BpcGVfbWF4X3BpeGVsX3JhdGUoc3RydWN0IGludGVsX2NydGMgKmludGVs X2NydGMsCiAKIAlmb3JfZWFjaF9wbGFuZV9pZF9vbl9jcnRjKGludGVsX2NydGMsIHBsYW5lX2lk KSB7CiAJCXRvdGFsX21pbl9ibG9ja3MgKz0gbWluaW11bVtwbGFuZV9pZF07Ci0JCXRvdGFsX21p bl9ibG9ja3MgKz0geV9taW5pbXVtW3BsYW5lX2lkXTsKKwkJdG90YWxfbWluX2Jsb2NrcyArPSB1 dl9taW5pbXVtW3BsYW5lX2lkXTsKIAl9CiAKIAlpZiAodG90YWxfbWluX2Jsb2NrcyA+IGFsbG9j X3NpemUpIHsKQEAgLTQyMzgsMTQgKzQyMjgsMTQgQEAgaW50IHNrbF9jaGVja19waXBlX21heF9w aXhlbF9yYXRlKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAogCSAqLwogCXRvdGFsX2Rh dGFfcmF0ZSA9IHNrbF9nZXRfdG90YWxfcmVsYXRpdmVfZGF0YV9yYXRlKGNzdGF0ZSwKIAkJCQkJ CQkgICBwbGFuZV9kYXRhX3JhdGUsCi0JCQkJCQkJICAgcGxhbmVfeV9kYXRhX3JhdGUpOworCQkJ CQkJCSAgIHV2X3BsYW5lX2RhdGFfcmF0ZSk7CiAJaWYgKHRvdGFsX2RhdGFfcmF0ZSA9PSAwKQog CQlyZXR1cm4gMDsKIAogCXN0YXJ0ID0gYWxsb2MtPnN0YXJ0OwogCWZvcl9lYWNoX3BsYW5lX2lk X29uX2NydGMoaW50ZWxfY3J0YywgcGxhbmVfaWQpIHsKLQkJdW5zaWduZWQgaW50IGRhdGFfcmF0 ZSwgeV9kYXRhX3JhdGU7Ci0JCXVpbnQxNl90IHBsYW5lX2Jsb2NrcywgeV9wbGFuZV9ibG9ja3Mg PSAwOworCQl1bnNpZ25lZCBpbnQgZGF0YV9yYXRlLCB1dl9kYXRhX3JhdGU7CisJCXVpbnQxNl90 IHBsYW5lX2Jsb2NrcywgdXZfcGxhbmVfYmxvY2tzOwogCiAJCWlmIChwbGFuZV9pZCA9PSBQTEFO RV9DVVJTT1IpCiAJCQljb250aW51ZTsKQEAgLTQyNjksMjEgKzQyNTksMjAgQEAgaW50IHNrbF9j aGVja19waXBlX21heF9waXhlbF9yYXRlKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAog CiAJCXN0YXJ0ICs9IHBsYW5lX2Jsb2NrczsKIAotCQkvKgotCQkgKiBhbGxvY2F0aW9uIGZvciB5 X3BsYW5lIHBhcnQgb2YgcGxhbmFyIGZvcm1hdDoKLQkJICovCi0JCXlfZGF0YV9yYXRlID0gcGxh bmVfeV9kYXRhX3JhdGVbcGxhbmVfaWRdOworCQkvKiBBbGxvY2F0ZSBEREIgZm9yIFVWIHBsYW5l IGZvciBwbGFuYXIgZm9ybWF0L05WMTIgKi8KKwkJdXZfZGF0YV9yYXRlID0gdXZfcGxhbmVfZGF0 YV9yYXRlW3BsYW5lX2lkXTsKIAotCQl5X3BsYW5lX2Jsb2NrcyA9IHlfbWluaW11bVtwbGFuZV9p ZF07Ci0JCXlfcGxhbmVfYmxvY2tzICs9IGRpdl91NjQoKHVpbnQ2NF90KWFsbG9jX3NpemUgKiB5 X2RhdGFfcmF0ZSwKKwkJdXZfcGxhbmVfYmxvY2tzID0gdXZfbWluaW11bVtwbGFuZV9pZF07CisJ CXV2X3BsYW5lX2Jsb2NrcyArPSBkaXZfdTY0KCh1aW50NjRfdClhbGxvY19zaXplICogdXZfZGF0 YV9yYXRlLAogCQkJCQl0b3RhbF9kYXRhX3JhdGUpOwogCi0JCWlmICh5X2RhdGFfcmF0ZSkgewot CQkJZGRiLT55X3BsYW5lW3BpcGVdW3BsYW5lX2lkXS5zdGFydCA9IHN0YXJ0OwotCQkJZGRiLT55 X3BsYW5lW3BpcGVdW3BsYW5lX2lkXS5lbmQgPSBzdGFydCArIHlfcGxhbmVfYmxvY2tzOworCQlp ZiAodXZfZGF0YV9yYXRlKSB7CisJCQlkZGItPnV2X3BsYW5lW3BpcGVdW3BsYW5lX2lkXS5zdGFy dCA9IHN0YXJ0OworCQkJZGRiLT51dl9wbGFuZVtwaXBlXVtwbGFuZV9pZF0uZW5kID0gc3RhcnQg KworCQkJCQkJCQl1dl9wbGFuZV9ibG9ja3M7CiAJCX0KIAotCQlzdGFydCArPSB5X3BsYW5lX2Js b2NrczsKKwkJc3RhcnQgKz0gdXZfcGxhbmVfYmxvY2tzOwogCX0KIAogCXJldHVybiAwOwpAQCAt NDQxMSw4ICs0NDAwLDcgQEAgc3RhdGljIHVpbnRfZml4ZWRfMTZfMTZfdCBza2xfd21fbWV0aG9k Mih1aW50MzJfdCBwaXhlbF9yYXRlLAogCQl3cC0+d2lkdGggPSBkcm1fcmVjdF93aWR0aCgmaW50 ZWxfcHN0YXRlLT5iYXNlLnNyYykgPj4gMTY7CiAJfQogCi0Jd3AtPmNwcCA9IChmYi0+Zm9ybWF0 LT5mb3JtYXQgPT0gRFJNX0ZPUk1BVF9OVjEyKSA/IGZiLT5mb3JtYXQtPmNwcFsxXSA6Ci0JCQkJ CQkJICAgIGZiLT5mb3JtYXQtPmNwcFswXTsKKwl3cC0+Y3BwID0gZmItPmZvcm1hdC0+Y3BwWzBd OwogCXdwLT5wbGFuZV9waXhlbF9yYXRlID0gc2tsX2FkanVzdGVkX3BsYW5lX3BpeGVsX3JhdGUo Y3N0YXRlLAogCQkJCQkJCSAgICAgaW50ZWxfcHN0YXRlKTsKIApAQCAtNDYwNCw2ICs0NTkyLDkg QEAgc3RhdGljIGludCBza2xfY29tcHV0ZV9wbGFuZV93bShjb25zdCBzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYsCiAJCQlyZXR1cm4gcmV0OwogCX0KIAorCWlmIChpbnRlbF9wc3Rh dGUtPmJhc2UuZmItPmZvcm1hdC0+Zm9ybWF0ID09IERSTV9GT1JNQVRfTlYxMikKKwkJd20tPmlz X252MTIgPSB0cnVlOworCiAJcmV0dXJuIDA7CiB9CiAKQEAgLTQ3NzQsMTAgKzQ3NjUsMTkgQEAg c3RhdGljIHZvaWQgc2tsX3dyaXRlX3BsYW5lX3dtKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9j cnRjLAogCXNrbF93cml0ZV93bV9sZXZlbChkZXZfcHJpdiwgUExBTkVfV01fVFJBTlMocGlwZSwg cGxhbmVfaWQpLAogCQkJICAgJndtLT50cmFuc193bSk7CiAKLQlza2xfZGRiX2VudHJ5X3dyaXRl KGRldl9wcml2LCBQTEFORV9CVUZfQ0ZHKHBpcGUsIHBsYW5lX2lkKSwKLQkJCSAgICAmZGRiLT5w bGFuZVtwaXBlXVtwbGFuZV9pZF0pOwotCXNrbF9kZGJfZW50cnlfd3JpdGUoZGV2X3ByaXYsIFBM QU5FX05WMTJfQlVGX0NGRyhwaXBlLCBwbGFuZV9pZCksCi0JCQkgICAgJmRkYi0+eV9wbGFuZVtw aXBlXVtwbGFuZV9pZF0pOworCWlmICh3bS0+aXNfbnYxMikgeworCQlza2xfZGRiX2VudHJ5X3dy aXRlKGRldl9wcml2LCBQTEFORV9CVUZfQ0ZHKHBpcGUsIHBsYW5lX2lkKSwKKwkJCQkmZGRiLT51 dl9wbGFuZVtwaXBlXVtwbGFuZV9pZF0pOworCQlza2xfZGRiX2VudHJ5X3dyaXRlKGRldl9wcml2 LAorCQkJCSAgICBQTEFORV9OVjEyX0JVRl9DRkcocGlwZSwgcGxhbmVfaWQpLAorCQkJCSAgICAm ZGRiLT5wbGFuZVtwaXBlXVtwbGFuZV9pZF0pOworCX0gZWxzZSB7CisJCXNrbF9kZGJfZW50cnlf d3JpdGUoZGV2X3ByaXYsIFBMQU5FX0JVRl9DRkcocGlwZSwgcGxhbmVfaWQpLAorCQkJCSZkZGIt PnBsYW5lW3BpcGVdW3BsYW5lX2lkXSk7CisJCXNrbF9kZGJfZW50cnlfd3JpdGUoZGV2X3ByaXYs CisJCQkJICAgIFBMQU5FX05WMTJfQlVGX0NGRyhwaXBlLCBwbGFuZV9pZCksCisJCQkJICAgICZk ZGItPnV2X3BsYW5lW3BpcGVdW3BsYW5lX2lkXSk7CisJfQogfQogCiBzdGF0aWMgdm9pZCBza2xf d3JpdGVfY3Vyc29yX3dtKHN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLApAQCAtNDg5MCw4 ICs0ODkwLDggQEAgc3RhdGljIGludCBza2xfdXBkYXRlX3BpcGVfd20oc3RydWN0IGRybV9jcnRj X3N0YXRlICpjc3RhdGUsCiAKIAkJaWYgKHNrbF9kZGJfZW50cnlfZXF1YWwoJmN1cl9kZGItPnBs YW5lW3BpcGVdW3BsYW5lX2lkXSwKIAkJCQkJJm5ld19kZGItPnBsYW5lW3BpcGVdW3BsYW5lX2lk XSkgJiYKLQkJICAgIHNrbF9kZGJfZW50cnlfZXF1YWwoJmN1cl9kZGItPnlfcGxhbmVbcGlwZV1b cGxhbmVfaWRdLAotCQkJCQkmbmV3X2RkYi0+eV9wbGFuZVtwaXBlXVtwbGFuZV9pZF0pKQorCQkg ICAgc2tsX2RkYl9lbnRyeV9lcXVhbCgmY3VyX2RkYi0+dXZfcGxhbmVbcGlwZV1bcGxhbmVfaWRd LAorCQkJCQkmbmV3X2RkYi0+dXZfcGxhbmVbcGlwZV1bcGxhbmVfaWRdKSkKIAkJCWNvbnRpbnVl OwogCiAJCXBsYW5lX3N0YXRlID0gZHJtX2F0b21pY19nZXRfcGxhbmVfc3RhdGUoc3RhdGUsIHBs YW5lKTsKQEAgLTQ5ODUsOCArNDk4NSw4IEBAIHN0YXRpYyBpbnQgc2tsX3VwZGF0ZV9waXBlX3dt KHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3N0YXRlLAogCQkgICAgIHN0cnVjdCBza2xfZGRiX3Zh bHVlcyAqc3JjLAogCQkgICAgIGVudW0gcGlwZSBwaXBlKQogewotCW1lbWNweShkc3QtPmRkYi55 X3BsYW5lW3BpcGVdLCBzcmMtPmRkYi55X3BsYW5lW3BpcGVdLAotCSAgICAgICBzaXplb2YoZHN0 LT5kZGIueV9wbGFuZVtwaXBlXSkpOworCW1lbWNweShkc3QtPmRkYi51dl9wbGFuZVtwaXBlXSwg c3JjLT5kZGIudXZfcGxhbmVbcGlwZV0sCisJICAgICAgIHNpemVvZihkc3QtPmRkYi51dl9wbGFu ZVtwaXBlXSkpOwogCW1lbWNweShkc3QtPmRkYi5wbGFuZVtwaXBlXSwgc3JjLT5kZGIucGxhbmVb cGlwZV0sCiAJICAgICAgIHNpemVvZihkc3QtPmRkYi5wbGFuZVtwaXBlXSkpOwogfQotLSAKMS45 LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=