From: "Kumar, Mahesh" Subject: [PATCH 4/7] drm/i915/skl: New ddb allocation algorithm Date: Mon, 29 Aug 2016 18:05:19 +0530 Message-ID: <20160829123522.9532-5-mahesh1.kumar@intel.com> References: <20160829123522.9532-1-mahesh1.kumar@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 092A66E530 for ; Mon, 29 Aug 2016 12:32:01 +0000 (UTC) In-Reply-To: <20160829123522.9532-1-mahesh1.kumar@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: Kumar@freedesktop.org List-Id: intel-gfx@lists.freedesktop.org VGhpcyBwYXRjaCBpbXBsZW1lbnRzIG5ldyBEREIgYWxsb2NhdGlvbiBhbGdvcml0aG0gYXMgcGVy IEhXIHRlYW0Kc3VnZ2VzdGlvbi4gVGhpcyBhbGdvIHRha2VjYXJlIG9mIHNjZW5hcmlvIHdoZXJl IHdlIGFsbG9jYXRlIGxlc3MgRERCCmZvciB0aGUgcGxhbmVzIHdpdGggbG93ZXIgcmVsYXRpdmUg cGl4ZWwgcmF0ZSwgYnV0IHRoZXkgcmVxdWlyZSBtb3JlIEREQgp0byB3b3JrLgpJdCBhbHNvIHRh a2VzIGNhcmUgb2YgZW5hYmxpbmcgc2FtZSB3YXRlcm1hcmsgbGV2ZWwgZm9yIGVhY2gKcGxhbmUs IGZvciBlZmZpY2llbnQgcG93ZXIgc2F2aW5nLgoKU2lnbmVkLW9mZi1ieTogS3VtYXIsIE1haGVz aCA8bWFoZXNoMS5rdW1hckBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcG0uYyB8IDEyOSArKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tCiAx IGZpbGUgY2hhbmdlZCwgNjcgaW5zZXJ0aW9ucygrKSwgNjIgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3BtLmMKaW5kZXggNWZhMDJjYi4uOWY2OTA1MCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9wbS5jCkBAIC0zMzMxLDYgKzMzMzEsNyBAQCBza2xfZGRiX21pbl9hbGxvYyhjb25zdCBzdHJ1 Y3QgZHJtX3BsYW5lX3N0YXRlICpwc3RhdGUsCiAKIHN0YXRpYyBpbnQKIHNrbF9hbGxvY2F0ZV9w aXBlX2RkYihzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAorCQkgICAgICBzdHJ1Y3Qg c2tsX3BpcGVfd20gKnBpcGVfd20sCiAJCSAgICAgIHN0cnVjdCBza2xfZGRiX2FsbG9jYXRpb24g KmRkYiAvKiBvdXQgKi8pCiB7CiAJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlID0gY3N0 YXRlLT5iYXNlLnN0YXRlOwpAQCAtMzM0Niw4ICszMzQ3LDExIEBAIHNrbF9hbGxvY2F0ZV9waXBl X2RkYihzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCXVpbnQxNl90ICptaW5pbXVt ID0gY3N0YXRlLT53bS5za2wubWluaW11bV9ibG9ja3M7CiAJdWludDE2X3QgKnlfbWluaW11bSA9 IGNzdGF0ZS0+d20uc2tsLm1pbmltdW1feV9ibG9ja3M7CiAJdW5zaWduZWQgaW50IHRvdGFsX2Rh dGFfcmF0ZTsKKwl1aW50MTZfdCB0b3RhbF9taW5fYmxvY2tzID0gMDsKKwl1aW50MTZfdCB0b3Rh bF9sZXZlbF9kZGIgPSAwOwogCWludCBudW1fYWN0aXZlOwotCWludCBpZCwgaTsKKwlpbnQgbWF4 X2xldmVsLCBsZXZlbDsKKwlpbnQgaWQsIGksIHJldCA9IDA7CiAKIAlpZiAoV0FSTl9PTighc3Rh dGUpKQogCQlyZXR1cm4gMDsKQEAgLTMzNjMsNiArMzM2Nyw3IEBAIHNrbF9hbGxvY2F0ZV9waXBl X2RkYihzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCWFsbG9jX3NpemUgPSBza2xf ZGRiX2VudHJ5X3NpemUoYWxsb2MpOwogCWlmIChhbGxvY19zaXplID09IDApIHsKIAkJbWVtc2V0 KGRkYi0+cGxhbmVbcGlwZV0sIDAsIHNpemVvZihkZGItPnBsYW5lW3BpcGVdKSk7CisJCW1lbXNl dChkZGItPnlfcGxhbmVbcGlwZV0sIDAsIHNpemVvZihkZGItPnlfcGxhbmVbcGlwZV0pKTsKIAkJ cmV0dXJuIDA7CiAJfQogCkBAIC0zMzk2LDE5ICszNDAxLDQyIEBAIHNrbF9hbGxvY2F0ZV9waXBl X2RkYihzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAogCX0KIAogCWZvciAoaSA9IDA7 IGkgPCBQTEFORV9DVVJTT1I7IGkrKykgewotCQlhbGxvY19zaXplIC09IG1pbmltdW1baV07Ci0J CWFsbG9jX3NpemUgLT0geV9taW5pbXVtW2ldOworCQl0b3RhbF9taW5fYmxvY2tzICs9IG1pbmlt dW1baV07CisJCXRvdGFsX21pbl9ibG9ja3MgKz0geV9taW5pbXVtW2ldOwogCX0KIAotCS8qCi0J ICogMi4gRGlzdHJpYnV0ZSB0aGUgcmVtYWluaW5nIHNwYWNlIGluIHByb3BvcnRpb24gdG8gdGhl IGFtb3VudCBvZgotCSAqIGRhdGEgZWFjaCBwbGFuZSBuZWVkcyB0byBmZXRjaCBmcm9tIG1lbW9y eS4KLQkgKgotCSAqIEZJWE1FOiB3ZSBtYXkgbm90IGFsbG9jYXRlIGV2ZXJ5IHNpbmdsZSBibG9j ayBoZXJlLgotCSAqLworCWZvciAobGV2ZWwgPSBpbGtfd21fbWF4X2xldmVsKGRldik7IGxldmVs ID49IDA7IGxldmVsLS0pIHsKKwkJdG90YWxfbGV2ZWxfZGRiID0gMDsKKwkJZm9yIChpID0gMDsg aSA8IFBMQU5FX0NVUlNPUjsgaSsrKSB7CisJCQkvKgorCQkJICogVE9ETzogV2Ugc2hvdWxkIGNh bGN1bGF0ZSB3YXRlcm1hcmsgdmFsdWVzIGZvciBZL1VWCisJCQkgKiBwbGFuZSBib3RoIGluIGNh c2Ugb2YgTlYxMiBmb3JtYXQgYW5kIHVzZSBib3RoIHZhbHVlcworCQkJICogZm9yIGRkYiBjYWxj dWxhdGlvbiwgQXMgTlYxMiBpcyBkaXNhYmxlZCBhcyBvZiBub3cuCisJCQkgKiB1c2luZyBvbmx5 IHNpbmdsZSBwbGFuZSB2YWx1ZSBoZXJlLgorCQkJICovCisJCQl1aW50MTZfdCBtaW4gPSBtaW5p bXVtW2ldICsgeV9taW5pbXVtW2ldOworCQkJdWludDE2X3QgcGxhbmVfbGV2ZWxfZGRiX3dtID0K KwkJCQltYXgocGlwZV93bS0+d21bbGV2ZWxdLnBsYW5lX3Jlc19iW2ldLCBtaW4pOworCQkJdG90 YWxfbGV2ZWxfZGRiICs9IHBsYW5lX2xldmVsX2RkYl93bTsKKwkJfQorCisJCWlmICh0b3RhbF9s ZXZlbF9kZGIgPD0gYWxsb2Nfc2l6ZSkKKwkJCWJyZWFrOworCX0KKworCWlmICgobGV2ZWwgPCAw KSB8fCAodG90YWxfbWluX2Jsb2NrcyA+IGFsbG9jX3NpemUpKSB7CisJCURSTV9ERUJVR19LTVMo IlJlcXVlc3RlZCBkaXNwbGF5IGNvbmZpZ3VyYXRpb24gZXhjZWVkcyBzeXN0ZW0gRERCIGxpbWl0 YXRpb25zIik7CisJCURSTV9ERUJVR19LTVMoIm1pbmltdW0gcmVxdWlyZWQgJWQvJWRcbiIsIChs ZXZlbCA8IDApID8KKwkJCQl0b3RhbF9sZXZlbF9kZGIgOiB0b3RhbF9taW5fYmxvY2tzLCBhbGxv Y19zaXplKTsKKwkJcmV0ID0gLUVJTlZBTDsKKwkJZ290byBleGl0OworCX0KKwltYXhfbGV2ZWwg PSBsZXZlbDsKKwlhbGxvY19zaXplIC09IHRvdGFsX2xldmVsX2RkYjsKKwogCXRvdGFsX2RhdGFf cmF0ZSA9IHNrbF9nZXRfdG90YWxfcmVsYXRpdmVfZGF0YV9yYXRlKGNzdGF0ZSk7CiAJaWYgKHRv dGFsX2RhdGFfcmF0ZSA9PSAwKQotCQlyZXR1cm4gMDsKKwkJZ290byBleGl0OwogCiAJc3RhcnQg PSBhbGxvYy0+c3RhcnQ7CiAJZm9yX2VhY2hfaW50ZWxfcGxhbmVfb25fY3J0YyhkZXYsIGludGVs X2NydGMsIGludGVsX3BsYW5lKSB7CkBAIC0zNDIzLDcgKzM0NTEsOCBAQCBza2xfYWxsb2NhdGVf cGlwZV9kZGIoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAkJICogcHJvbW90ZSB0 aGUgZXhwcmVzc2lvbiB0byA2NCBiaXRzIHRvIGF2b2lkIG92ZXJmbG93aW5nLCB0aGUKIAkJICog cmVzdWx0IGlzIDwgYXZhaWxhYmxlIGFzIGRhdGFfcmF0ZSAvIHRvdGFsX2RhdGFfcmF0ZSA8IDEK IAkJICovCi0JCXBsYW5lX2Jsb2NrcyA9IG1pbmltdW1baWRdOworCQlwbGFuZV9ibG9ja3MgPSBt YXgocGlwZV93bS0+d21bbWF4X2xldmVsXS5wbGFuZV9yZXNfYltpZF0sCisJCQkJCW1pbmltdW1b aWRdKTsKIAkJcGxhbmVfYmxvY2tzICs9IGRpdl91NjQoKHVpbnQ2NF90KWFsbG9jX3NpemUgKiBk YXRhX3JhdGUsCiAJCQkJCXRvdGFsX2RhdGFfcmF0ZSk7CiAKQEAgLTM0MzcsNiArMzQ2Niw4IEBA IHNrbF9hbGxvY2F0ZV9waXBlX2RkYihzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3N0YXRlLAog CiAJCS8qCiAJCSAqIGFsbG9jYXRpb24gZm9yIHlfcGxhbmUgcGFydCBvZiBwbGFuYXIgZm9ybWF0 OgorCQkgKiBUT0RPOiBPbmNlIHdlIHN0YXJ0IGNhbGN1bGF0aW5nIHdhdGVybWFyayB2YWx1ZXMg Zm9yIFkvVVYKKwkJICogcGxhbmUgYm90aCBjb25zaWRlciBpdCBmb3IgaW5pdGlhbCBhbGxvd2Vk IHdtIGJsb2Nrcy4KIAkJICovCiAJCXlfZGF0YV9yYXRlID0gY3N0YXRlLT53bS5za2wucGxhbmVf eV9kYXRhX3JhdGVbaWRdOwogCkBAIC0zNDUwLDkgKzM0ODEsMjIgQEAgc2tsX2FsbG9jYXRlX3Bp cGVfZGRiKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJCX0KIAogCQlzdGFydCAr PSB5X3BsYW5lX2Jsb2NrczsKKworCQkvKgorCQkgKiBOb3cgZW5hYmxlIGFsbCBsZXZlbHMgaW4g V00gc3RydWN0dXJlIHdoaWNoIGNhbiBiZSBlbmFibGVkCisJCSAqIHVzaW5nIGN1cnJlbnQgRERC IGFsbG9jYXRpb24KKwkJICovCisJCWZvciAoaSA9IGlsa193bV9tYXhfbGV2ZWwoZGV2KTsgaSA+ IDA7IGktLSkgeworCQkJaWYgKGkgPiBtYXhfbGV2ZWwgfHwgcGlwZV93bS0+d21baV0ucGxhbmVf cmVzX2xbaWRdID4gMzEKKwkJCQkJfHwgcGlwZV93bS0+d21baV0ucGxhbmVfcmVzX2JbaWRdID09 IDApCisJCQkJcGlwZV93bS0+d21baV0ucGxhbmVfZW5baWRdID0gZmFsc2U7CisJCQllbHNlCisJ CQkJcGlwZV93bS0+d21baV0ucGxhbmVfZW5baWRdID0gdHJ1ZTsKKwkJfQogCX0KIAotCXJldHVy biAwOworZXhpdDoKKwlyZXR1cm4gcmV0OwogfQogCiBzdGF0aWMgdWludDMyX3Qgc2tsX3BpcGVf cGl4ZWxfcmF0ZShjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY29uZmlnKQpAQCAtMzUz OCw3ICszNTgyLDYgQEAgc3RhdGljIHVpbnQzMl90IHNrbF9hZGp1c3RlZF9wbGFuZV9waXhlbF9y YXRlKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3QKIHN0YXRpYyBpbnQgc2tsX2Nv bXB1dGVfcGxhbmVfd20oY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAog CQkJCXN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJCQkJc3RydWN0IGludGVsX3Bs YW5lX3N0YXRlICppbnRlbF9wc3RhdGUsCi0JCQkJdWludDE2X3QgZGRiX2FsbG9jYXRpb24sCiAJ CQkJaW50IGxldmVsLAogCQkJCXN0cnVjdCBza2xfcGlwZV93bSAqcGlwZV93bSkKIHsKQEAgLTM1 NTcsMTIgKzM2MDAsOSBAQCBzdGF0aWMgaW50IHNrbF9jb21wdXRlX3BsYW5lX3dtKGNvbnN0IHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAlzdHJ1Y3Qgc2tsX3dtX2xldmVsICpy ZXN1bHQgPSAmcGlwZV93bS0+d21bbGV2ZWxdOwogCXVpbnQxNl90ICpvdXRfYmxvY2tzID0gJnJl c3VsdC0+cGxhbmVfcmVzX2JbaWRdOwogCXVpbnQ4X3QgKm91dF9saW5lcyA9ICZyZXN1bHQtPnBs YW5lX3Jlc19sW2lkXTsKLQlib29sICplbmFibGVkID0gJnJlc3VsdC0+cGxhbmVfZW5baWRdOwog Ci0JaWYgKGxhdGVuY3kgPT0gMCB8fCAhY3N0YXRlLT5iYXNlLmFjdGl2ZSB8fCAhaW50ZWxfcHN0 YXRlLT5iYXNlLnZpc2libGUpIHsKLQkJKmVuYWJsZWQgPSBmYWxzZTsKKwlpZiAobGF0ZW5jeSA9 PSAwIHx8ICFjc3RhdGUtPmJhc2UuYWN0aXZlIHx8ICFpbnRlbF9wc3RhdGUtPmJhc2UudmlzaWJs ZSkKIAkJcmV0dXJuIDA7Ci0JfQogCiAJd2lkdGggPSBkcm1fcmVjdF93aWR0aCgmaW50ZWxfcHN0 YXRlLT5iYXNlLnNyYykgPj4gMTY7CiAJaGVpZ2h0ID0gZHJtX3JlY3RfaGVpZ2h0KCZpbnRlbF9w c3RhdGUtPmJhc2Uuc3JjKSA+PiAxNjsKQEAgLTM2MjYsNTQgKzM2NjYsMjcgQEAgc3RhdGljIGlu dCBza2xfY29tcHV0ZV9wbGFuZV93bShjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCiAJCQlyZXNfYmxvY2tzKys7CiAJfQogCi0JaWYgKHJlc19ibG9ja3MgPj0gZGRiX2Fs bG9jYXRpb24gfHwgcmVzX2xpbmVzID4gMzEpIHsKLQkJKmVuYWJsZWQgPSBmYWxzZTsKLQotCQkv KgotCQkgKiBJZiB0aGVyZSBhcmUgbm8gdmFsaWQgbGV2ZWwgMCB3YXRlcm1hcmtzLCB0aGVuIHdl IGNhbid0Ci0JCSAqIHN1cHBvcnQgdGhpcyBkaXNwbGF5IGNvbmZpZ3VyYXRpb24uCi0JCSAqLwot CQlpZiAobGV2ZWwpIHsKLQkJCXJldHVybiAwOwotCQl9IGVsc2UgewotCQkJRFJNX0RFQlVHX0tN UygiUmVxdWVzdGVkIGRpc3BsYXkgY29uZmlndXJhdGlvbiBleGNlZWRzIHN5c3RlbSB3YXRlcm1h cmsgbGltaXRhdGlvbnNcbiIpOwotCQkJRFJNX0RFQlVHX0tNUygiUGxhbmUgJWQuJWQ6IGJsb2Nr cyByZXF1aXJlZCA9ICV1LyV1LCBsaW5lcyByZXF1aXJlZCA9ICV1LzMxXG4iLAotCQkJCSAgICAg IHRvX2ludGVsX2NydGMoY3N0YXRlLT5iYXNlLmNydGMpLT5waXBlLAotCQkJCSAgICAgIHNrbF93 bV9wbGFuZV9pZCh0b19pbnRlbF9wbGFuZShwc3RhdGUtPnBsYW5lKSksCi0JCQkJICAgICAgcmVz X2Jsb2NrcywgZGRiX2FsbG9jYXRpb24sIHJlc19saW5lcyk7Ci0KLQkJCXJldHVybiAtRUlOVkFM OwotCQl9Ci0JfQotCiAJKm91dF9ibG9ja3MgPSByZXNfYmxvY2tzOwogCSpvdXRfbGluZXMgPSBy ZXNfbGluZXM7Ci0JKmVuYWJsZWQgPSB0cnVlOwogCiAJcmV0dXJuIDA7CiB9CiAKIHN0YXRpYyBp bnQKIHNrbF9jb21wdXRlX3dtX2xldmVsKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdiwKLQkJICAgICBzdHJ1Y3Qgc2tsX2RkYl9hbGxvY2F0aW9uICpkZGIsCiAJCSAgICAg c3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNzdGF0ZSwKIAkJICAgICBpbnQgbGV2ZWwsCiAJCSAg ICAgc3RydWN0IHNrbF9waXBlX3dtICpwaXBlX3dtKQogewogCXN0cnVjdCBkcm1fYXRvbWljX3N0 YXRlICpzdGF0ZSA9IGNzdGF0ZS0+YmFzZS5zdGF0ZTsKLQlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50 ZWxfY3J0YyA9IHRvX2ludGVsX2NydGMoY3N0YXRlLT5iYXNlLmNydGMpOwogCXN0cnVjdCBkcm1f cGxhbmUgKnBsYW5lOwogCXN0cnVjdCBpbnRlbF9wbGFuZSAqaW50ZWxfcGxhbmU7CiAJc3RydWN0 IGludGVsX3BsYW5lX3N0YXRlICppbnRlbF9wc3RhdGU7Ci0JdWludDE2X3QgZGRiX2Jsb2NrczsK LQllbnVtIHBpcGUgcGlwZSA9IGludGVsX2NydGMtPnBpcGU7CiAJaW50IHJldDsKIAogCWZvcl9l YWNoX2ludGVsX3BsYW5lX21hc2soJmRldl9wcml2LT5kcm0sCiAJCQkJICBpbnRlbF9wbGFuZSwK IAkJCQkgIGNzdGF0ZS0+YmFzZS5wbGFuZV9tYXNrKSB7Ci0JCWludCBpID0gc2tsX3dtX3BsYW5l X2lkKGludGVsX3BsYW5lKTsKLQogCQlwbGFuZSA9ICZpbnRlbF9wbGFuZS0+YmFzZTsKIAkJaW50 ZWxfcHN0YXRlID0gTlVMTDsKIAkJaWYgKHN0YXRlKQpAQCAtMzY5OSwxMiArMzcxMiw5IEBAIHNr bF9jb21wdXRlX3dtX2xldmVsKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKIAogCQlXQVJOX09OKCFpbnRlbF9wc3RhdGUtPmJhc2UuZmIpOwogCi0JCWRkYl9ibG9ja3Mg PSBza2xfZGRiX2VudHJ5X3NpemUoJmRkYi0+cGxhbmVbcGlwZV1baV0pOwotCiAJCXJldCA9IHNr bF9jb21wdXRlX3BsYW5lX3dtKGRldl9wcml2LAogCQkJCQkgICBjc3RhdGUsCiAJCQkJCSAgIGlu dGVsX3BzdGF0ZSwKLQkJCQkJICAgZGRiX2Jsb2NrcywKIAkJCQkJICAgbGV2ZWwsCiAJCQkJCSAg IHBpcGVfd20pOwogCQlpZiAocmV0KQpAQCAtMzc2MSwxMSArMzc3MSwxNSBAQCBzdGF0aWMgaW50 IHNrbF9idWlsZF9waXBlX3dtKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjc3RhdGUsCiAJbWVt c2V0KHBpcGVfd20sIDAsIHNpemVvZigqcGlwZV93bSkpOwogCiAJZm9yIChsZXZlbCA9IDA7IGxl dmVsIDw9IG1heF9sZXZlbDsgbGV2ZWwrKykgewotCQlyZXQgPSBza2xfY29tcHV0ZV93bV9sZXZl bChkZXZfcHJpdiwgZGRiLCBjc3RhdGUsCisJCXJldCA9IHNrbF9jb21wdXRlX3dtX2xldmVsKGRl dl9wcml2LCBjc3RhdGUsCiAJCQkJCSAgIGxldmVsLCBwaXBlX3dtKTsKIAkJaWYgKHJldCkKIAkJ CXJldHVybiByZXQ7CiAJfQorCXJldCA9IHNrbF9hbGxvY2F0ZV9waXBlX2RkYihjc3RhdGUsIHBp cGVfd20sIGRkYik7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKKwogCXBpcGVfd20tPmxpbmV0 aW1lID0gc2tsX2NvbXB1dGVfbGluZXRpbWVfd20oY3N0YXRlKTsKIAogCXNrbF9jb21wdXRlX3Ry YW5zaXRpb25fd20oY3N0YXRlLCAmcGlwZV93bS0+dHJhbnNfd20pOwpAQCAtMzk1MywxMyArMzk2 NywxMiBAQCBwaXBlc19tb2RpZmllZChzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUpCiB9 CiAKIHN0YXRpYyBpbnQKLXNrbF9jb21wdXRlX2RkYihzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAq c3RhdGUpCitza2xfaW5jbHVkZV9hZmZlY3RlZF9waXBlcyhzdHJ1Y3QgZHJtX2F0b21pY19zdGF0 ZSAqc3RhdGUpCiB7CiAJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHN0YXRlLT5kZXY7CiAJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCXN0cnVjdCBp bnRlbF9hdG9taWNfc3RhdGUgKmludGVsX3N0YXRlID0gdG9faW50ZWxfYXRvbWljX3N0YXRlKHN0 YXRlKTsKIAlzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YzsKLQlzdHJ1Y3Qgc2tsX2RkYl9h bGxvY2F0aW9uICpkZGIgPSAmaW50ZWxfc3RhdGUtPndtX3Jlc3VsdHMuZGRiOwogCXVpbnQzMl90 IHJlYWxsb2NfcGlwZXMgPSBwaXBlc19tb2RpZmllZChzdGF0ZSk7CiAJaW50IHJldDsKIApAQCAt NDAxMiwxMCArNDAyNSw2IEBAIHNrbF9jb21wdXRlX2RkYihzdHJ1Y3QgZHJtX2F0b21pY19zdGF0 ZSAqc3RhdGUpCiAJCWlmIChJU19FUlIoY3N0YXRlKSkKIAkJCXJldHVybiBQVFJfRVJSKGNzdGF0 ZSk7CiAKLQkJcmV0ID0gc2tsX2FsbG9jYXRlX3BpcGVfZGRiKGNzdGF0ZSwgZGRiKTsKLQkJaWYg KHJldCkKLQkJCXJldHVybiByZXQ7Ci0KIAkJcmV0ID0gZHJtX2F0b21pY19hZGRfYWZmZWN0ZWRf cGxhbmVzKHN0YXRlLCAmaW50ZWxfY3J0Yy0+YmFzZSk7CiAJCWlmIChyZXQpCiAJCQlyZXR1cm4g cmV0OwpAQCAtNDA2OSwxOSArNDA3OCwxNSBAQCBza2xfY29tcHV0ZV93bShzdHJ1Y3QgZHJtX2F0 b21pY19zdGF0ZSAqc3RhdGUpCiAJLyogQ2xlYXIgYWxsIGRpcnR5IGZsYWdzICovCiAJcmVzdWx0 cy0+ZGlydHlfcGlwZXMgPSAwOwogCi0JcmV0ID0gc2tsX2NvbXB1dGVfZGRiKHN0YXRlKTsKKwly ZXQgPSBza2xfaW5jbHVkZV9hZmZlY3RlZF9waXBlcyhzdGF0ZSk7CiAJaWYgKHJldCkKIAkJcmV0 dXJuIHJldDsKIAogCS8qCiAJICogQ2FsY3VsYXRlIFdNJ3MgZm9yIGFsbCBwaXBlcyB0aGF0IGFy ZSBwYXJ0IG9mIHRoaXMgdHJhbnNhY3Rpb24uCi0JICogTm90ZSB0aGF0IHRoZSBEREIgYWxsb2Nh dGlvbiBhYm92ZSBtYXkgaGF2ZSBhZGRlZCBtb3JlIENSVEMncyB0aGF0Ci0JICogd2VyZW4ndCBv dGhlcndpc2UgYmVpbmcgbW9kaWZpZWQgKGFuZCBzZXQgYml0cyBpbiBkaXJ0eV9waXBlcykgaWYK LQkgKiBwaXBlIGFsbG9jYXRpb25zIGhhZCB0byBjaGFuZ2UuCi0JICoKLQkgKiBGSVhNRTogIE5v dyB0aGF0IHdlJ3JlIGRvaW5nIHRoaXMgaW4gdGhlIGF0b21pYyBjaGVjayBwaGFzZSwgd2UKLQkg KiBzaG91bGQgYWxsb3cgc2tsX3VwZGF0ZV9waXBlX3dtKCkgdG8gcmV0dXJuIGZhaWx1cmUgaW4g Y2FzZXMgd2hlcmUKLQkgKiBubyBzdWl0YWJsZSB3YXRlcm1hcmsgdmFsdWVzIGNhbiBiZSBmb3Vu ZC4KKwkgKiBOb3RlIHRoYXQgYWZmZWN0ZWQgcGlwZSBjYWxjdWxhdGlvbiBhYm92ZSBtYXkgaGF2 ZSBhZGRlZCBtb3JlCisJICogQ1JUQydzIHRoYXQgd2VyZW4ndCBvdGhlcndpc2UgYmVpbmcgbW9k aWZpZWQgKGFuZCBzZXQgYml0cyBpbgorCSAqIGRpcnR5X3BpcGVzKSBpZiBwaXBlIGFsbG9jYXRp b25zIGhhZCB0byBjaGFuZ2UuCiAJICovCiAJZm9yX2VhY2hfY3J0Y19pbl9zdGF0ZShzdGF0ZSwg Y3J0YywgY3N0YXRlLCBpKSB7CiAJCXN0cnVjdCBpbnRlbF9jcnRjICppbnRlbF9jcnRjID0gdG9f aW50ZWxfY3J0YyhjcnRjKTsKLS0gCjIuOC4zCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK