From: Vidya Srinivas Subject: [PATCH 02/16] drm/i915/skl+: refactor WM calculation for NV12 Date: Tue, 13 Feb 2018 15:22:00 +0530 Message-ID: <1518515534-12972-3-git-send-email-vidya.srinivas@intel.com> References: <1518515534-12972-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 979ED89308 for ; Tue, 13 Feb 2018 09:54:00 +0000 (UTC) In-Reply-To: <1518515534-12972-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 Cc: Vidya Srinivas List-Id: intel-gfx@lists.freedesktop.org RnJvbTogTWFoZXNoIEt1bWFyIDxtYWhlc2gxLmt1bWFyQGludGVsLmNvbT4KCkN1cnJlbnQgY29k ZSBjYWxjdWxhdGVzIEREQiBmb3IgcGxhbmFyIGZvcm1hdHMgaW4gc3VjaCBhIHdheSB0aGF0IHdl CnN0b3JlIEREQiBvZiBwbGFuZS0wIGluIHBsYW5lIDEgJiB2aWNlLXZlcnNhLgpJbiBvcmRlciB0 byBtYWtlIHRoaXMgY2xlYW4gdGhpcyBwYXRjaCByZWZhY3RvcnMgV00vRERCIGNhbGN1bGF0aW9u IGZvcgpOVjEyIHBsYW5hciBmb3JtYXRzLgoKdjI6IEFkZHJlc3NlZCByZXZpZXcgY29tbWVudHMg YnkgTWFhcnRlbgoKdjM6IFJlYmFzZWQgYW5kIGFkZHJlc3NlZCByZXZpZXcgY29tbWVudHMgYnkg TWFhcnRlbgoKUmV2aWV3ZWQtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3Jz dEBsaW51eC5pbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IE1haGVzaCBLdW1hciA8bWFoZXNoMS5r dW1hckBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IFZpZHlhIFNyaW5pdmFzIDx2aWR5YS5zcmlu aXZhc0BpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgfCAg IDUgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIHwgICAxICsKIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3BtLmMgIHwgMTIxICsrKysrKysrKysrKysrKysrKysrLS0tLS0t LS0tLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCA2NiBpbnNlcnRpb25zKCspLCA2MSBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAzODNhNjlhLi5jYjMzOWVjIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTE0NDEsOCArMTQ0MSw5IEBAIHN0YXRpYyBpbmxp bmUgYm9vbCBza2xfZGRiX2VudHJ5X2VxdWFsKGNvbnN0IHN0cnVjdCBza2xfZGRiX2VudHJ5ICpl MSwKIH0KIAogc3RydWN0IHNrbF9kZGJfYWxsb2NhdGlvbiB7Ci0Jc3RydWN0IHNrbF9kZGJfZW50 cnkgcGxhbmVbSTkxNV9NQVhfUElQRVNdW0k5MTVfTUFYX1BMQU5FU107IC8qIHBhY2tlZC91diAq LwotCXN0cnVjdCBza2xfZGRiX2VudHJ5IHlfcGxhbmVbSTkxNV9NQVhfUElQRVNdW0k5MTVfTUFY X1BMQU5FU107CisJLyogcGFja2VkL3kgKi8KKwlzdHJ1Y3Qgc2tsX2RkYl9lbnRyeSBwbGFuZVtJ OTE1X01BWF9QSVBFU11bSTkxNV9NQVhfUExBTkVTXTsKKwlzdHJ1Y3Qgc2tsX2RkYl9lbnRyeSB1 dl9wbGFuZVtJOTE1X01BWF9QSVBFU11bSTkxNV9NQVhfUExBTkVTXTsKIH07CiAKIHN0cnVjdCBz a2xfZGRiX3ZhbHVlcyB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDg3MTlmM2QuLjkx NDVkNWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC01OTUsNiArNTk1LDcgQEAgc3Ry dWN0IGludGVsX3BpcGVfd20gewogc3RydWN0IHNrbF9wbGFuZV93bSB7CiAJc3RydWN0IHNrbF93 bV9sZXZlbCB3bVs4XTsKIAlzdHJ1Y3Qgc2tsX3dtX2xldmVsIHRyYW5zX3dtOworCWJvb2wgaXNf cGxhbmFyOwogfTsKIAogc3RydWN0IHNrbF9waXBlX3dtIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5j CmluZGV4IGY2NTM2ZjQuLjcwMDIyN2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAtNDAx Miw5ICs0MDEyLDkgQEAgaW50IHNrbF9jaGVja19waXBlX21heF9waXhlbF9yYXRlKHN0cnVjdCBp bnRlbF9jcnRjICppbnRlbF9jcnRjLAogc3RhdGljIHVuc2lnbmVkIGludAogc2tsX3BsYW5lX3Jl bGF0aXZlX2RhdGFfcmF0ZShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAog CQkJICAgICBjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwc3RhdGUsCi0JCQkgICAgIGlu dCB5KQorCQkJICAgICBjb25zdCBpbnQgcGxhbmUpCiB7Ci0Jc3RydWN0IGludGVsX3BsYW5lICpw bGFuZSA9IHRvX2ludGVsX3BsYW5lKHBzdGF0ZS0+cGxhbmUpOworCXN0cnVjdCBpbnRlbF9wbGFu ZSAqaW50ZWxfcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwc3RhdGUtPnBsYW5lKTsKIAlzdHJ1Y3Qg aW50ZWxfcGxhbmVfc3RhdGUgKmludGVsX3BzdGF0ZSA9IHRvX2ludGVsX3BsYW5lX3N0YXRlKHBz dGF0ZSk7CiAJdWludDMyX3QgZGF0YV9yYXRlOwogCXVpbnQzMl90IHdpZHRoID0gMCwgaGVpZ2h0 ID0gMDsKQEAgLTQwMjgsOSArNDAyOCw5IEBAIHNrbF9wbGFuZV9yZWxhdGl2ZV9kYXRhX3JhdGUo Y29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAlmYiA9IHBzdGF0ZS0+ZmI7 CiAJZm9ybWF0ID0gZmItPmZvcm1hdC0+Zm9ybWF0OwogCi0JaWYgKHBsYW5lLT5pZCA9PSBQTEFO RV9DVVJTT1IpCisJaWYgKGludGVsX3BsYW5lLT5pZCA9PSBQTEFORV9DVVJTT1IpCiAJCXJldHVy biAwOwotCWlmICh5ICYmIGZvcm1hdCAhPSBEUk1fRk9STUFUX05WMTIpCisJaWYgKHBsYW5lID09 IDEgJiYgZm9ybWF0ICE9IERSTV9GT1JNQVRfTlYxMikKIAkJcmV0dXJuIDA7CiAKIAkvKgpAQCAt NDA0MSwxOSArNDA0MSwxNCBAQCBza2xfcGxhbmVfcmVsYXRpdmVfZGF0YV9yYXRlKGNvbnN0IHN0 cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJd2lkdGggPSBkcm1fcmVjdF93aWR0aCgm aW50ZWxfcHN0YXRlLT5iYXNlLnNyYykgPj4gMTY7CiAJaGVpZ2h0ID0gZHJtX3JlY3RfaGVpZ2h0 KCZpbnRlbF9wc3RhdGUtPmJhc2Uuc3JjKSA+PiAxNjsKIAotCS8qIGZvciBwbGFuYXIgZm9ybWF0 ICovCi0JaWYgKGZvcm1hdCA9PSBEUk1fRk9STUFUX05WMTIpIHsKLQkJaWYgKHkpICAvKiB5LXBs YW5lIGRhdGEgcmF0ZSAqLwotCQkJZGF0YV9yYXRlID0gd2lkdGggKiBoZWlnaHQgKgotCQkJCWZi LT5mb3JtYXQtPmNwcFswXTsKLQkJZWxzZSAgICAvKiB1di1wbGFuZSBkYXRhIHJhdGUgKi8KLQkJ CWRhdGFfcmF0ZSA9ICh3aWR0aCAvIDIpICogKGhlaWdodCAvIDIpICoKLQkJCQlmYi0+Zm9ybWF0 LT5jcHBbMV07Ci0JfSBlbHNlIHsKLQkJLyogZm9yIHBhY2tlZCBmb3JtYXRzICovCi0JCWRhdGFf cmF0ZSA9IHdpZHRoICogaGVpZ2h0ICogZmItPmZvcm1hdC0+Y3BwWzBdOworCS8qIFVWIHBsYW5l IGRvZXMgMS8yIHBpeGVsIHN1Yi1zYW1wbGluZyAqLworCWlmIChwbGFuZSA9PSAxICYmIGZvcm1h dCA9PSBEUk1fRk9STUFUX05WMTIpIHsKKwkJd2lkdGggLz0gMjsKKwkJaGVpZ2h0IC89IDI7CiAJ fQogCisJZGF0YV9yYXRlID0gd2lkdGggKiBoZWlnaHQgKiBmYi0+Zm9ybWF0LT5jcHBbcGxhbmVd OworCiAJZG93bl9zY2FsZV9hbW91bnQgPSBza2xfcGxhbmVfZG93bnNjYWxlX2Ftb3VudChjc3Rh dGUsIGludGVsX3BzdGF0ZSk7CiAKIAlyZXR1cm4gbXVsX3JvdW5kX3VwX3UzMl9maXhlZDE2KGRh dGFfcmF0ZSwgZG93bl9zY2FsZV9hbW91bnQpOwpAQCAtNDA2Niw4ICs0MDYxLDggQEAgc2tsX3Bs YW5lX3JlbGF0aXZlX2RhdGFfcmF0ZShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0 YXRlLAogICovCiBzdGF0aWMgdW5zaWduZWQgaW50CiBza2xfZ2V0X3RvdGFsX3JlbGF0aXZlX2Rh dGFfcmF0ZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqaW50ZWxfY3N0YXRlLAotCQkJCSB1bnNp Z25lZCAqcGxhbmVfZGF0YV9yYXRlLAotCQkJCSB1bnNpZ25lZCAqcGxhbmVfeV9kYXRhX3JhdGUp CisJCQkJIHVuc2lnbmVkIGludCAqcGxhbmVfZGF0YV9yYXRlLAorCQkJCSB1bnNpZ25lZCBpbnQg KnV2X3BsYW5lX2RhdGFfcmF0ZSkKIHsKIAlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNzdGF0ZSA9 ICZpbnRlbF9jc3RhdGUtPmJhc2U7CiAJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlID0g Y3N0YXRlLT5zdGF0ZTsKQEAgLTQwODMsMTcgKzQwNzgsMTcgQEAgc2tsX2dldF90b3RhbF9yZWxh dGl2ZV9kYXRhX3JhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmludGVsX2NzdGF0ZSwKIAkJ ZW51bSBwbGFuZV9pZCBwbGFuZV9pZCA9IHRvX2ludGVsX3BsYW5lKHBsYW5lKS0+aWQ7CiAJCXVu c2lnbmVkIGludCByYXRlOwogCi0JCS8qIHBhY2tlZC91diAqLworCQkvKiBwYWNrZWQveSAqLwog CQlyYXRlID0gc2tsX3BsYW5lX3JlbGF0aXZlX2RhdGFfcmF0ZShpbnRlbF9jc3RhdGUsCiAJCQkJ CQkgICAgcHN0YXRlLCAwKTsKIAkJcGxhbmVfZGF0YV9yYXRlW3BsYW5lX2lkXSA9IHJhdGU7CiAK IAkJdG90YWxfZGF0YV9yYXRlICs9IHJhdGU7CiAKLQkJLyogeS1wbGFuZSAqLworCQkvKiB1di1w bGFuZSAqLwogCQlyYXRlID0gc2tsX3BsYW5lX3JlbGF0aXZlX2RhdGFfcmF0ZShpbnRlbF9jc3Rh dGUsCiAJCQkJCQkgICAgcHN0YXRlLCAxKTsKLQkJcGxhbmVfeV9kYXRhX3JhdGVbcGxhbmVfaWRd ID0gcmF0ZTsKKwkJdXZfcGxhbmVfZGF0YV9yYXRlW3BsYW5lX2lkXSA9IHJhdGU7CiAKIAkJdG90 YWxfZGF0YV9yYXRlICs9IHJhdGU7CiAJfQpAQCAtNDEwMiw4ICs0MDk3LDcgQEAgc2tsX2dldF90 b3RhbF9yZWxhdGl2ZV9kYXRhX3JhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmludGVsX2Nz dGF0ZSwKIH0KIAogc3RhdGljIHVpbnQxNl90Ci1za2xfZGRiX21pbl9hbGxvYyhjb25zdCBzdHJ1 Y3QgZHJtX3BsYW5lX3N0YXRlICpwc3RhdGUsCi0JCSAgY29uc3QgaW50IHkpCitza2xfZGRiX21p bl9hbGxvYyhjb25zdCBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpwc3RhdGUsIGNvbnN0IGludCBw bGFuZSkKIHsKIAlzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHBzdGF0ZS0+ZmI7CiAJc3Ry dWN0IGludGVsX3BsYW5lX3N0YXRlICppbnRlbF9wc3RhdGUgPSB0b19pbnRlbF9wbGFuZV9zdGF0 ZShwc3RhdGUpOwpAQCAtNDExNCw4ICs0MTA4LDggQEAgc2tsX2RkYl9taW5fYWxsb2MoY29uc3Qg c3RydWN0IGRybV9wbGFuZV9zdGF0ZSAqcHN0YXRlLAogCWlmIChXQVJOX09OKCFmYikpCiAJCXJl dHVybiAwOwogCi0JLyogRm9yIHBhY2tlZCBmb3JtYXRzLCBubyB5LXBsYW5lLCByZXR1cm4gMCAq LwotCWlmICh5ICYmIGZiLT5mb3JtYXQtPmZvcm1hdCAhPSBEUk1fRk9STUFUX05WMTIpCisJLyog Rm9yIHBhY2tlZCBmb3JtYXRzLCBhbmQgdXYtcGxhbmUsIHJldHVybiAwICovCisJaWYgKHBsYW5l ID09IDEgJiYgZmItPmZvcm1hdC0+Zm9ybWF0ICE9IERSTV9GT1JNQVRfTlYxMikKIAkJcmV0dXJu IDA7CiAKIAkvKiBGb3IgTm9uIFktdGlsZSByZXR1cm4gOC1ibG9ja3MgKi8KQEAgLTQxMzQsMTUg KzQxMjgsMTIgQEAgc2tsX2RkYl9taW5fYWxsb2MoY29uc3Qgc3RydWN0IGRybV9wbGFuZV9zdGF0 ZSAqcHN0YXRlLAogCXNyY19oID0gZHJtX3JlY3RfaGVpZ2h0KCZpbnRlbF9wc3RhdGUtPmJhc2Uu c3JjKSA+PiAxNjsKIAogCS8qIEhhbHZlIFVWIHBsYW5lIHdpZHRoIGFuZCBoZWlnaHQgZm9yIE5W MTIgKi8KLQlpZiAoZmItPmZvcm1hdC0+Zm9ybWF0ID09IERSTV9GT1JNQVRfTlYxMiAmJiAheSkg eworCWlmIChwbGFuZSA9PSAxKSB7CiAJCXNyY193IC89IDI7CiAJCXNyY19oIC89IDI7CiAJfQog Ci0JaWYgKGZiLT5mb3JtYXQtPmZvcm1hdCA9PSBEUk1fRk9STUFUX05WMTIgJiYgIXkpCi0JCXBs YW5lX2JwcCA9IGZiLT5mb3JtYXQtPmNwcFsxXTsKLQllbHNlCi0JCXBsYW5lX2JwcCA9IGZiLT5m b3JtYXQtPmNwcFswXTsKKwlwbGFuZV9icHAgPSBmYi0+Zm9ybWF0LT5jcHBbcGxhbmVdOwogCiAJ aWYgKGRybV9yb3RhdGlvbl85MF9vcl8yNzAocHN0YXRlLT5yb3RhdGlvbikpIHsKIAkJc3dpdGNo IChwbGFuZV9icHApIHsKQEAgLTQxNzAsNyArNDE2MSw3IEBAIHNrbF9kZGJfbWluX2FsbG9jKGNv bnN0IHN0cnVjdCBkcm1fcGxhbmVfc3RhdGUgKnBzdGF0ZSwKIAogc3RhdGljIHZvaWQKIHNrbF9k ZGJfY2FsY19taW4oY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwgaW50IG51 bV9hY3RpdmUsCi0JCSB1aW50MTZfdCAqbWluaW11bSwgdWludDE2X3QgKnlfbWluaW11bSkKKwkJ IHVpbnQxNl90ICptaW5pbXVtLCB1aW50MTZfdCAqdXZfbWluaW11bSkKIHsKIAljb25zdCBzdHJ1 Y3QgZHJtX3BsYW5lX3N0YXRlICpwc3RhdGU7CiAJc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7CkBA IC00MTg1LDcgKzQxNzYsNyBAQCBza2xfZGRiX2NhbGNfbWluKGNvbnN0IHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjc3RhdGUsIGludCBudW1fYWN0aXZlLAogCQkJY29udGludWU7CiAKIAkJbWlu aW11bVtwbGFuZV9pZF0gPSBza2xfZGRiX21pbl9hbGxvYyhwc3RhdGUsIDApOwotCQl5X21pbmlt dW1bcGxhbmVfaWRdID0gc2tsX2RkYl9taW5fYWxsb2MocHN0YXRlLCAxKTsKKwkJdXZfbWluaW11 bVtwbGFuZV9pZF0gPSBza2xfZGRiX21pbl9hbGxvYyhwc3RhdGUsIDEpOwogCX0KIAogCW1pbmlt dW1bUExBTkVfQ1VSU09SXSA9IHNrbF9jdXJzb3JfYWxsb2NhdGlvbihudW1fYWN0aXZlKTsKQEAg LTQyMDMsMTcgKzQxOTQsMTcgQEAgc2tsX2FsbG9jYXRlX3BpcGVfZGRiKHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjc3RhdGUsCiAJc3RydWN0IHNrbF9kZGJfZW50cnkgKmFsbG9jID0gJmNzdGF0 ZS0+d20uc2tsLmRkYjsKIAl1aW50MTZfdCBhbGxvY19zaXplLCBzdGFydDsKIAl1aW50MTZfdCBt aW5pbXVtW0k5MTVfTUFYX1BMQU5FU10gPSB7fTsKLQl1aW50MTZfdCB5X21pbmltdW1bSTkxNV9N QVhfUExBTkVTXSA9IHt9OworCXVpbnQxNl90IHV2X21pbmltdW1bSTkxNV9NQVhfUExBTkVTXSA9 IHt9OwogCXVuc2lnbmVkIGludCB0b3RhbF9kYXRhX3JhdGU7CiAJZW51bSBwbGFuZV9pZCBwbGFu ZV9pZDsKIAlpbnQgbnVtX2FjdGl2ZTsKLQl1bnNpZ25lZCBwbGFuZV9kYXRhX3JhdGVbSTkxNV9N QVhfUExBTkVTXSA9IHt9OwotCXVuc2lnbmVkIHBsYW5lX3lfZGF0YV9yYXRlW0k5MTVfTUFYX1BM QU5FU10gPSB7fTsKKwl1bnNpZ25lZCBpbnQgcGxhbmVfZGF0YV9yYXRlW0k5MTVfTUFYX1BMQU5F U10gPSB7fTsKKwl1bnNpZ25lZCBpbnQgdXZfcGxhbmVfZGF0YV9yYXRlW0k5MTVfTUFYX1BMQU5F U10gPSB7fTsKIAl1aW50MTZfdCB0b3RhbF9taW5fYmxvY2tzID0gMDsKIAogCS8qIENsZWFyIHRo ZSBwYXJ0aXRpb25pbmcgZm9yIGRpc2FibGVkIHBsYW5lcy4gKi8KIAltZW1zZXQoZGRiLT5wbGFu ZVtwaXBlXSwgMCwgc2l6ZW9mKGRkYi0+cGxhbmVbcGlwZV0pKTsKLQltZW1zZXQoZGRiLT55X3Bs YW5lW3BpcGVdLCAwLCBzaXplb2YoZGRiLT55X3BsYW5lW3BpcGVdKSk7CisJbWVtc2V0KGRkYi0+ dXZfcGxhbmVbcGlwZV0sIDAsIHNpemVvZihkZGItPnV2X3BsYW5lW3BpcGVdKSk7CiAKIAlpZiAo V0FSTl9PTighc3RhdGUpKQogCQlyZXR1cm4gMDsKQEAgLTQyMjgsNyArNDIxOSw3IEBAIHNrbF9h bGxvY2F0ZV9waXBlX2RkYihzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCWlmIChh bGxvY19zaXplID09IDApCiAJCXJldHVybiAwOwogCi0Jc2tsX2RkYl9jYWxjX21pbihjc3RhdGUs IG51bV9hY3RpdmUsIG1pbmltdW0sIHlfbWluaW11bSk7CisJc2tsX2RkYl9jYWxjX21pbihjc3Rh dGUsIG51bV9hY3RpdmUsIG1pbmltdW0sIHV2X21pbmltdW0pOwogCiAJLyoKIAkgKiAxLiBBbGxv Y2F0ZSB0aGUgbWluaW51bSByZXF1aXJlZCBibG9ja3MgZm9yIGVhY2ggYWN0aXZlIHBsYW5lCkBA IC00MjM4LDcgKzQyMjksNyBAQCBza2xfYWxsb2NhdGVfcGlwZV9kZGIoc3RydWN0IGludGVsX2Ny dGNfc3RhdGUgKmNzdGF0ZSwKIAogCWZvcl9lYWNoX3BsYW5lX2lkX29uX2NydGMoaW50ZWxfY3J0 YywgcGxhbmVfaWQpIHsKIAkJdG90YWxfbWluX2Jsb2NrcyArPSBtaW5pbXVtW3BsYW5lX2lkXTsK LQkJdG90YWxfbWluX2Jsb2NrcyArPSB5X21pbmltdW1bcGxhbmVfaWRdOworCQl0b3RhbF9taW5f YmxvY2tzICs9IHV2X21pbmltdW1bcGxhbmVfaWRdOwogCX0KIAogCWlmICh0b3RhbF9taW5fYmxv Y2tzID4gYWxsb2Nfc2l6ZSkgewpAQCAtNDI2MCwxNCArNDI1MSwxNCBAQCBza2xfYWxsb2NhdGVf cGlwZV9kZGIoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAkgKi8KIAl0b3RhbF9k YXRhX3JhdGUgPSBza2xfZ2V0X3RvdGFsX3JlbGF0aXZlX2RhdGFfcmF0ZShjc3RhdGUsCiAJCQkJ CQkJICAgcGxhbmVfZGF0YV9yYXRlLAotCQkJCQkJCSAgIHBsYW5lX3lfZGF0YV9yYXRlKTsKKwkJ CQkJCQkgICB1dl9wbGFuZV9kYXRhX3JhdGUpOwogCWlmICh0b3RhbF9kYXRhX3JhdGUgPT0gMCkK IAkJcmV0dXJuIDA7CiAKIAlzdGFydCA9IGFsbG9jLT5zdGFydDsKIAlmb3JfZWFjaF9wbGFuZV9p ZF9vbl9jcnRjKGludGVsX2NydGMsIHBsYW5lX2lkKSB7Ci0JCXVuc2lnbmVkIGludCBkYXRhX3Jh dGUsIHlfZGF0YV9yYXRlOwotCQl1aW50MTZfdCBwbGFuZV9ibG9ja3MsIHlfcGxhbmVfYmxvY2tz ID0gMDsKKwkJdW5zaWduZWQgaW50IGRhdGFfcmF0ZSwgdXZfZGF0YV9yYXRlOworCQl1aW50MTZf dCBwbGFuZV9ibG9ja3MsIHV2X3BsYW5lX2Jsb2NrczsKIAogCQlpZiAocGxhbmVfaWQgPT0gUExB TkVfQ1VSU09SKQogCQkJY29udGludWU7CkBAIC00MjkxLDIxICs0MjgyLDIwIEBAIHNrbF9hbGxv Y2F0ZV9waXBlX2RkYihzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCiAJCXN0YXJ0 ICs9IHBsYW5lX2Jsb2NrczsKIAotCQkvKgotCQkgKiBhbGxvY2F0aW9uIGZvciB5X3BsYW5lIHBh cnQgb2YgcGxhbmFyIGZvcm1hdDoKLQkJICovCi0JCXlfZGF0YV9yYXRlID0gcGxhbmVfeV9kYXRh X3JhdGVbcGxhbmVfaWRdOworCQkvKiBBbGxvY2F0ZSBEREIgZm9yIFVWIHBsYW5lIGZvciBwbGFu YXIgZm9ybWF0L05WMTIgKi8KKwkJdXZfZGF0YV9yYXRlID0gdXZfcGxhbmVfZGF0YV9yYXRlW3Bs YW5lX2lkXTsKIAotCQl5X3BsYW5lX2Jsb2NrcyA9IHlfbWluaW11bVtwbGFuZV9pZF07Ci0JCXlf cGxhbmVfYmxvY2tzICs9IGRpdl91NjQoKHVpbnQ2NF90KWFsbG9jX3NpemUgKiB5X2RhdGFfcmF0 ZSwKLQkJCQkJdG90YWxfZGF0YV9yYXRlKTsKKwkJdXZfcGxhbmVfYmxvY2tzID0gdXZfbWluaW11 bVtwbGFuZV9pZF07CisJCXV2X3BsYW5lX2Jsb2NrcyArPSBkaXZfdTY0KCh1aW50NjRfdClhbGxv Y19zaXplICogdXZfZGF0YV9yYXRlLAorCQkJCQkgICB0b3RhbF9kYXRhX3JhdGUpOwogCi0JCWlm ICh5X2RhdGFfcmF0ZSkgewotCQkJZGRiLT55X3BsYW5lW3BpcGVdW3BsYW5lX2lkXS5zdGFydCA9 IHN0YXJ0OwotCQkJZGRiLT55X3BsYW5lW3BpcGVdW3BsYW5lX2lkXS5lbmQgPSBzdGFydCArIHlf cGxhbmVfYmxvY2tzOworCQlpZiAodXZfZGF0YV9yYXRlKSB7CisJCQlkZGItPnV2X3BsYW5lW3Bp cGVdW3BsYW5lX2lkXS5zdGFydCA9IHN0YXJ0OworCQkJZGRiLT51dl9wbGFuZVtwaXBlXVtwbGFu ZV9pZF0uZW5kID0KKwkJCQlzdGFydCArIHV2X3BsYW5lX2Jsb2NrczsKIAkJfQogCi0JCXN0YXJ0 ICs9IHlfcGxhbmVfYmxvY2tzOworCQlzdGFydCArPSB1dl9wbGFuZV9ibG9ja3M7CiAJfQogCiAJ cmV0dXJuIDA7CkBAIC00NDMzLDggKzQ0MjMsNyBAQCBza2xfY29tcHV0ZV9wbGFuZV93bV9wYXJh bXMoY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQl3cC0+d2lkdGgg PSBkcm1fcmVjdF93aWR0aCgmaW50ZWxfcHN0YXRlLT5iYXNlLnNyYykgPj4gMTY7CiAJfQogCi0J d3AtPmNwcCA9IChmYi0+Zm9ybWF0LT5mb3JtYXQgPT0gRFJNX0ZPUk1BVF9OVjEyKSA/IGZiLT5m b3JtYXQtPmNwcFsxXSA6Ci0JCQkJCQkJICAgIGZiLT5mb3JtYXQtPmNwcFswXTsKKwl3cC0+Y3Bw ID0gZmItPmZvcm1hdC0+Y3BwWzBdOwogCXdwLT5wbGFuZV9waXhlbF9yYXRlID0gc2tsX2FkanVz dGVkX3BsYW5lX3BpeGVsX3JhdGUoY3N0YXRlLAogCQkJCQkJCSAgICAgaW50ZWxfcHN0YXRlKTsK IApAQCAtNDY2Myw2ICs0NjUyLDkgQEAgc2tsX2NvbXB1dGVfd21fbGV2ZWxzKGNvbnN0IHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCXJldHVybiByZXQ7CiAJfQogCisJaWYg KGludGVsX3BzdGF0ZS0+YmFzZS5mYi0+Zm9ybWF0LT5mb3JtYXQgPT0gRFJNX0ZPUk1BVF9OVjEy KQorCQl3bS0+aXNfbnYxMiA9IHRydWU7CisKIAlyZXR1cm4gMDsKIH0KIApAQCAtNDgzNSwxMCAr NDgyNywyMSBAQCBzdGF0aWMgdm9pZCBza2xfd3JpdGVfcGxhbmVfd20oc3RydWN0IGludGVsX2Ny dGMgKmludGVsX2NydGMsCiAKIAlza2xfZGRiX2VudHJ5X3dyaXRlKGRldl9wcml2LCBQTEFORV9C VUZfQ0ZHKHBpcGUsIHBsYW5lX2lkKSwKIAkJCSAgICAmZGRiLT5wbGFuZVtwaXBlXVtwbGFuZV9p ZF0pOwotCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpIDwgMTEpCisJaWYgKElOVEVMX0dFTihkZXZf cHJpdikgPj0gMTEpCisJCXJldHVybiBza2xfZGRiX2VudHJ5X3dyaXRlKGRldl9wcml2LAorCQkJ CQkgICBQTEFORV9CVUZfQ0ZHKHBpcGUsIHBsYW5lX2lkKSwKKwkJCQkJICAgJmRkYi0+cGxhbmVb cGlwZV1bcGxhbmVfaWRdKTsKKwlpZiAod20tPmlzX252MTIpIHsKKwkJc2tsX2RkYl9lbnRyeV93 cml0ZShkZXZfcHJpdiwgUExBTkVfQlVGX0NGRyhwaXBlLCBwbGFuZV9pZCksCisJCQkJICAgICZk ZGItPnV2X3BsYW5lW3BpcGVdW3BsYW5lX2lkXSk7CiAJCXNrbF9kZGJfZW50cnlfd3JpdGUoZGV2 X3ByaXYsCiAJCQkJICAgIFBMQU5FX05WMTJfQlVGX0NGRyhwaXBlLCBwbGFuZV9pZCksCi0JCQkJ ICAgICZkZGItPnlfcGxhbmVbcGlwZV1bcGxhbmVfaWRdKTsKKwkJCQkgICAgJmRkYi0+cGxhbmVb cGlwZV1bcGxhbmVfaWRdKTsKKwl9IGVsc2UgeworCQlza2xfZGRiX2VudHJ5X3dyaXRlKGRldl9w cml2LCBQTEFORV9CVUZfQ0ZHKHBpcGUsIHBsYW5lX2lkKSwKKwkJCQkgICAgJmRkYi0+cGxhbmVb cGlwZV1bcGxhbmVfaWRdKTsKKwkJSTkxNV9XUklURShQTEFORV9OVjEyX0JVRl9DRkcocGlwZSwg cGxhbmVfaWQpLCAweDApOworCX0KIH0KIAogc3RhdGljIHZvaWQgc2tsX3dyaXRlX2N1cnNvcl93 bShzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YywKQEAgLTQ5NTMsOCArNDk1Niw4IEBAIHNr bF9kZGJfYWRkX2FmZmVjdGVkX3BsYW5lcyhzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRl KQogCiAJCWlmIChza2xfZGRiX2VudHJ5X2VxdWFsKCZjdXJfZGRiLT5wbGFuZVtwaXBlXVtwbGFu ZV9pZF0sCiAJCQkJCSZuZXdfZGRiLT5wbGFuZVtwaXBlXVtwbGFuZV9pZF0pICYmCi0JCSAgICBz a2xfZGRiX2VudHJ5X2VxdWFsKCZjdXJfZGRiLT55X3BsYW5lW3BpcGVdW3BsYW5lX2lkXSwKLQkJ CQkJJm5ld19kZGItPnlfcGxhbmVbcGlwZV1bcGxhbmVfaWRdKSkKKwkJICAgIHNrbF9kZGJfZW50 cnlfZXF1YWwoJmN1cl9kZGItPnV2X3BsYW5lW3BpcGVdW3BsYW5lX2lkXSwKKwkJCQkJJm5ld19k ZGItPnV2X3BsYW5lW3BpcGVdW3BsYW5lX2lkXSkpCiAJCQljb250aW51ZTsKIAogCQlwbGFuZV9z dGF0ZSA9IGRybV9hdG9taWNfZ2V0X3BsYW5lX3N0YXRlKHN0YXRlLCBwbGFuZSk7CkBAIC01MDQ4 LDggKzUwNTEsOCBAQCBza2xfY29weV9kZGJfZm9yX3BpcGUoc3RydWN0IHNrbF9kZGJfdmFsdWVz ICpkc3QsCiAJCSAgICAgc3RydWN0IHNrbF9kZGJfdmFsdWVzICpzcmMsCiAJCSAgICAgZW51bSBw aXBlIHBpcGUpCiB7Ci0JbWVtY3B5KGRzdC0+ZGRiLnlfcGxhbmVbcGlwZV0sIHNyYy0+ZGRiLnlf cGxhbmVbcGlwZV0sCi0JICAgICAgIHNpemVvZihkc3QtPmRkYi55X3BsYW5lW3BpcGVdKSk7CisJ bWVtY3B5KGRzdC0+ZGRiLnV2X3BsYW5lW3BpcGVdLCBzcmMtPmRkYi51dl9wbGFuZVtwaXBlXSwK KwkgICAgICAgc2l6ZW9mKGRzdC0+ZGRiLnV2X3BsYW5lW3BpcGVdKSk7CiAJbWVtY3B5KGRzdC0+ ZGRiLnBsYW5lW3BpcGVdLCBzcmMtPmRkYi5wbGFuZVtwaXBlXSwKIAkgICAgICAgc2l6ZW9mKGRz dC0+ZGRiLnBsYW5lW3BpcGVdKSk7CiB9Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==